1.修复老系统包件解托限制问题

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减