From 4b4d07da3c6e173ed119d135148e42a2b29c8352 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Mon, 15 Apr 2024 11:05:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=80=81=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E5=8C=85=E4=BB=B6=E8=A7=A3=E6=89=98=E9=99=90=E5=88=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WarehouseTrayTypeServiceImpl.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 e24a8d3a7..0a782ff65 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
@@ -1015,11 +1015,11 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		}
 		Long trayTypeId = trayTypeEntity.getId();
 		Long trayId = trayTypeEntity.getId();
-		Long wid = trayTypeEntity.getWarehouseId();
-		if(!wid.equals(warehouseId)){
-			log.warn("#############deleteScanOrderPackageCode: 托盘已在其他仓库打托 wid={} warehouseId={}",wid,warehouseId);
-			return R.fail(403,"托盘已在其他仓库打托");
-		}
+		warehouseId = trayTypeEntity.getWarehouseId();
+//		if(!wid.equals(warehouseId)){
+//			log.warn("#############deleteScanOrderPackageCode: 托盘已在其他仓库打托 wid={} warehouseId={}",wid,warehouseId);
+//			return R.fail(403,"托盘已在其他仓库打托");
+//		}
 
 
 		for (String orderPackageCode:orderPackageCodes){
@@ -1036,7 +1036,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			}
 
 			//添加下托日志
-			warehouseTrayGoodsLogService.saveLogPackage(parcelListEntity,trayTypeEntity,"0","分拣打托:扫码分拣","2");
+			warehouseTrayGoodsLogService.saveLogPackage(parcelListEntity,trayTypeEntity,"0","解绑打托","2");
 
 			//修改打托方式上的值
 //		changeTotalNumByTrayTypeId(parcelListEntity,trayTypeEntity.getId(),2);//addSub 1加 2减