From 4acd95291643973962aa7b119d749b48c7080939 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 5 Jul 2025 13:19:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?demand:=20=20=E8=99=9A=E6=8B=9F=E5=8D=95?= =?UTF-8?q?=E4=B8=BB=E5=8D=95A=E6=8D=A2=E4=B8=BB=E5=8D=95B=EF=BC=8C?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8D=95=E3=80=81=E4=B8=BB=E5=8D=95B?= =?UTF-8?q?=E3=80=81=E4=B8=BB=E5=8D=95A=E9=83=BD=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=91=E5=AE=9A=E5=85=B3=E7=B3=BB=E3=80=82?= =?UTF-8?q?=20=20=20=E6=8A=A5=E4=BB=B7=E6=97=B6=E9=97=B4=E4=BA=A4=E5=8F=89?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91bug=E4=BF=AE=E5=A4=8D=20com?= =?UTF-8?q?mitter:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/service/EmisBaseService.java | 29 ++++++++++++------- .../resources/mapper/EmisQuotePriceMapper.xml | 3 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index d02e1fe2d..68c7eee56 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -5119,6 +5119,9 @@ public class EmisBaseService { emisWaybill.setVirtualRemark(virtualRemark); emisWaybill.setId(masterWaybill.getId()); emisWaybillMapper.updateEmisWaybill(emisWaybill); + if(StringUtil.isNotBlank(emisWaybillOld.getMasterBillCode())){ + updateOldMasterBill(emisWaybillSave,emisWaybillOld.getMasterBillCode()); + } } public EmisWaybill checkVirtualParam(EmisWaybill emisWaybillSave, EmisWaybill emisWaybillOld) throws EmisBizError { @@ -5181,17 +5184,7 @@ public class EmisBaseService { String masterBillCode = emisWaybillOld.getMasterBillCode(); if (StringUtil.isNotBlank(masterBillCode)) { emisWaybillSave.setMasterBillCode(" "); - String virtualBillCode = emisWaybillSave.getBillCode(); - EmisWaybill masterWaybill = emisWaybillMapper - .selectEmisWaybillByBillCode(masterBillCode); - List filterVirtualRemark = Arrays.stream(masterWaybill.getVirtualRemark().split(",")) - .filter(i -> !i.equals(virtualBillCode)).collect(Collectors.toList()); - String virtualRemark = String.join(",", filterVirtualRemark); - if(StringUtil.isBlank(virtualRemark)) { - virtualRemark = " "; - } - masterWaybill.setVirtualRemark(virtualRemark); - emisWaybillMapper.updateEmisWaybill(masterWaybill); + updateOldMasterBill(emisWaybillSave, masterBillCode); if (!"078".equals(emisWaybillSave.getTransLineType())) { emisWaybillProblemInfoService.deleteEmisWaybillProblemInfoByBillCode(emisWaybillSave.getBillCode()); } @@ -5201,6 +5194,20 @@ public class EmisBaseService { } } + private void updateOldMasterBill(EmisWaybill emisWaybillSave, String masterBillCode) { + String virtualBillCode = emisWaybillSave.getBillCode(); + EmisWaybill masterWaybill = emisWaybillMapper + .selectEmisWaybillByBillCode(masterBillCode); + List filterVirtualRemark = Arrays.stream(masterWaybill.getVirtualRemark().split(",")) + .filter(i -> !i.equals(virtualBillCode)).collect(Collectors.toList()); + String virtualRemark = String.join(",", filterVirtualRemark); + if(StringUtil.isBlank(virtualRemark)) { + virtualRemark = " "; + } + masterWaybill.setVirtualRemark(virtualRemark); + emisWaybillMapper.updateEmisWaybill(masterWaybill); + } + public static void main(String[] args) throws ParseException { // Date startDate = new Date("202"); Date startDate= new SimpleDateFormat("yyyy-MM-dd").parse("2025-05-11"); diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml index c9d65596a..2f70bce1a 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml @@ -183,8 +183,7 @@ and ( disp_area_id=#{dispAreaId} or disp_area_site_code='-1' ) and ( send_area_id=#{sendAreaId} or send_area_site_code='-1') and ( - ( start_date #{startDate} and #{startDate} end_date ) or ( start_date - #{endDate} and #{endDate} end_date ) + start_date <= #{endDate} and end_date >= #{startDate} ) From 74f4bd80ba20dc6d090f8ad52852005de217ab3c Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Sat, 5 Jul 2025 17:18:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=A0=91=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B8=82=E5=9C=BA=E9=83=A8-=E5=88=86=E6=8B=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=8F=AF=E4=BA=92=E6=8D=A2=20committer:=20he?= =?UTF-8?q?yu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xdadan/erp/emis/service/EmisBaseService.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 68c7eee56..48ca4551b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -4140,19 +4140,29 @@ public class EmisBaseService { List toAdd = new ArrayList<>(); for (EmisTransPlanRule node : topLevelNodes) { - // 柯桥市场部 + //南京市场部 if ("25001".equals(node.getStartSiteCode())) { + List filterRules = allRules.stream().filter(i -> "25000".equals(i.getStartSiteCode())).collect(Collectors.toList()); EmisTransPlanRule copyRule = new EmisTransPlanRule(); BeanUtils.copyProperties(node, copyRule); copyRule.setStartSiteCode("25000"); + copyRule.setStartSiteName("南京分拨中心"); + if(CollectionUtil.isNotEmpty(filterRules)){ + copyRule.setManager(filterRules.get(0).getManager()); + } toAdd.add(copyRule); continue; } - // 南京市场部 + // 柯桥市场部 if ("57502".equals(node.getStartSiteCode())) { + List filterRules = allRules.stream().filter(i -> "57501".equals(i.getStartSiteCode())).collect(Collectors.toList()); EmisTransPlanRule copyRule = new EmisTransPlanRule(); BeanUtils.copyProperties(node, copyRule); copyRule.setStartSiteCode("57501"); + copyRule.setStartSiteName("柯桥分拨中心"); + if(CollectionUtil.isNotEmpty(filterRules)){ + copyRule.setManager(filterRules.get(0).getManager()); + } toAdd.add(copyRule); } }