From d9c71d2743151f054d00b6b6f1bd81e0aed7e713 Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Tue, 16 Dec 2025 11:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BBrolls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoDelExcelServiceImpl.java | 16 ---------------- .../mapper/ecss/EcssCommonMapper.xml | 2 +- .../resources/templates/packing-template.xlsx | Bin 10817 -> 10839 bytes 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java index b0459235..09a39101 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java +++ b/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需要 diff --git a/src/main/resources/mapper/ecss/EcssCommonMapper.xml b/src/main/resources/mapper/ecss/EcssCommonMapper.xml index 197a3a6a..ebf66394 100644 --- a/src/main/resources/mapper/ecss/EcssCommonMapper.xml +++ b/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, diff --git a/src/main/resources/templates/packing-template.xlsx b/src/main/resources/templates/packing-template.xlsx index 1547702cc153867cf376653232e6f9a046458299..ccddbd3085571eb42d8798323e32b992c94a37ba 100644 GIT binary patch delta 3380 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 E0FuH-U;qFB delta 3311 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 t`VVCR005c-000pH000000000000000g_G|oJ^>+