From 18d9502e98372086989a572db826d4bcc11dcdff Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 4 Dec 2025 10:57:01 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20TMS-=E7=BD=91=E7=82=B9=E8=B4=B9?=
=?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7-=E4=B8=9A=E5=8A=A1=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E4=BF=AE=E6=94=B9=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?=
=?UTF-8?q?=E8=BF=99=E4=B8=AA=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E5=B7=B2?=
=?UTF-8?q?=E7=BB=8F=E5=81=9C=E7=94=A8=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=AE=A9?=
=?UTF-8?q?=E4=BB=96=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../erp/emis/domain/EmisTmsSiteBatchMiss.java | 2 ++
.../resources/mapper/EmisTmsSiteBatchMissMapper.xml | 13 +++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
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 15baf7720..44ff82ed6 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
@@ -128,6 +128,8 @@ public class EmisTmsSiteBatchMiss extends BaseEntity {
private String blIsQuestion;
/* 问题件类型 */
private Integer problemType;
+ /* 问题件类型名称 */
+ private String problemTypeName;
/* 问题件原因 */
private String problemCause;
private String virtualRemark;
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
index b5fddd127..516588417 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -66,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question,
l.line_name as line_name,
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
- w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code,
+ w.product_type,w.problem_type,pt.type_name as problem_type_name,w.problem_cause,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,
@@ -90,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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'
+ left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0'
@@ -102,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.send_site_code, s1.site_name as send_site_name,s2.site_name as start_site_name,s3.site_name as next_site_name, w.send_country, c1.name as send_country_name, w.destination_code, s4.site_name as dispatch_underling_site_name,w.bl_is_question,
l.line_name as line_name,
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
- w.product_type,w.problem_type,w.problem_cause,w.virtual_remark,w.dispatch_underling_site_code,
+ w.product_type,w.problem_type,pt.type_name as problem_type_name,w.problem_cause,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,
@@ -126,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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'
+ left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0'
@@ -193,7 +196,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question,
l.line_name as line_name,
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
- w.problem_type, w.problem_cause,
+ w.problem_type, pt.type_name as problem_type_name, w.problem_cause,
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,
@@ -218,6 +221,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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'
+ left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0'
b.site_batch_status = '1'
@@ -432,7 +436,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
w.send_country, c1.name as send_country_name, w.destination_code, s2.site_name as dispatch_underling_site_name, w.bl_is_question,
l.line_name as line_name,
w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date,
- w.problem_type, w.problem_cause,
+ w.problem_type, pt.type_name as problem_type_name, w.problem_cause,
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,
@@ -457,6 +461,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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'
+ left join emis_problem_type pt on w.problem_type=pt.id and pt.del_flag='0'
b.site_batch_status = '1'