aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: TMS-网点费用申请-业务申请修改时，如果这个月结客户已经停用，可以让他保存

Browse Source
This commit is contained in:
aike 2025-12-04 10:57:01 +08:00
parent a7017a0aa6
commit 18d9502e98
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchMiss.java
View File

@ -128,6 +128,8 @@ public class EmisTmsSiteBatchMiss extends BaseEntity {
private String blIsQuestion; private String blIsQuestion;
/* 问题件类型 */ /* 问题件类型 */
private Integer problemType; private Integer problemType;
/* 问题件类型名称 */
private String problemTypeName;
/* 问题件原因 */ /* 问题件原因 */
private String problemCause; private String problemCause;
private String virtualRemark; private String virtualRemark;

13
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
View File

@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="missType" column="miss_type"/> <result property="missType" column="miss_type"/>
<result property="virtualRemark" column="virtual_remark" /> <result property="virtualRemark" column="virtual_remark" />
<result property="problemType" column="problem_type" /> <result property="problemType" column="problem_type" />
<result property="problemTypeName" column="problem_type_name" />
<result property="problemCause" column="problem_cause" /> <result property="problemCause" column="problem_cause" />
<result property="dispatchUnderlingSiteCode" column="dispatch_underling_site_code" /> <result property="dispatchUnderlingSiteCode" column="dispatch_underling_site_code" />
<result property="dispatchUnderlingSiteName" column="dispatch_underling_site_name" /> <result property="dispatchUnderlingSiteName" column="dispatch_underling_site_name" />
@ -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, 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, 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.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.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.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, 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_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 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 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'
</sql> </sql>
<sql id="selectEmisTmsSiteBatchMissVoV2"> <sql id="selectEmisTmsSiteBatchMissVoV2">
@ -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, 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, 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.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.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.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, 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_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 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 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'
</sql> </sql>
<!-- <select id="selectEmisTmsSiteBatchMissList" parameterType="EmisTmsSiteBatchMiss" resultMap="EmisTmsSiteBatchMissResult">--> <!-- <select id="selectEmisTmsSiteBatchMissList" parameterType="EmisTmsSiteBatchMiss" resultMap="EmisTmsSiteBatchMissResult">-->
@ -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, 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, 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.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.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, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark,
null as manager, null as trans_manager, 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_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 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 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'
<where> <where>
b.site_batch_status = '1' b.site_batch_status = '1'
<if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )"> <if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 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, 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, 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.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.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, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark,
null as manager, null as trans_manager, 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_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 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 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'
<where> <where>
b.site_batch_status = '1' b.site_batch_status = '1'
<if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )"> <if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">