1.移托扫描包件判断是否已经打托在目标托盘

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTrayTypeApiController.java

@@ -935,15 +935,18 @@ public class WarehouseTrayTypeApiController {
 		String method = "###########moveTrayScanPackage: ";
 		log.info(method + "移托扫描包件 trayTypeDTO={}", trayTypeDTO);
 		String orderPackageCode = trayTypeDTO.getOrderPackageCode();
+		String trayCode = trayTypeDTO.getTrayCode();
 		try{
-
+			if(!StringUtil.hasLength(trayCode)){
+				log.warn(method+"托盘码不能为空 trayCode={}",trayCode);
+				return R.fail(403,"托盘码不能为空");
+			}
 			if(!StringUtil.hasLength(orderPackageCode)){
 				log.warn(method+"包件码不能为空 orderPackageCode={}",orderPackageCode);
 				return R.fail(403,"包件码不能为空");
 			}
 
-
-			return warehouseTrayTypeService.moveTrayScanPackage(orderPackageCode);
+			return warehouseTrayTypeService.moveTrayScanPackage(orderPackageCode,trayCode);
 		}catch (CustomerException e){
 			log.warn(e.message);
 			return R.fail(e.code,e.message);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayTypeService.java

@@ -76,7 +76,7 @@ public interface IWarehouseTrayTypeService extends BaseService<WarehouseTrayType
 
 	R moveTrayScanTrayCode(String trayCode);
 
-	R moveTrayScanPackage(String orderPackageCode);
+	R moveTrayScanPackage(String orderPackageCode,String trayCode);
 
 	R moveTrayPackages(List<Long> trayGoodsIds,String trayCode);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseTrayTypeServiceImpl.java

@@ -1642,7 +1642,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 	}
 
 	@Override
-	public R moveTrayScanPackage(String orderPackageCode) {
+	public R moveTrayScanPackage(String orderPackageCode,String trayCode) {
 		QueryWrapper<WarehouseTrayGoodsEntity> trayGoodsEntityQueryWrapper = new QueryWrapper<>();
 		trayGoodsEntityQueryWrapper.eq("association_value",orderPackageCode);
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getOne(trayGoodsEntityQueryWrapper);
@@ -1650,6 +1650,12 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 			log.warn("#################moveTrayScanPackage: 包件未打托 orderPackageCode={}",orderPackageCode);
 			throw new CustomerException(403,"包件未打托");
 		}
+		String oldTrayCode = trayGoodsEntity.getTrayCode();
+		if(oldTrayCode.equals(trayCode)){
+			log.warn("#################moveTrayScanPackage: 包件已打托目标托盘 orderPackageCode={}",orderPackageCode);
+			throw new CustomerException(403,"包件已打托目标托盘");
+		}
+
 		QueryWrapper<WarehouseUpdownGoodsEntity> updownGoodsEntityQueryWrapper = new QueryWrapper<>();
 		updownGoodsEntityQueryWrapper.eq("association_value",orderPackageCode);
 		WarehouseUpdownGoodsEntity updownGoodsEntity = warehouseUpdownGoodsService.getOne(updownGoodsEntityQueryWrapper);