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'