diff --git a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java index 66eb82467..3e0bf63db 100644 --- a/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java +++ b/blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceDetailClient.java @@ -97,5 +97,5 @@ public interface IAdvanceDetailClient { * @return */ @PostMapping(API_PREFIX + "/findAdvanceDetailEntityByPackageCode") - List findAdvanceDetailEntityByPackageCode(@RequestParam List newList); + List findAdvanceDetailEntityByPackageCode(@RequestBody List newList); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java index 644769a32..47b43f7f1 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/service/impl/ZbFactoryDataServiceImpl.java @@ -58,14 +58,14 @@ public class ZbFactoryDataServiceImpl implements IZbFactoryDataService { ZbReceiptEntity zbReceiptEntity = zbReceiptDTO; - // 判断这个list 在老系统中是否存在 - List ls = advanceDetailClient.findAdvanceDetailEntityByPackageCode(newList); - if (ObjectUtils.isNotNull(ls)) { - if (ls.size() == newList.size()) { - throw new ServiceException("推送的数据和业务系统的数据相同"); - } - - } +// 判断这个list 在老系统中是否存在 +// List ls = advanceDetailClient.findAdvanceDetailEntityByPackageCode(newList); +// if (ObjectUtils.isNotNull(ls)) { +// if (ls.size() == newList.size()) { +// throw new ServiceException("推送的数据和业务系统的数据相同"); +// } +// +// } // 验证发货单号是否存在 zbReceiptEntity.setPushStatus(0); @@ -73,14 +73,14 @@ public class ZbFactoryDataServiceImpl implements IZbFactoryDataService { zbReceiptEntity.setTurnStatus(0); receiptService.save(zbReceiptEntity); // 保存发货单 id = zbReceiptEntity.getId(); - // 保存订单&& 包件 - for (AdvanceDetailEntity entity : ls) { - // 移除在改车次中的包件 - checkPackageCode(zbReceiptDTO, entity); - // 修改原订单的车次号 - entity.setMctsTruck(zbReceiptDTO.getDepartCode());// 更新发车单号 - advanceDetailClient.updateAdvanceDetail(entity); - } +// // 保存订单&& 包件 +// for (AdvanceDetailEntity entity : ls) { +// // 移除在改车次中的包件 +// checkPackageCode(zbReceiptDTO, entity); +// // 修改原订单的车次号 +// entity.setMctsTruck(zbReceiptDTO.getDepartCode());// 更新发车单号 +// advanceDetailClient.updateAdvanceDetail(entity); +// } List tesm = zbReceiptDTO.getDetails(); tesm.forEach(t -> {