From 7975dbf3d234257e1f6fb6b33f0667a5aeca94d6 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 19 Jul 2025 16:34:59 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E8=B4=A2=E5=8A=A1=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E8=B4=B9=E7=94=A8=E5=AE=A1=E6=A0=B8=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E7=9C=8B=E5=88=B0=E9=A9=B3=E5=9B=9E=E5=8E=9F=E5=9B=A0bug?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=B8=AD=E5=BF=83=E8=BF=90=E5=8D=95?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=B3=95=E6=A0=B9=E6=8D=AE=E5=A4=9A?=
=?UTF-8?q?=E4=B8=AA=E5=AF=84=E4=BB=B6=E7=BD=91=E7=82=B9=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E8=BF=90=E5=8D=95=E8=A1=A5=E6=89=93?=
=?UTF-8?q?=E5=8D=B0=E9=83=A8=E5=88=86=E6=A8=A1=E6=9D=BF=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E5=8F=96=E5=A7=8B=E5=8F=91=E7=BD=91=E7=82=B9bug=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xdadan/erp/web/emis/EmisWaybillAjustApplyController.java | 1 +
.../java/com/xdadan/erp/emis/service/EmisBaseService.java | 5 ++++-
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
index 949ef3acb..859d9b958 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAjustApplyController.java
@@ -306,6 +306,7 @@ public class EmisWaybillAjustApplyController extends EmisBaseController
EmisWaybillAjustApply emisWaybillAjustApply = new EmisWaybillAjustApply();
emisWaybillAjustApply.setId(id);
emisWaybillAjustApply.setDestConfirmNote(spr.getDestConfirmNote());
+ emisWaybillAjustApply.setCenterConfirmNote(spr.getCenterConfirmNote());
emisWaybillAjustApplyService.auditCenterNoPass(emisWaybillAjustApply);
}catch (Exception ex){
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 5ce758f16..63c531b98 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
@@ -2623,6 +2623,9 @@ public class EmisBaseService {
if (StringUtils.isBlank(waybill.getStartSiteCode())) {
waybill.setStartSiteCode(waybill.getSendSiteCode());
}
+ if(StringUtils.isBlank(waybill.getStartSiteName())){
+ waybill.setStartSiteName(waybill.getSendSiteName());
+ }
EmisSite startSite = getSiteByCode(waybill.getStartSiteCode());
// 计算三段码 目的网点2字码+目的地名称
@@ -2760,7 +2763,7 @@ public class EmisBaseService {
extData.put("k7",WaybillHelper.removeUnSeeChar(k7));
extData.put("k8",WaybillHelper.removeUnSeeChar(startSite.getSiteNameEn()));
- extData.put("k10",WaybillHelper.removeUnSeeChar(waybill.getSendSiteName()));
+ extData.put("k10",WaybillHelper.removeUnSeeChar(waybill.getStartSiteName()));
extData.put("k9",WaybillHelper.removeUnSeeChar(destSite.getSiteNameEn()));
extData.put("k11",WaybillHelper.removeUnSeeChar(destSite.getSiteName()));
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index c1e9e1053..babd0ad05 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1300,7 +1300,7 @@
and payment_remark like concat('%', #{paymentRemark}, '%')
and order_remark like concat('%', #{orderRemark}, '%')
- and (a.send_site_code=#{sendSiteCode} or a.start_site_code=#{sendSiteCode})
+ and (FIND_IN_SET(`send_site_code`,#{sendSiteCode}) or FIND_IN_SET(`start_site_code`,#{sendSiteCode}))
and a.remark like concat('%', #{remark}, '%')