From 6611529af5f0f22f7cfc24875c2cd846c126d13b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 19 Mar 2024 18:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E4=B8=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/patch/jobhandle/OrderDataRepair.java   |  6 +++---
 .../patch/jobhandle/SyncOrderInfoToPlatform.java | 16 ++++++++--------
 .../patch/mapper/WarehouseMappingDataMapper.xml  |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java
index 7afa86fc0..13a73f734 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java
@@ -21,13 +21,13 @@ public class OrderDataRepair {
 
 	/**
 	 * 维护指定仓库ID
-	 * @param warehouseId
+	 * @param param
 	 * @return
 	 */
 	@XxlJob("maintenanceOrderStatus")
-	public ReturnT<String> maintenanceOrderStatus(String warehouseId) {
+	public ReturnT<String> maintenanceOrderStatus(String param) {
 		log.info("####################OrderDataRepair.maintenanceOrderStatus: 维护订单状态 开始");
-		Boolean flag = distributionStockArticleClient.maintenanceOrderStatus(warehouseId);
+		Boolean flag = distributionStockArticleClient.maintenanceOrderStatus(param);
 		log.info("####################OrderDataRepair.maintenanceOrderStatus: 维护订单状态 完成");
 		return ReturnT.SUCCESS;
 	}
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
index 51b0bf05e..a425180b3 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncOrderInfoToPlatform.java
@@ -698,16 +698,20 @@ public class SyncOrderInfoToPlatform {
 
 		return ReturnT.SUCCESS;
 	}
-	@XxlJob("clearOrderPackageStatusSign")
-	public ReturnT<String>  recoverOrderPackageStatus(String order,String packageCodes,Long warehouseId) {
+	@XxlJob("recoverOrderPackageStatus")
+	public ReturnT<String>  recoverOrderPackageStatus(String param) {
 		log.info("############clearOrderPackageStatusSign: 恢复包件数据为可初始状态   开始");
+		String orderCode = param.substring(param.indexOf("orderCode:"),param.indexOf(","));
+		String packageCodes = null;
+		Long warehouseId = 0L;
+
 		List<String> strList = null;
 		if (Strings.isNotBlank(packageCodes)){
 			log.info("############recoverOrderPackageStatus: 恢复整单包件状态   开始");
 			 strList = Func.toStrList(packageCodes);
 		}
 
-		List<JSONObject> ls = warehouseMappingDataService.findOrderPackageByOrderCodeAndPckageCode(order,strList,warehouseId);
+		List<JSONObject> ls = warehouseMappingDataService.findOrderPackageByOrderCodeAndPckageCode(orderCode,strList,warehouseId);
 		List<Long> ids = new ArrayList<>();
 		for (JSONObject l : ls) {
 //			String orderPackageCode = l.getStr("orderPackageCode");
@@ -716,13 +720,9 @@ public class SyncOrderInfoToPlatform {
 		}
 		//修改包件状态
 		warehouseMappingDataService.recoverOrderPackageStatus(ids);
-		distributionStockArticleClient.updateOrderInfo(order,warehouseId);
+		distributionStockArticleClient.updateOrderInfo(orderCode,warehouseId);
 		log.info("############repairNoOpenOrderOrderInfo: 清理包件数据为已签收  完成");
 
 		return ReturnT.SUCCESS;
 	}
-
-
-
-
 }
diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
index cc26b4b16..2220448d2 100644
--- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
+++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/mapper/WarehouseMappingDataMapper.xml
@@ -169,7 +169,7 @@
         where deal_status = 0
     </select>
     <select id="findOrderPackageByOrderCodeAndPckageCode" resultType="cn.hutool.json.JSONObject">
-        select ldpl.id packageId
+        select ldpl.id packageId,
         from logpm_distribution_parcel_list ldpl
         <where>
             order_code =#{orderCode} AND warehouse_id = #{warehouseId}