From 6826a0679790b64c8f5a92b66eb08c234a273b6a Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 9 Sep 2025 17:48:42 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E8=BF=90?=
=?UTF-8?q?=E8=BE=93=E7=AE=A1=E7=90=86=20-=20=E6=BC=8F=E7=BB=84=E6=89=B9?=
=?UTF-8?q?=E6=AC=A1=E8=AE=A2=E5=8D=95=E7=95=8C=E9=9D=A2=20-=20=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E9=94=80=E5=94=AE?=
=?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E3=80=81=E5=9B=9E=E6=AC=BE=E8=81=94?=
=?UTF-8?q?=E7=B3=BB=E4=BA=BA=E3=80=81=E5=BD=95=E5=85=A5=E4=BA=BA=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
committer: heyu
---
.../erp/emis/domain/EmisTmsSiteBatchMiss.java | 14 ++++++++++-
.../mapper/EmisTmsSiteBatchMissMapper.xml | 25 +++++++++++++++++++
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java
index 947fc6b9e..f3154f785 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java
@@ -138,6 +138,18 @@ public class EmisTmsSiteBatchMiss extends BaseEntity {
/** 人工审核备注 */
private String manualRemark;
- /* 完成状态 1：系统审核完成，2：人工审核完成，3：无需组批次 默认为1*/
+ /* 完成状态 1：系统审核完成，2：人工审核完成，3：无需组批次 默认为1 */
private String blManual;
+
+ /* 收款人 */
+ @TableField(exist = false)
+ private String payee;
+
+ /* 销售员 */
+ @TableField(exist = false)
+ private String salesmen;
+
+ /* 录单人姓名 */
+ @TableField(exist = false)
+ private String registerManName;
}
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
index 4a64094cc..485ba5f0f 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
@@ -50,6 +50,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.product_type,w.problem_type,w.virtual_remark,w.dispatch_underling_site_code,
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, m.manager, k.trans_manager,
+ w.payee, w.salesmen, u.emp_name as registerManName,
(SELECT GROUP_CONCAT(s.name)
FROM emis_supplier s
WHERE FIND_IN_SET(s.code, m.supplier_code)
@@ -81,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join emis_trans_line k on w.trans_line_type=k.line_code and k.del_flag='0'
left join emis_trans_plan_rule r on m.trans_plan_rule_id=r.id and r.del_flag='0'
left join emis_trans_line l on m.line_code=l.line_code and l.del_flag='0'
+ left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0'
@@ -149,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight,
w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark,
null as manager, null as trans_manager,
+ w.payee, w.salesmen, u.emp_name as registerManName,
(SELECT GROUP_CONCAT(s.site_name ORDER BY FIND_IN_SET(s.site_code, w.start_site_code))
FROM emis_site s
WHERE FIND_IN_SET(s.site_code, w.start_site_code) AND s.del_flag = 0) as start_site_name,
@@ -168,6 +174,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join emis_site s2 on w.dispatch_underling_site_code=s2.site_code and s2.del_flag=0
left join emis_trans_line l on w.trans_line_type=l.line_code and l.del_flag=0
left join emis_country c2 on w.receive_country=c2.code and c2.del_flag=0
+ left join sys_user u on w.register_man_code=u.emp_code and u.del_flag='0'
b.site_batch_status = '1'
@@ -213,6 +220,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (w.start_site_code=#{params.privSiteCode} or w.send_site_code=#{params.privSiteCode})
+
+ AND w.payee like concat('%', #{payee}, '%')
+
+
+ AND w.salesmen like concat('%', #{salesmen}, '%')
+
+
+ AND u.emp_name like concat('%', #{registerManName}, '%')
+
@@ -314,6 +330,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and w.send_date #{params.endSendDate}
+
+ AND w.payee like concat('%', #{payee}, '%')
+
+
+ AND w.salesmen like concat('%', #{salesmen}, '%')
+
+
+ AND u.emp_name like concat('%', #{registerManName}, '%')
+
order by m.bill_code desc