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 f3154f785..15baf7720 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 @@ -52,7 +52,7 @@ public class EmisTmsSiteBatchMiss extends BaseEntity { /* 寄件日期 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date sendDate; - /* 签收状态 */ + /* 签收状态 1已签收 0未签收*/ private String blSign; /* 签收时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @@ -126,8 +126,11 @@ public class EmisTmsSiteBatchMiss extends BaseEntity { /* 是否问题件 1-是 0-否 */ private String blIsQuestion; - private String virtualRemark; + /* 问题件类型 */ private Integer problemType; + /* 问题件原因 */ + private String problemCause; + private String virtualRemark; /* 目的地网点代码 */ private String dispatchUnderlingSiteCode; // 目的地网点名称 diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index abfd63b4f..b5fddd127 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" + @@ -65,7 +66,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.virtual_remark,w.dispatch_underling_site_code, + w.product_type,w.problem_type,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, @@ -101,7 +102,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.virtual_remark,w.dispatch_underling_site_code, + w.product_type,w.problem_type,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, @@ -192,6 +193,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.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, @@ -270,6 +272,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + @@ -380,6 +396,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + order by m.bill_code desc @@ -402,6 +432,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.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, @@ -480,6 +511,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where b.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + @@ -593,6 +638,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.emp_name like concat('%', #{registerManName}, '%') + + AND w.bl_sign = #{blSign} + + + and exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + + + + and not exists ( + select 1 from emis_waybill_problem_info ewpi where m.bill_code=ewpi.bill_code and ewpi.del_flag='0' and FIND_IN_SET( ewpi.`problem_type`, #{params.problemQueryIds} ) + ) + order by m.bill_code desc