|
@@ -62,6 +62,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
@Autowired
|
|
|
private SysBatchSignForMapper sysBatchSignForMapper;
|
|
|
|
|
|
+
|
|
|
@Autowired
|
|
|
private CustomerMapper customersMapper;
|
|
|
@Value(value = "${spring.mail.username}")
|
|
@@ -496,6 +497,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
}
|
|
|
DeliverQuantityConfirm numbernull = new DeliverQuantityConfirm();
|
|
|
List<DeliverQuantityConfirm> deliverNumber = deliverQuantityConfirmMapper.selectDeliverQuantityConfirmList(numbernull);
|
|
|
+ List<String> OrderNumbers=metaHanaDeliverOrderMapper.selectDocNumberByVSBED12();
|
|
|
List<String> deliverNumbers = new ArrayList<>();
|
|
|
if (deliverNumber != null && deliverNumber.size() > 0) {
|
|
|
deliverNumbers = deliverNumber.stream().map(DeliverQuantityConfirm::getCode).collect(Collectors.toList());
|
|
@@ -527,6 +529,11 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
|
|
|
}
|
|
|
}
|
|
|
if (("未复核").equals(deliver.getReviewStatus())) {
|
|
|
+ if(OrderNumbers !=null && OrderNumbers.size()>0){
|
|
|
+ if (OrderNumbers.contains(deliver.getDocNumber())) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ }
|
|
|
List<String> tms=new ArrayList<>();
|
|
|
if(tmslistNo !=null && tmslistNo.size()>0){
|
|
|
tms = tmslistNo.stream().map(TmsLogisticsStatus::getDeliveryNumber).collect(Collectors.toList());
|