From f72f8e6b9f82a868a970934dce4f41c3c9250eca Mon Sep 17 00:00:00 2001 From: "han\\hanst" Date: Wed, 15 Apr 2026 16:09:17 +0800 Subject: [PATCH] selectBoxListTX --- .../ecss/controller/CoDelController.java | 7 +++++++ .../sys/modules/ecss/mapper/CoDelMapper.java | 2 ++ .../modules/ecss/service/CoDelService.java | 5 ++++- .../service/impl/CoDelExcelTXServiceImpl.java | 8 +++---- .../ecss/service/impl/CoDelServiceImpl.java | 5 +++++ .../resources/mapper/ecss/CoDelMapper.xml | 21 +++++++++++++++++-- 6 files changed, 41 insertions(+), 7 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 ed875dad..6e519594 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 @@ -283,6 +283,13 @@ public class CoDelController { return R.ok().put("rows", rows); } + @PostMapping("/selectBoxListTX") + @ResponseBody + public R selectBoxListTX(@RequestBody EcssCoDelNotifyHeaderData inData){ + List rows =coDelService.selectBoxListTX(inData); + return R.ok().put("rows", rows); + } + @PostMapping("/searchCoDelPalletDataNew") @ResponseBody public R searchCoDelPalletDataNew(@RequestBody EcssCoDelNotifyHeaderData inData){ diff --git a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java index 43f9eeea..19df4a2e 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java +++ b/src/main/java/com/xujie/sys/modules/ecss/mapper/CoDelMapper.java @@ -270,6 +270,8 @@ public interface CoDelMapper { List selectBoxList(EcssCoDelNotifyHeaderData inData); + List selectBoxListTX(EcssCoDelNotifyHeaderData inData); + void updateBoxInfo(Map boxData); void deleteBoxInfo(Map boxData); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java b/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java index 65469640..db5878fb 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/CoDelService.java @@ -18,7 +18,7 @@ public interface CoDelService { List searchEcssCoDelNotifyDetail(EcssCoDelNotifyHeaderData data); void updateEcssDelHeader(EcssCoDelNotifyHeaderData data); - + // 专门更新客户信息 void updateCustomerInfo(EcssCoDelNotifyHeaderData data); @@ -58,6 +58,9 @@ public interface CoDelService { List selectBoxList(EcssCoDelNotifyHeaderData inData); + List selectBoxListTX(EcssCoDelNotifyHeaderData inData); + + void updateBoxInfo(Map boxData); void deleteBoxInfo(Map boxData); diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java index 4db2f2ec..2fb91816 100644 --- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelTXServiceImpl.java @@ -1520,7 +1520,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { if (palletHeaderDataList.isEmpty()) { totalKgs = BigDecimal.valueOf(0.1); } - List list = coDelMapper.selectBoxList(notifyHeader); + List list = coDelMapper.selectBoxListTX(notifyHeader); BigDecimal totalCartons = BigDecimal.valueOf(0.0); for (int m = 0; m < list.size(); m++) { totalCartons = totalCartons.add(new BigDecimal(list.get(m).get("box_qty") != null ? @@ -1586,7 +1586,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { StringBuilder ponos = new StringBuilder(); poNoMap.forEach((key, value) -> ponos.append(key + " ")); template.addVar("poNo", ponos); - List list = coDelMapper.selectBoxList(notifyHeader); + List list = coDelMapper.selectBoxListTX(notifyHeader); // DB中item_no可能是字符串区间（如"127~127"、"2~26"），直接查询顺序可能不稳定，导出前做自然排序 sortBoxListBySeqAndItemNo(list); BigDecimal totalCartons = BigDecimal.valueOf(0.0); @@ -1821,7 +1821,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { StringBuilder ponos = new StringBuilder(); poNoMap.forEach((key, value) -> ponos.append(key + " ")); template.addVar("poNo", ponos); - List list = coDelMapper.selectBoxList(notifyHeader); + List list = coDelMapper.selectBoxListTX(notifyHeader); // DB中item_no可能是字符串区间（如"127~127"、"2~26"），直接查询顺序可能不稳定，导出前做自然排序 sortBoxListBySeqAndItemNo(list); BigDecimal totalCartons = BigDecimal.valueOf(0.0); @@ -2186,7 +2186,7 @@ public class CoDelExcelTXServiceImpl implements CoDelExcelTXService { private BigDecimal calculateVolumeByMaterials(EcssCoDelNotifyHeaderData notifyHeader) { try { // 1. 查询箱子列表（每个箱子包含box_qty、长宽高等信息） - List boxList = coDelMapper.selectBoxList(notifyHeader); + List boxList = coDelMapper.selectBoxListTX(notifyHeader); if (boxList == null || boxList.isEmpty()) { log.debug("未找到装箱数据，发货单号: {}", notifyHeader.getDelNo()); 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 1dc0f8f2..2e7defb6 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 @@ -546,6 +546,11 @@ public class CoDelServiceImpl implements CoDelService { return coDelMapper.selectBoxList(inData); } + @Override + public List selectBoxListTX(EcssCoDelNotifyHeaderData inData) { + return coDelMapper.selectBoxListTX(inData); + } + @Override public List searchCoDelPalletDataNew(EcssCoDelNotifyHeaderData inData) { return coDelMapper.searchCoDelPalletDataNew(inData); diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml index 14b70568..1afd6768 100644 --- a/src/main/resources/mapper/ecss/CoDelMapper.xml +++ b/src/main/resources/mapper/ecss/CoDelMapper.xml @@ -1328,11 +1328,28 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no left join part_sub_properties_value w on d.part_no = w.part_no and w.site = d.site and w.bu_no = d.bu_no and w.record_type='ECSSPART' and w.code_no='BG001' and w.properties_item_no='BOXWEIGHT' where a.site = #{site} and a.bu_no = #{buNo} and a.delNo = #{delNo} + + +