From ca987fb01c516fad7a121668472b4dd000c0f481 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 16 Dec 2023 22:36:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=90=8C=E6=AD=A5=E8=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=89=98=E7=9B=98=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../warehouse/service/impl/AsyncDataServiceImpl.java      | 8 ++++----
 .../service/impl/WarehouseTrayTypeServiceImpl.java        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java
index 1c24d4534..36b14f9d1 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/AsyncDataServiceImpl.java
@@ -380,7 +380,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 		Long allocationId = taryAllocationService.getAllocationIdByTrayId(basicdataTrayEntity.getId());
 		if(Objects.isNull(allocationId)){
 			//没有上架就直接打托
-			R response = trayTypeService.orderScanOrderPackageCode(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId);
+			R response = trayTypeService.orderScanOrderPackageCodeSync(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId);
 			int code = response.getCode();
 			String msg = response.getMsg();
 			if(code == 4001){
@@ -416,7 +416,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 					}
 				}
 
-				R r = trayTypeService.orderScanOrderPackageCode(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId);
+				R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType,"T"+trayId,orderPackageCode,newWarehouseId);
 				int code1 = r.getCode();
 				if(code1 != 200){
 					log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
@@ -439,7 +439,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 
 					updownTypeService.downPackage(upShelfPackageList,wid);
 				}
-				R r = trayTypeService.orderScanOrderPackageCode(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId);
+				R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId);
 				int code1 = r.getCode();
 				if(code1 != 200){
 					log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
@@ -451,7 +451,7 @@ public class AsyncDataServiceImpl implements IAsyncDataService {
 				//先去空置托盘再打托
 				trayTypeService.trayToNull("T"+trayId);
 
-				R r = trayTypeService.orderScanOrderPackageCode(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId);
+				R r = trayTypeService.orderScanOrderPackageCodeSync(newTrayType, "T" + trayId, orderPackageCode, newWarehouseId);
 				int code1 = r.getCode();
 				if(code1 != 200){
 					log.warn("####################orderStatusHandler: 二次打托失败 orderPackageCode={} trayCode={}",orderPackageCode,"T"+trayId);
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
index 1d394ad84..b77e7f8cb 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java
@@ -434,7 +434,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			String oldTrayCode = trayGoodsEntity.getTrayCode();
 			if(oldTrayCode.equals(trayCode)){
 				log.warn("##############orderScanOrderPackageCode: 该包条已打托 trayCode={}",trayCode);
-				return Resp.scanFail(2001,"该包条已打托","已扫描");
+				return Resp.scanFail(4001,"该包条已打托","已扫描");
 			}
 
 			log.warn("#########orderScanOrderPackageCode: 包件已打托 orderPackageCode={}",orderPackageCode);