修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-wms-api</artifactId>
-    <version>1.9</version>
+    <version>1.10</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

src/main/java/com/steerinfo/dil/service/impl/OyeResultServiceImpl.java

@@ -97,7 +97,9 @@ public class OyeResultServiceImpl implements IOyeResultService {
             oyeInboundResult.setInboundArea(map.get("inboundArea").toString());
             oyeInboundResult.setInboundWarehouse(map.get("inboundWarehouse").toString());
             oyeInboundResult.setSaleNo(map.get("saleNo") + "");
-            oyeInboundResult.setMeter(meter);
+            if (meter != null || meter.intValue() !=0) {
+                oyeInboundResult.setMeter(meter);
+            }
             oyeInboundResult.setMaterialId(materialId);
             oyeInboundResult.setTheoryWeight(theoryWeight);
             oyeInboundResult.setSingleWeight(singleWeight);
@@ -118,6 +120,7 @@ public class OyeResultServiceImpl implements IOyeResultService {
                 map.put("inventoryId",inventoryId);
                 map.put("flag",1);
                 OyeRealtimeInventory oyeRealtimeInventory = updateRealTimeInventory(map);
+                oyeInboundResult.setInventoryId(oyeRealtimeInventory.getInventoryId());
                 oyeRealtimeInventoriesUpdate.add(oyeRealtimeInventory);
             }
             if (!map.get("place").equals(map.get("inboundWarehouse"))) {
@@ -242,7 +245,10 @@ public class OyeResultServiceImpl implements IOyeResultService {
         oyeRealtimeInventory.setInboundWarehouse(map.get("inboundWarehouse").toString());
         oyeRealtimeInventory.setInboundArea(map.get("inboundArea").toString());
         oyeRealtimeInventory.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        oyeRealtimeInventory.setMeter(DataChange.dataToBigDecimal(map.get("meter")));
+        BigDecimal meter = DataChange.dataToBigDecimal(map.get("meter"));
+        if (meter != null || meter.intValue() !=0) {
+            oyeRealtimeInventory.setMeter(meter);
+        }
         oyeRealtimeInventory.setSingleWeight(DataChange.dataToBigDecimal(map.get("singleWeight")));
         oyeRealtimeInventory.setTheoryWeight(DataChange.dataToBigDecimal(map.get("theoryWeight")));
         oyeRealtimeInventory.setMaterialNumber(DataChange.dataToBigDecimal(map.get("materialNumber")));

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

@@ -802,69 +802,85 @@
     </select>
   <select id="receiveSendReport" resultType="java.util.Map">
     SELECT
-      "companyName",
-      "saleArea",
-      "inboundWarehouse",
-      "materialName",
-      "materialSpe",
-      "materialModel",
-      sum( "inboundMaterialNumber" ) "inboundMaterialNumber",
-      sum( "inboundMaterialWeight" ) "inboundMaterialWeight",
-      sum( "outboundMaterialNumber" ) "outboundMaterialNumber",
-      sum( "outboundMaterialWeight" ) "outboundMaterialWeight",
-      NVL( sum( OIR.MATERIAL_NUMBER ), 0 ) "currentInboundMaterialNumber",
-      NVL( SUM( OOR.MATERIAL_NUMBER ), 0 ) "currentOutboundMaterialNumber",
-      NVL( SUM( OIR.THEORY_WEIGHT ), 0 ) "currentInboundTheoryWeight",
-      NVL( SUM( OOR.THEORY_WEIGHT ), 0 ) "currentOutboundTheoryWeight",
-      sum( "materialNumber" ) "materialNumber",
-      sum( "materialWeight" ) "materialWeight"
+    NVL(T1."inboundMaterialNumber",0) "inboundMaterialNumber",
+    NVL(T1."inboundMaterialWeight",0) "inboundMaterialWeight",
+    NVL(T2."outboundMaterialNumber",0) "outboundMaterialNumber",
+    NVL(T2."outboundMaterialWeight",0) "outboundMaterialWeight",
+    ORI.INVENTORY_ID,
+    ORI.SALE_AREA "saleArea",
+    RC.CONSIGNEE_COMPANY_NAME "companyName",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpe",
+    RM.MATERIAL_MODEL "materialModel",
+    ORI.INBOUND_WAREHOUSE "inboundWarehouse",
+    NVL(T3."currentInboundMaterialNumber",0) "currentInboundMaterialNumber",
+    NVL(T3."currentInboundTheoryWeight",0) "currentInboundTheoryWeight",
+    NVL(T4."currentOutboundMaterialNumber",0) "currentOutboundMaterialNumber",
+    NVL(T4."currentOutboundTheoryWeight",0) "currentOutboundTheoryWeight",
+    NVL(ORI.MATERIAL_NUMBER,0) "materialNumber",
+    NVL(ORI.THEORY_WEIGHT,0) "materialWeight"
+    FROM
+    (
+    SELECT
+    oir.INVENTORY_ID "INVENTORY_ID",
+    NVL( SUM( OIR.MATERIAL_NUMBER ), 0 ) "inboundMaterialNumber",
+    NVL( SUM( OIR.THEORY_WEIGHT ), 0 ) "inboundMaterialWeight"
+    FROM
+    OYE_REALTIME_INVENTORY ORI
+    LEFT JOIN OYE_INBOUND_RESULT OIR ON OIR.INVENTORY_ID = ORI.INVENTORY_ID
+    GROUP BY
+    oir.INVENTORY_ID
+    ) T1
+    LEFT JOIN (
+    SELECT
+    oor.INVENTORY_ID "INVENTORY_ID",
+    NVL( SUM( OOR.MATERIAL_NUMBER ), 0 ) "outboundMaterialNumber",
+    NVL( SUM( OOR.THEORY_WEIGHT ), 0 ) "outboundMaterialWeight"
     FROM
-      (
-        SELECT
-          NVL( SUM( ORI.MATERIAL_NUMBER ), 0 ) "materialNumber",
-          NVL( SUM( ORI.THEORY_WEIGHT ), 0 ) "materialWeight",
-          RC.CONSIGNEE_COMPANY_NAME "companyName",
-          ORI.SALE_AREA "saleArea",
-          ORI.INBOUND_WAREHOUSE "inboundWarehouse",
-          NVL( SUM( OIR.MATERIAL_NUMBER ), 0 ) "inboundMaterialNumber",
-          NVL( SUM( OIR.THEORY_WEIGHT ), 0 ) "inboundMaterialWeight",
-          NVL( SUM( OOR.MATERIAL_NUMBER ), 0 ) "outboundMaterialNumber",
-          NVL( SUM( OOR.THEORY_WEIGHT ), 0 ) "outboundMaterialWeight",
-          ORI.INVENTORY_ID "inventoryId",
-          RM.MATERIAL_NAME "materialName",
-          RM.MATERIAL_SPECIFICATION "materialSpe",
-          RM.MATERIAL_MODEL "materialModel"
-        FROM
-          OYE_REALTIME_INVENTORY ORI
-            LEFT JOIN OYE_INBOUND_RESULT OIR ON OIR.INVENTORY_ID = ORI.INVENTORY_ID
-            LEFT JOIN OYE_OUTBOUND_RESULT OOR ON OOR.INVENTORY_ID = ORI.INVENTORY_ID
-            LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ORI.CONSIGNEE_ID
-            LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ORI.MATERIAL_ID
-        GROUP BY
-          ORI.INVENTORY_ID,
-          RC.CONSIGNEE_COMPANY_NAME,
-          ORI.SALE_AREA,
-          ORI.INBOUND_WAREHOUSE,
-          RM.MATERIAL_NAME,
-          RM.MATERIAL_SPECIFICATION,
-          RM.MATERIAL_MODEL
-      ) TT
-        LEFT JOIN OYE_INBOUND_RESULT OIR ON OIR.INVENTORY_ID = TT."inventoryId"
-        <if test="oneDate != null">
-          and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = OIR.INSERT_TIME
-        </if>
-        <if test="startDate != null">
-          and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OIR.INSERT_TIME
-          and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OIR.INSERT_TIME
-        </if>
-        LEFT JOIN OYE_OUTBOUND_RESULT OOR ON OOR.INVENTORY_ID = TT."inventoryId"
-        <if test="oneDate != null">
-          and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = OOR.INSERT_TIME
-        </if>
-        <if test="startDate != null">
-          and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OOR.INSERT_TIME
-          and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OOR.INSERT_TIME
-        </if>
+    OYE_REALTIME_INVENTORY ORI
+    LEFT JOIN OYE_OutBOUND_RESULT OOR ON OOR.INVENTORY_ID = ORI.INVENTORY_ID
+    GROUP BY
+    oor.INVENTORY_ID
+    ) T2 ON T2.INVENTORY_ID = T1.INVENTORY_ID
+    LEFT JOIN OYE_REALTIME_INVENTORY ORI ON ORI.INVENTORY_ID = T1."INVENTORY_ID"
+    LEFT JOIN (
+    SELECT
+    OIR.INVENTORY_ID "INVENTORY_ID",
+    NVL( sum( OIR.MATERIAL_NUMBER ), 0 ) "currentInboundMaterialNumber",
+    NVL( SUM( OIR.THEORY_WEIGHT ), 0 ) "currentInboundTheoryWeight"
+    FROM
+    OYE_INBOUND_RESULT OIR
+    WHERE
+    <if test="oneDate != null">
+      to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = OIR.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OIR.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OIR.INSERT_TIME
+    </if>
+    GROUP BY
+    OIR.INVENTORY_ID
+    ) T3 ON T3."INVENTORY_ID" = T1."INVENTORY_ID"
+    LEFT JOIN (
+    SELECT
+    OOR.INVENTORY_ID "INVENTORY_ID",
+    NVL( SUM( OOR.MATERIAL_NUMBER ), 0 ) "currentOutboundMaterialNumber",
+    NVL( SUM( OOR.THEORY_WEIGHT ), 0 ) "currentOutboundTheoryWeight"
+    FROM
+    OYE_OUTBOUND_RESULT OOR
+    WHERE
+    <if test="oneDate != null">
+      AND to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = OOR.INSERT_TIME
+    </if>
+    <if test="startDate != null">
+      to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  OOR.INSERT_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OOR.INSERT_TIME
+    </if>
+    GROUP BY
+    OOR.INVENTORY_ID
+    ) T4 ON T4."INVENTORY_ID" = T1."INVENTORY_ID"
+    LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ORI.CONSIGNEE_ID
+    LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ORI.MATERIAL_ID
     <where>
       <if test="companyName != null and companyName != ''">
         AND  "companyName" LIKE '%${companyName}%'
@@ -891,13 +907,6 @@
         </foreach>
       </if>
     </where>
-    GROUP BY
-      TT."companyName",
-      TT."saleArea",
-      TT."inboundWarehouse",
-      "materialName",
-      "materialSpe",
-      "materialModel"
   </select>
   <select id="getSaleAreaRemark" resultType="java.lang.String">
     SELECT RSR.SALE_REMARK FROM RMS_SALER_REMAR RSR