From 6c771c4781abbe0b8fd510a6f27a2f3151f24817 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Fri, 13 Oct 2023 10:38:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88=E5=AF=B9=E5=BF=97=E9=82=A6?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95=E6=95=B0=E6=8D=AE=E7=9A=84=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../feign/IAdvanceDetailClient.java           |  2 +-
 .../impl/ZbFactoryDataServiceImpl.java        | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

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<AdvanceDetailEntity> findAdvanceDetailEntityByPackageCode(@RequestParam List<String> newList);
+	List<AdvanceDetailEntity> findAdvanceDetailEntityByPackageCode(@RequestBody List<String> 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<AdvanceDetailEntity> ls = advanceDetailClient.findAdvanceDetailEntityByPackageCode(newList);
-		if (ObjectUtils.isNotNull(ls)) {
-			if (ls.size() == newList.size()) {
-				throw new ServiceException("推送的数据和业务系统的数据相同");
-			}
-
-		}
+//		 判断这个list 在老系统中是否存在
+//		List<AdvanceDetailEntity> 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<OrderPackageDTO> tesm = zbReceiptDTO.getDetails();
 		tesm.forEach(t -> {