Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

src/main/resources/com/steerinfo/dil/mapper/WmspInboundResultMapper.xml

@@ -816,105 +816,57 @@
         ORDER BY wir.inbound_time DESC
         )
         <where>
-            <if test="INBOUND_NUMBER != null">
-                and "INBOUND_NUMBER" in
-                <foreach collection="INBOUND_NUMBER" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="WAREHOUSE_NAME != null">
-                and "WAREHOUSE_NAME" in
-                <foreach collection="WAREHOUSE_NAME" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="STACKING_NO != null">
-                and "STACKING_NO" in
-                <foreach collection="STACKING_NO" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="GRID_GRADATION_NUMBER != null">
-                and "GRID_GRADATION_NUMBER" in
-                <foreach collection="GRID_GRADATION_NUMBER" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="FURNACE_NUMBER != null">
-                and "FURNACE_NUMBER" in
-                <foreach collection="FURNACE_NUMBER" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="MATERIAL_CODE != null">
-                and "MATERIAL_CODE" in
-                <foreach collection="MATERIAL_CODE" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="MATERIAL_NAME != null">
-                and "MATERIAL_NAME" in
-                <foreach collection="MATERIAL_NAME" item="item" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="THEORETICAL_WEIGHT != null">
-                and "THEORETICAL_WEIGHT" in
-                <foreach collection="THEORETICAL_WEIGHT" item="item" open="(" separator="," close=")">
+            <if test="inboundId != null">
+                and "inboundId" in
+                <foreach collection="inboundId" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="BUNDLE_WEIGHT != null">
-                and "BUNDLE_WEIGHT" in
-                <foreach collection="BUNDLE_WEIGHT" item="item" open="(" separator="," close=")">
+            <if test="materialName != null">
+                and "materialName" in
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="MEASURE_NAME != null">
-                and "MEASURE_NAME" in
-                <foreach collection="MEASURE_NAME" item="item" open="(" separator="," close=")">
+            <if test="inboundTime != null">
+                and "inboundTime" in
+                <foreach collection="inboundTime" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="PRODUCTION_DATE != null">
-                and "PRODUCTION_DATE" in
-                <foreach collection="PRODUCTION_DATE" item="item" open="(" separator="," close=")">
-                    to_date('${item}','yyyy-mm-dd hh24:mi:ss')
-                </foreach>
-            </if>
-            <if test="APERSONNEL_NAME != null">
-                and "APERSONNEL_NAME" in
-                <foreach collection="APERSONNEL_NAME" item="item" open="(" separator="," close=")">
+            <if test="isComplete != null">
+                and "isComplete" in
+                <foreach collection="isComplete" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="BPERSONNEL_NAME != null">
-                and "BPERSONNEL_NAME" in
-                <foreach collection="BPERSONNEL_NAME" item="item" open="(" separator="," close=")">
+            <if test="warehouseName != null">
+                and "warehouseName" in
+                <foreach collection="warehouseName" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="DPERSONNEL_NAME != null">
-                and "DPERSONNEL_NAME" in
-                <foreach collection="DPERSONNEL_NAME" item="item" open="(" separator="," close=")">
+            <if test="stackingNo != null">
+                and "stackingNo" in
+                <foreach collection="stackingNo" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="SHIPPER_BRANCH_FACTORY != null">
-                and "SHIPPER_BRANCH_FACTORY" in
-                <foreach collection="SHIPPER_BRANCH_FACTORY" item="item" open="(" separator="," close=")">
+            <if test="gridGradationNumber != null">
+                and "gridGradationNumber" in
+                <foreach collection="gridGradationNumber" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="PERSONNEL_WORKSHOP != null">
-                and "PERSONNEL_WORKSHOP" in
-                <foreach collection="PERSONNEL_WORKSHOP" item="item" open="(" separator="," close=")">
+            <if test="furnaceNumber != null">
+                and "furnaceNumber" in
+                <foreach collection="furnaceNumber" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
-            <if test="INBOUND_TIME != null">
-                and "INBOUND_TIME" in
-                <foreach collection="INBOUND_TIME" item="item" open="(" separator="," close=")">
+            <if test="theoreticalWeight != null">
+                and "theoreticalWeight" in
+                <foreach collection="theoreticalWeight" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>

src/main/resources/com/steerinfo/dil/mapper/WmspOutboundResultMapper.xml

@@ -565,6 +565,7 @@
   </select>
   
   <select id="selectOutResult" resultType="java.util.Map" parameterType="java.util.Map">
+    select * from (
     SELECT
     DISTINCT
     ckd.RESULT_NUMBER "resultNumber",
@@ -620,36 +621,39 @@
     ckd.INSERT_UPDATE_REMARK "insertUpdateRemark"
     FROM WMSP_OUTBOUND_RESULT ckd
     LEFT JOIN OMSTRUCK_ORDER ysdd
-        ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
+    ON ckd.BILL_LADING_ID = ysdd.ORDER_ID
     LEFT JOIN RMS_CAPACITY ylxx
-        ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
+    ON ysdd.CAPACITY_ID = ylxx.CAPACITY_ID
     LEFT JOIN OMSTRUCK_ORDER_MATERIAL yswz
-        ON ysdd.ORDER_ID = yswz.ORDER_ID
+    ON ysdd.ORDER_ID = yswz.ORDER_ID
     LEFT JOIN WMSP_OUTBOUND_SCAN_RESULT wosr
-        ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
+    ON wosr.OUTBOUND_RESULT_ID = ckd.RESULT_ID
     LEFT JOIN WMSP_INBOUND_SCAN_RESULT sisr
-        ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
+    ON wosr.INBOUND_RESULT_ID = sisr.INBOUND_RESULT_ID
     LEFT JOIN WMSP_GRID_MATERIAL wzwg
-        ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
+    ON sisr.MATERIAL_ID = wzwg.MATERIAL_ID
     LEFT JOIN RMS_PWAREHOUSE_GRID wg
-        ON wzwg.GRID_ID = wg.GRID_ID
+    ON wzwg.GRID_ID = wg.GRID_ID
     LEFT JOIN RMS_WAREHOUSE ck
-        ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
+    ON wg.WAREHOUSE_ID = ck.WAREHOUSE_ID
     LEFT JOIN RMS_STACKING dw
-        ON wg.STACKING_ID = dw.STACKING_ID
+    ON wg.STACKING_ID = dw.STACKING_ID
     LEFT JOIN RMS_MATERIAL_STEEL gcwz
-        ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
+    ON wzwg.MATERIAL_ID = gcwz.MATERIAL_STEEL_ID
     LEFT JOIN RMS_MATERIAL wz
-        ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
+    ON gcwz.MATERIAL_ID = wz.MATERIAL_ID
     LEFT JOIN RMS_UNIT_OF_MEASURE jldw
-        ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
-               WHERE  wg.WAREHOUSE_ID = #{warehouseId}
+    ON wz.UNIT_OF_MEASURE_ID = jldw.UNIT_OF_MEASURE_ID
+    WHERE wg.WAREHOUSE_ID = #{warehouseId}
     <if test="startTime != null and endTime !=null">
-      and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and  to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss')
+      and ckd.insert_time between to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') and to_date(#{endDate},
+      'yyyy-mm-dd hh24:mi:ss')
     </if>
     <if test="oneDate != null">
       and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ckd.insert_time
     </if>
+    order by ckd.INSERT_TIME desc
+    )
     <where>
       <if test="resultNumber != null">
         and