From 06ea898d8ad4d1a4a20337770fbe2620a2335d54 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 15 Jul 2025 19:15:25 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E8=BF=90=E5=8D=95=E5=BD=95?=
=?UTF-8?q?=E5=85=A5/=E8=BF=90=E5=8D=95=E4=BF=AE=E6=94=B9/=E8=BF=90?=
=?UTF-8?q?=E5=8D=95=E6=89=B9=E9=87=8F=E5=BD=95=E5=85=A5/=E7=BD=91?=
=?UTF-8?q?=E7=82=B9=E8=B4=B9=E7=94=A8=E7=94=B3=E8=AF=B7=EF=BC=9A=E7=9B=AE?=
=?UTF-8?q?=E7=9A=84=E5=9B=BD=E3=80=81=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E3=80=81=E5=AF=84=E4=BB=B6=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81=E5=92=8C=E8=B5=B7=E5=A7=8B?=
=?UTF-8?q?=E7=BD=91=E7=82=B9=E4=B8=80=E8=87=B4,=20=E6=8A=A5=E4=BB=B7?=
=?UTF-8?q?=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=E6=94=B9=E4=B8=BA=E6=A0=B9?=
=?UTF-8?q?=E6=8D=AE=E5=A7=8B=E5=8F=91=E7=BD=91=E7=82=B9=E8=AE=A1=E7=AE=97?=
=?UTF-8?q?=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../erp/emis/service/EmisBaseService.java | 8 ++---
.../impl/EmisTmsScanRecordServiceImpl.java | 4 +--
.../resources/mapper/EmisWaybillMapper.xml | 34 +++++++++++++------
3 files changed, 30 insertions(+), 16 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 da7574095..00eb1fa52 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
@@ -2619,8 +2619,8 @@ public class EmisBaseService {
order.put("kdgs", "TANEX");
- // 获取起始网点
- EmisSite sendSite = getSiteByCode(waybill.getSendSiteCode());
+ // 获取始发网点
+ EmisSite startSite = getSiteByCode(waybill.getStartSiteCode());
// 计算三段码 目的网点2字码+目的地名称
String destSite2Code = "";
@@ -2636,7 +2636,7 @@ public class EmisBaseService {
destName=destination.getDestName();
}
- String package3dm=sendSite.getSiteName()+'-'+destName;
+ String package3dm=startSite.getSiteName()+'-'+destName;
String packageWJC=destSite2Code;
String pdfInfo="["+package3dm+"]["+packageWJC+"]";
order.put("pdfInfo", pdfInfo);
@@ -2756,7 +2756,7 @@ public class EmisBaseService {
extData.put("k7",WaybillHelper.removeUnSeeChar(k7));
- extData.put("k8",WaybillHelper.removeUnSeeChar(sendSite.getSiteNameEn()));
+ extData.put("k8",WaybillHelper.removeUnSeeChar(startSite.getSiteNameEn()));
extData.put("k10",WaybillHelper.removeUnSeeChar(waybill.getSendSiteName()));
extData.put("k9",WaybillHelper.removeUnSeeChar(destSite.getSiteNameEn()));
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 535e26516..4f64543d6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -2095,8 +2095,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// }
// }
- emisTmsScanRecord.setScanSite(emisWaybill.getSendSiteName());
- emisTmsScanRecord.setScanSiteCode(emisWaybill.getSendSiteCode());
+ emisTmsScanRecord.setScanSite(emisWaybill.getStartSiteName());
+ emisTmsScanRecord.setScanSiteCode(emisWaybill.getStartSiteCode());
String dispatchOrSendManCode = MapUtils.getString(scanDataItem,"dispatchOrSendManCode",null);
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 14cbdf288..4b7bdcb26 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -814,6 +814,7 @@
and (
a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
and (
a.take_piece_employee_code=#{params.privEmpCode}
or (a.pickup_method in('1','3') and a.operate_employee_code is null )
@@ -1110,7 +1111,7 @@
and (
- a.send_site_code=#{params.privSiteCode}
+ a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode}
)
@@ -1299,7 +1300,8 @@
and payment_remark like concat('%', #{paymentRemark}, '%')
and order_remark like concat('%', #{orderRemark}, '%')
- and FIND_IN_SET(`send_site_code`,#{sendSiteCode})
+ and (a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode})
+
and a.remark like concat('%', #{remark}, '%')
and a.create_by= #{createBy}
@@ -1420,7 +1422,8 @@
select line_code from emis_trans_line etl where etl.trans_type=1
)
and bl_sign!='1' and waybill_status!='40'
- and a.send_site_code=#{params.privSiteCode} and a.current_site_code=#{params.privSiteCode}
+ and (a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode})
+ and a.current_site_code=#{params.privSiteCode}
@@ -1450,6 +1453,7 @@
a.send_site_code=#{params.privSiteCode}
or a.dispatch_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
or EXISTS (select 1 from emis_tms_scan_record etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
@@ -1512,6 +1516,7 @@
a.send_site_code=#{params.privSiteCode}
or
a.dispatch_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
or EXISTS (select 1 from emis_tms_scan_record etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
@@ -1844,6 +1849,7 @@
and (
a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
or a.dispatch_site_code=#{params.privSiteCode}
or EXISTS (select 1 from emis_tms_scan_record etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
@@ -1929,6 +1935,7 @@
and (
a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
or
a.dispatch_underling_site_code=#{params.privSiteCode}
)
@@ -1979,6 +1986,7 @@
and (
a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
or a.dispatch_underling_site_code=#{params.privSiteCode}
)
@@ -2293,7 +2301,8 @@
select line_code from emis_trans_line etl where etl.trans_type=1
)
and bl_sign!='1' and waybill_status!='40'
- and a.send_site_code=#{params.privSiteCode} and a.current_site_code=#{params.privSiteCode}
+ and (a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode})
+ and a.current_site_code=#{params.privSiteCode}
@@ -2309,6 +2318,7 @@
and (
a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
or
a.dispatch_site_code=#{params.privSiteCode}
@@ -2500,6 +2510,7 @@
and (
a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode}
or
a.dispatch_site_code=#{params.privSiteCode}
or
@@ -2557,7 +2568,8 @@
and a.order_status in('0','3')
and (
- a.send_site_code=#{params.privSiteCode}
+ (a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode})
and (
a.take_piece_employee_code=#{params.privEmpCode}
or (a.pickup_method in('1','3') and a.operate_employee_code is null )
@@ -2579,7 +2591,8 @@
and a.waybill_status!='0'
and a.order_status!='2'
- and a.send_site_code=#{params.privSiteCode}
+ and (a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode})
and (
a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode}
@@ -2599,7 +2612,8 @@
where a.del_flag='0'
and a.order_status='2'
- and a.send_site_code=#{params.privSiteCode}
+ and (a.send_site_code=#{params.privSiteCode}
+ or a.start_site_code=#{params.privSiteCode})
and (
a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode}
@@ -2619,7 +2633,7 @@
where a.del_flag='0'
and a.order_status in('0','3')
- and a.send_site_code=#{params.privSiteCode}
+ and (a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode})
and exists (
select 1 from emis_waybill_change_to ewcto where a.bill_code=ewcto.bill_code and ewcto.change_from=#{params.privEmpCode}
)
@@ -2637,7 +2651,7 @@
where a.del_flag='0'
and a.waybill_status='40'
- and a.send_site_code=#{params.privSiteCode}
+ and (a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode})
and (
a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode}
@@ -2657,7 +2671,7 @@
where a.del_flag='0'
and a.bl_sign='1'
- and a.send_site_code=#{params.privSiteCode}
+ and (a.send_site_code=#{params.privSiteCode} or a.start_site_code=#{params.privSiteCode})
and (
a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode}