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 37b86486d..e5692a509 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 @@ -886,10 +886,14 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements if (CollectionUtil.isEmpty(waybillBatches)) { // 创建漏组记录 EmisTmsSiteBatchMiss miss = createMissRecord(waybill); - miss.setMissReason("当前运单没有组批次"); - miss.setMissType("2"); + + miss.setMissReason(waybill.getStartSiteName() +" 尚未完成组批次,请尽快完成,避免影响下一程同事组批次进度" ); miss.setLineCode(waybill.getTransLineType()); miss.setProductType(waybill.getProductType()); + miss.setStartSiteCode(waybill.getStartSiteCode()); + miss.setNextSiteCode(""); + miss.setMissType("0"); + missRecords.add(miss); successCount++; continue; @@ -1025,7 +1029,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements if (CollectionUtil.isEmpty(currentRules)) { EmisTmsSiteBatchMiss miss = createMissRecord(waybill); - miss.setMissReason(waybill.getStartSiteName() +" 尚未完成组批次,请加快完成,避免影响下一程同事组批次进度" ); + miss.setMissReason(waybill.getStartSiteName() +" 尚未完成组批次,请尽快完成,避免影响下一程同事组批次进度" ); miss.setLineCode(waybill.getTransLineType()); miss.setProductType(waybill.getProductType()); miss.setStartSiteCode(startSiteCode); diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 570f95a1f..abfd63b4f 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -500,25 +500,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND m.miss_type = 4 - - AND m.bill_code IN ( - SELECT bill_code - FROM emis_tms_site_batch_miss - WHERE del_flag = '0' - GROUP BY bill_code - HAVING COUNT(*) > 9 - ) - - - AND m.bill_code IN ( - SELECT bill_code - FROM emis_tms_site_batch_miss - WHERE del_flag = '0' - GROUP BY bill_code - HAVING COUNT(*) = #{missCount} - ) + AND m.miss_type = 0 + + + + + + + + + + + + + + + + + + +