From 45ed339931541d60a653ec49cce522ea92183eab Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Fri, 6 Jun 2025 11:49:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6,=E6=96=B0=E5=A2=9E=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=BB=B4=E6=8A=A4=E9=A1=B9=E7=AD=89=20=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=AF=BC=E5=85=A5=E6=94=B9=E5=8D=95=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ecss/controller/CoDelController.java | 2 +- .../ecss/service/impl/CoDelServiceImpl.java | 27 ++++++++++++------- .../resources/mapper/ecss/CoDelMapper.xml | 6 ++--- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java b/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java index 2ac3a81b..ea4ee8b1 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java +++ b/src/main/java/com/xujie/sys/modules/ecss/controller/CoDelController.java @@ -256,7 +256,7 @@ public class CoDelController { @PostMapping("/getDeclarationDefaultData") public R getDeclarationDefaultData(@RequestBody EcssCoDelNotifyHeaderData inData){ Map map = coDelService.getDeclarationDefaultData(inData); - return R.ok().put("row",map.get("row")).put("rows",map.get("rows")).put("customers",map.get("customers")).put("customerAdd",map.get("customerAdd")); + return R.ok().put("row",map.get("row")).put("rows",map.get("rows")); } @PostMapping("/partInformationHsCode") diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java index 004207c9..833285d6 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelServiceImpl.java @@ -535,6 +535,11 @@ public class CoDelServiceImpl implements CoDelService { } catch (Exception e) { throw new RuntimeException("导入失败：" + e.getMessage()); } + for (EcssCoDelNotifyData data:excelList) { + if (!inData.getCmcInvoice().equals(data.getCmcInvoice())) { + throw new RuntimeException("导入失败：Excel中存在与发货通知单["+inData.getCmcInvoice()+"]不一致的发票号"); + } + } List notifyHeader = coDelMapper.checkIfHasHeader(excelList.get(0).getCmcInvoice()); EcssCoDelNotifyHeaderData headerData; if (notifyHeader.isEmpty()) { @@ -551,7 +556,7 @@ public class CoDelServiceImpl implements CoDelService { excelList.get(i).setItemNo(i + 1); } coDelMapper.batchSaveEcssCoDelNotifyDetail(excelList); - inData.setModifyFlag(true); + headerData.setModifyFlag(true); coDelMapper.updateEcssDelHeaderForModify(headerData); List newData =coDelMapper.searchEcssCoDelNotifyDetail(headerData); Map> dbMap = dbData.stream().collect(Collectors.groupingBy(EcssCoDelNotifyDetail::getPn)); @@ -602,12 +607,12 @@ public class CoDelServiceImpl implements CoDelService { @Override public void updateEcssDel(EcssCoDelNotifyHeaderData data) { List checkHeader = coDelMapper.checkEcssCoDelNotifyHeaderByDelNo(data.getSite(), data.getDelNo()); - if (checkHeader.size() == 0) { + if (checkHeader.isEmpty()) { throw new RuntimeException("不存在该发货通知单请刷新界面"); } - if (!"仓库已确认".equals(checkHeader.get(0).getNotifyStatus())) { + /* if (!"仓库已确认".equals(checkHeader.get(0).getNotifyStatus())) { throw new RuntimeException("发货通知单状态不为仓库已确认，请刷新页面。"); - } + }*/ coDelMapper.updateEcssDel(data); } @@ -1768,7 +1773,7 @@ public class CoDelServiceImpl implements CoDelService { if (data.getPackaging()!=null && data.getPackaging()) { template.addVar("packaging", "Non-reusable plastic packaging:"); // 根据维护参数计算出KGS=总托数*plastic packaging维护参数 - template.addVar("KGS_qty", (data.getKgs().multiply(BigDecimal.valueOf(totalPlt))).setScale(2, RoundingMode.HALF_UP)); + template.addVar("KGS_qty", data.getKgs()!=null?(data.getKgs().multiply(BigDecimal.valueOf(totalPlt))).setScale(2, RoundingMode.HALF_UP):""); template.addVar("KGS", "KGS"); } // 新加的 货物明细单选框 勾选显示 @@ -1940,7 +1945,7 @@ public class CoDelServiceImpl implements CoDelService { if (data.getPackaging()!=null && data.getPackaging()) { template.addVar("packaging", "Non-reusable plastic packaging:"); // 根据维护参数计算出KGS=总托数*plastic packaging维护参数 - template.addVar("KGS_qty", data.getKgs().multiply(BigDecimal.valueOf(totalPlt))); + template.addVar("KGS_qty", data.getKgs()!=null?(data.getKgs().multiply(BigDecimal.valueOf(totalPlt))).setScale(2, RoundingMode.HALF_UP):""); template.addVar("KGS", "KGS"); } // 新加的 货物明细单选框 勾选显示 @@ -2149,7 +2154,7 @@ public class CoDelServiceImpl implements CoDelService { .collect(Collectors.toMap(o -> o.getPartNo() + "$" + o.getPropertiesItemNo(), o -> o)); Map palletItemMap = new HashMap<>(); Map> palletListMap = new HashMap<>(); - int totalQty = 0; + //int totalQty = 0; for (EcssCoDelNotifyDetailData detailData : ecssCoDelNotifyDetail) { if (detailData.getQty().compareTo(BigDecimal.ZERO)==0) { continue; @@ -2164,7 +2169,7 @@ public class CoDelServiceImpl implements CoDelService { list.add(detailData); palletListMap.put(detailData.getPartNo(), list); } - totalQty = totalQty + detailData.getQty().intValue(); + //totalQty = totalQty + detailData.getQty().intValue(); } int seq = 0; int seqNo = coDelMapper.getCoDelPalletHeaderSeqNo(inData); @@ -2198,9 +2203,13 @@ public class CoDelServiceImpl implements CoDelService { headerData.setLength(palletData.getLength()); headerData.setWidth(palletData.getWidth()); headerData.setHeight(palletData.getHeight()); + int totalQty = 0; + for (EcssCoDelNotifyDetailData detailData : palletListMap.get(partNo)) { + totalQty = totalQty + detailData.getQty().intValue(); + } // 每托层数*箱高+底座高 headerData.setVolume(headerData.getLength().multiply(headerData.getWidth()).multiply(headerData.getHeight())); - BigDecimal boxWeight = BigDecimal.valueOf(propertiesBoxWeight.getNumValue());// 包装箱的重量 + BigDecimal boxWeight = BigDecimal.valueOf(propertiesBoxWeight.getNumValue());// 箱的重量 // Total Qty / 每箱EA BigDecimal noCartons = BigDecimal.valueOf(totalQty/((double) propertiesRollQty.getNumValue().intValue() * propertiesBoxRolls.getNumValue().intValue())); // 箱重量：物料维护里取 diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index e378dc11..5540f7ff 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -535,15 +535,15 @@ create_by,create_date,update_by,update_date