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

Merge pull request 'demand: 柬埔寨快递漏组批次扫描准确性适应修改' (#143) from aike into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/143
This commit is contained in:
heyu 2025-08-04 19:18:36 +08:00
commit 7e1d6ac3cf
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -4960,11 +4960,16 @@ public class EmisBaseService {
("24401".equals(waybill.getProductType()) || "24402".equals(waybill.getProductType()));
boolean isSpecialCustomsClear = "2".equals(waybill.getCustomsClear()) && "2".equals(waybill.getTransType());
List<Long> filterIds = filterRules.stream().map(EmisTransPlanRule::getId).collect(Collectors.toList());
if (isSpecialTransLine || isSpecialCustomsClear) {
// 移除每个路径的最后一个元素
for (List<EmisTransPlanRule> path : allPaths) {
if (!path.isEmpty()) {
path.remove(path.size() - 1);
EmisTransPlanRule emisTransPlanRule = path.get(path.size() - 1);
if(!filterIds.contains(emisTransPlanRule.getId())){
path.remove(path.size() - 1);
}
}
}
}