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..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
@@ -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,13 @@ public class EmisTmsSiteBatchMiss extends BaseEntity {
/* 是否问题件 1-是 0-否 */
private String blIsQuestion;
- private String virtualRemark;
+ /* 问题件类型 */
private Integer problemType;
+ /* 问题件类型名称 */
+ private String problemTypeName;
+ /* 问题件原因 */
+ private String problemCause;
+ private String virtualRemark;
/* 目的地网点代码 */
private String dispatchUnderlingSiteCode;
// 目的地网点名称
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
index 17357f3fc..ace4855cd 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
@@ -416,6 +416,7 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
"费用调整已审批通过-["+getCurrentUser().getOwnerSiteName()+","+getCurrentUser().getEmpName()+"]"
);
+ emisWaybillSave.getParams().put("isAuditCenter", "1");
if(isDZZS) {
emisWaybillService.reUpdateWayBill(emisWaybillOld, emisWaybillSave, false, true);
}else{
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 8827a3f1d..7910cbe62 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -2664,9 +2664,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
if(emisMonthCustomerUser==null){
throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户不存在");
}
-
// 判断客户是否停用
- if(!"1".equals(emisMonthCustomerUser.getStatus())){
+ if(!"1".equals(emisMonthCustomerUser.getStatus()) && !"1".equals(emisWaybillSave.getParams().get("isAuditCenter"))){
throw new EmisBizError(EmisBizErrorType.FAIL,"月结客户已停用");
}
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
index abfd63b4f..516588417 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
@@ -46,6 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -65,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.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,
@@ -89,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'
@@ -101,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.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,
@@ -125,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'
@@ -192,6 +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, 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,
@@ -216,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'
@@ -270,6 +276,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 +400,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 +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, 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,
@@ -426,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'
@@ -480,6 +516,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 +643,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