diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index a53a9e45f..7cee9f0a8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -56,6 +56,8 @@ public class EmisWaybill extends BaseEntity private String billCodeSub; /* 订单状态 字典 */ private String orderStatus; + /* 组批次状态 */ + private String siteBatchStatus; /* 运单状态 字典 */ private String waybillStatus; /* 订单类型 0-预报订单 1-正式订单 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index 2b57e8555..a0b36c258 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -223,6 +223,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements allWaybills = allWaybills.stream() .filter(wb -> !Objects.equals(wb.getProblemType(), 170)) + .filter(wb -> !Objects.equals(wb.getSiteBatchStatus(), "1")) .collect(Collectors.toList()); totalProcessed = allWaybills.size(); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 9ed1ec085..4055f7c67 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - null as id, w.bill_code, '已组批次成功' as miss_reason, + distinct w.bill_code, null as id, '已组批次成功' as miss_reason, null as create_by, null as create_time, null as update_by, null as update_time, null as remark, '0' as del_flag, w.trans_line_type as line_code, w.product_type, w.start_site_code, w.next_site_code, diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 316927d1f..27ff552a9 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -48,6 +48,7 @@ + @@ -3734,7 +3735,7 @@ - update emis_waybill set del_flag='1 + update emis_waybill set del_flag='1' ,update_by = #{updateBy} ,update_site = #{updateSite} where id in @@ -3813,16 +3814,16 @@