修改

pom.xml

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

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

@@ -44,6 +44,17 @@ public class OyeResultServiceImpl implements IOyeResultService {
 
 
     public List<Map<String, Object>> getOyeInboundResult(Map<String, Object> mapValue) {
+        List<Map<String,Object>> mapList = oyeInboundResultMapper.getOyeInboundResult(mapValue);
+        int i = 0;
+        for (Map<String,Object> map : mapList) {
+            if(i == 0) {
+                continue;
+            }
+            Map<String,Object> stringObjectMap = mapList.get(i-1);
+            if (DataChange.dataToBigDecimal(stringObjectMap.get("weightBatchId")).compareTo(DataChange.dataToBigDecimal(map.get("weightBatchId"))) == 0) {
+                map.put("netWeight",0);
+            }
+        }
         return oyeInboundResultMapper.getOyeInboundResult(mapValue);
     }
 

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

@@ -853,7 +853,8 @@
            OO.ORDER_ID          "orderId",
            OO.ORDER_NUMBER      "orderNumber",
            OO.CAPACITY_ID       "capacityId",
-           ASM.EAS_PRIMARY_ID   "easPrimaryId"
+           ASM.EAS_PRIMARY_ID   "easPrimaryId",
+           TWB.WEIGHT_BATCH_ID  "weightBatchId"
            FROM OYE_INBOUND_RESULT OIR
            LEFT JOIN RMS_MATERIAL RM on OIR.MATERIAL_ID = RM.MATERIAL_ID
            LEFT JOIN RMS_CONSIGNEE RC on OIR.CONSIGNEE_ID = RC.CONSIGNEE_ID
@@ -896,7 +897,7 @@
                </foreach>
            </if>
            </where>
-           ORDER BY OIR.INSERT_TIME DESC
+           ORDER BY TWB.WEIGHT_BATCH_ID desc
   </select>
     <select id="selectSaleMaterialID" resultType="java.math.BigDecimal">
       SELECT OIR.SALE_MATERIAL_ID FROM OYE_INBOUND_RESULT OIR