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-26 14:50:09 +08:00
parent 818bd98598
commit 7685ad79d0
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1071,11 +1071,22 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements
if (CollectionUtil.isEmpty(currentRules)) { if (CollectionUtil.isEmpty(currentRules)) {
return true; return true;
} }
boolean hasNextSite = false;
for (EmisTransPlanRule rule : currentRules) {
// 当前下一网点下的规则
List<EmisTransPlanRule> nextRules = ruleList.stream()
.filter(r -> StringUtils.equals(r.getStartSiteCode(), rule.getNextSiteCode()))
.collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(nextRules)) {
hasNextSite = true;
break;
}
}
// 检查是否为特殊运输线路类型或清关类型 // 检查是否为特殊运输线路类型或清关类型
boolean isSpecialTransLine = "004".equals(waybill.getTransLineType()) && boolean isSpecialTransLine = "004".equals(waybill.getTransLineType()) &&
("24401".equals(waybill.getProductType()) || "24402".equals(waybill.getProductType())); ("24401".equals(waybill.getProductType()) || "24402".equals(waybill.getProductType()));
boolean isSpecialCustomsClear = "2".equals(waybill.getCustomsClear()) && "2".equals(waybill.getTransType()); boolean isSpecialCustomsClear = "2".equals(waybill.getCustomsClear()) && "2".equals(waybill.getTransType());
if ((isSpecialTransLine || isSpecialCustomsClear) && currentRules.get(0).getStartSiteName().contains("机场")) { if ((isSpecialTransLine || isSpecialCustomsClear) && !hasNextSite) {
return true; return true;
} }