总rolls

src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java

@@ -2396,16 +2396,6 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
 
             // 判断当前箱子所有明细的rolls是否全部为空或0
             boolean allDetailRollsEmptyOrZero = true;
-            for (int j = 0; j < checkList.size(); j++) {
-                Object rollsObj = checkList.get(j).get("rolls");
-                if (rollsObj != null) {
-                    BigDecimal rollsValue = (BigDecimal) rollsObj;
-                    if (rollsValue.compareTo(BigDecimal.ZERO) != 0) {
-                        allDetailRollsEmptyOrZero = false;
-                        break;
-                    }
-                }
-            }
             // 获取box的rolls
             BigDecimal boxRolls = list.get(m).get("rolls") != null ?
                 ((BigDecimal) list.get(m).get("rolls")).setScale(0, RoundingMode.HALF_UP) : BigDecimal.ZERO;
@@ -2430,12 +2420,6 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                     if (isFirstRow) {
                         rolls = rolls.add(boxRolls);
                     }
-                } else {
-                    // 使用明细的rolls
-                    BigDecimal cuRolls = eorder.get("rolls") != null ?
-                        ((BigDecimal) eorder.get("rolls")).setScale(0, RoundingMode.HALF_UP) : BigDecimal.ZERO;
-                    eorder.put("rolls", cuRolls);
-                    rolls = rolls.add(cuRolls);
                 }
                 EcssCoDelNotifyDetailData nodifyData = notifyDetailMap.get(partNo);
                 // 只有RFID需要

src/main/resources/mapper/ecss/EcssCommonMapper.xml

@@ -63,7 +63,7 @@
 			t.part_no,
 			t.qty,
 			CASE WHEN t.rn = 1 THEN t.box_qty ELSE NULL END AS boxQty,
-			CASE WHEN t.rn = 1 THEN isnull(t.rolls,t.allRolls) ELSE 0 END AS rolls,
+			CASE WHEN t.rn = 1 THEN t.allRolls ELSE 0 END AS rolls,
 			t.pn,
 			CASE WHEN t.rn = 1 THEN t.grossWeight ELSE NULL END AS grossWeight,
 			CASE WHEN t.rn = 1 THEN t.netWeight ELSE NULL END AS netWeight,