aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: 漏组批次相关需求

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-11-25 13:29:26 +08:00
parent 57813991ae
commit e9800bc2a9
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java
View File

@ -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);

37
emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml
View File

@ -500,25 +500,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<when test="missCount == -6">
AND m.miss_type = 4
</when>
<when test="missCount == -5">
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
)
</when>
<when test="missCount > 0">
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}
)
<when test="missCount == 1">
AND m.miss_type = 0
</when>
<!-- <when test="missCount == -5">-->
<!-- 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-->
<!-- )-->
<!-- </when>-->
<!-- <when test="missCount > 0">-->
<!-- 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-->
<!-- </when>-->
</choose>
</if>
<if test="billCode != null and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">