|
|
@@ -486,6 +486,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
List<String> plants = metaHanaDeliverOrderMapper.selectPlant();
|
|
|
List<TmsLogisticsStatus> tmsStatusLog = sysBatchSignForMapper.selectByDelivery();
|
|
|
Map<Object, List<TmsLogisticsStatus>> keytmsMap = new HashMap<>();
|
|
|
+ Map<Object, List<TmsLogisticsStatus>> keytmsYes = new HashMap<>();
|
|
|
if (tmsStatusLog != null && tmsStatusLog.size() > 0) {
|
|
|
keytmsMap = tmsStatusLog.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
|
|
|
}
|
|
|
@@ -597,8 +598,19 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (keytmsMap != null && keytmsMap.containsKey(deliver.getDeliverNumber())) {
|
|
|
- List<TmsLogisticsStatus> tmsStatusList = keytmsMap.get(deliver.getDeliverNumber());
|
|
|
+ if((keytmsMap == null || !keytmsMap.containsKey(deliver.getDeliverNumber()))){
|
|
|
+ if(tmslistYes !=null && tmslistYes.size()>0){
|
|
|
+ keytmsYes = tmslistYes.stream().collect(Collectors.groupingBy(TmsLogisticsStatus::getDeliveryNumber));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if ((keytmsMap != null && keytmsMap.containsKey(deliver.getDeliverNumber())) || (keytmsYes !=null && keytmsYes.containsKey(deliver.getDeliverNumber()))) {
|
|
|
+ List<TmsLogisticsStatus> tmsStatusList =new ArrayList<>();
|
|
|
+ if(keytmsMap != null && keytmsMap.containsKey(deliver.getDeliverNumber())){
|
|
|
+ tmsStatusList = keytmsMap.get(deliver.getDeliverNumber());
|
|
|
+ }else if(keytmsYes !=null && keytmsYes.containsKey(deliver.getDeliverNumber())){
|
|
|
+ tmsStatusList = keytmsYes.get(deliver.getDeliverNumber());
|
|
|
+ }
|
|
|
+
|
|
|
if (tmsStatusList != null && tmsStatusList.size() > 0) {
|
|
|
Optional<TmsLogisticsStatus> tmsStatus = tmsStatusList.stream().filter(org -> Objects.equals(org.getDeliveryNumber(), deliver.getDeliverNumber())).findFirst();
|
|
|
if (!tmsStatus.get().getStatus().equals("5")) {
|
