Redeem 1 vuosi sitten
vanhempi
commit
c845322e1d

+ 7 - 1
src/main/java/com/steerinfo/dil/service/impl/OyeResultServiceImpl.java

@@ -48,14 +48,17 @@ public class OyeResultServiceImpl implements IOyeResultService {
         int i = 0;
         for (Map<String,Object> map : mapList) {
             if(i == 0) {
+                i++;
                 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);
+                map.put("orderNetWeight",0);
             }
+            i++;
         }
-        return oyeInboundResultMapper.getOyeInboundResult(mapValue);
+        return mapList;
     }
 
 
@@ -190,6 +193,9 @@ public class OyeResultServiceImpl implements IOyeResultService {
             if(materialNumber == null || materialNumber.intValue() == 0) {
                 throw new Exception("物资件数错误");
             }
+            if(netWeight == null || netWeight.intValue() == 0) {
+                continue;
+            }
             //查询比例
             BigDecimal compareValue = DataChange.dataToBigDecimal(oyeRealtimeInventoryMapper.selectCompareValue());
             BigDecimal theoryAdd = theoryWeightSaleMaterial.multiply(compareValue.add(new BigDecimal(1)));