demand: 柬埔寨快递漏组批次扫描准确性适应修改
committer: heyu
This commit is contained in:
parent
3814a1f315
commit
6200b39c3e
@ -4963,11 +4963,16 @@ public class EmisBaseService {
|
|||||||
("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());
|
||||||
|
|
||||||
|
List<Long> filterIds = filterRules.stream().map(EmisTransPlanRule::getId).collect(Collectors.toList());
|
||||||
|
|
||||||
if (isSpecialTransLine || isSpecialCustomsClear) {
|
if (isSpecialTransLine || isSpecialCustomsClear) {
|
||||||
// 移除每个路径的最后一个元素
|
// 移除每个路径的最后一个元素
|
||||||
for (List<EmisTransPlanRule> path : allPaths) {
|
for (List<EmisTransPlanRule> path : allPaths) {
|
||||||
if (!path.isEmpty()) {
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user