|
@@ -605,6 +605,7 @@ public class GatherInfoHandle implements GatherInfoService { |
|
@@ -605,6 +605,7 @@ public class GatherInfoHandle implements GatherInfoService { |
605
|
List<LandBusinessTypeList> havenCrossList = gatherInfoHandle.listService.selectByBarcodeWithE(info.getBarcode());
|
605
|
List<LandBusinessTypeList> havenCrossList = gatherInfoHandle.listService.selectByBarcodeWithE(info.getBarcode());
|
606
|
|
606
|
|
607
|
if (landBusinessTypeListList.isEmpty() && havenCrossList.isEmpty()){
|
607
|
if (landBusinessTypeListList.isEmpty() && havenCrossList.isEmpty()){
|
|
|
608
|
+ log.error("[releaseFormCheck-CACHE-CHECK]-车辆进出场对应申请缓存数据为空:{}",info.getBarcode());
|
608
|
return;
|
609
|
return;
|
609
|
}
|
610
|
}
|
610
|
|
611
|
|
|
@@ -612,7 +613,9 @@ public class GatherInfoHandle implements GatherInfoService { |
|
@@ -612,7 +613,9 @@ public class GatherInfoHandle implements GatherInfoService { |
612
|
for (LandBusinessTypeList businessTypeList : havenCrossList) {
|
613
|
for (LandBusinessTypeList businessTypeList : havenCrossList) {
|
613
|
List<LandBusinessTypeList> r = landBusinessTypeListList.stream().filter(item ->{
|
614
|
List<LandBusinessTypeList> r = landBusinessTypeListList.stream().filter(item ->{
|
614
|
//判断还有没有没有出区的场站,还有没有出区的场站就不核销
|
615
|
//判断还有没有没有出区的场站,还有没有出区的场站就不核销
|
|
|
616
|
+ log.debug("[releaseFormCheck-Stream-loop]-缓存与已出核碰,缓存元素场站:[{}],已出记录场站:[{}]",item.getEndstation(),businessTypeList.getEndstation());
|
615
|
if(item.getEndstation().equals(businessTypeList.getEndstation())) {
|
617
|
if(item.getEndstation().equals(businessTypeList.getEndstation())) {
|
|
|
618
|
+ log.info("[releaseFormCheck-Stream-loop]-缓存元素场站:[{}],已出记录场站:[{}]-核销判定对碰成功",item.getEndstation(),businessTypeList.getEndstation());
|
616
|
return true;
|
619
|
return true;
|
617
|
}else {
|
620
|
}else {
|
618
|
return false;
|
621
|
return false;
|
|
@@ -621,9 +624,8 @@ public class GatherInfoHandle implements GatherInfoService { |
|
@@ -621,9 +624,8 @@ public class GatherInfoHandle implements GatherInfoService { |
621
|
.collect(Collectors.toList());
|
624
|
.collect(Collectors.toList());
|
622
|
temp.removeAll(r);
|
625
|
temp.removeAll(r);
|
623
|
}
|
626
|
}
|
624
|
-
|
627
|
+ log.info("[releaseFormCheck]-核销判定结果:{}",temp.size());
|
625
|
if (temp.isEmpty()){
|
628
|
if (temp.isEmpty()){
|
626
|
-
|
|
|
627
|
//todo:流转申请状态核销
|
629
|
//todo:流转申请状态核销
|
628
|
log.info("[进出场申请]-流转申请开始核销:"+vaName);
|
630
|
log.info("[进出场申请]-流转申请开始核销:"+vaName);
|
629
|
//二维码核销
|
631
|
//二维码核销
|