From 2d186d8bbb61af0602f23b8b73ffd3b6cd80a88c Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 19 Aug 2023 15:48:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=81=202.=E6=BB=9E=E7=95=99=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=B8=80=E5=8D=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/WarehouseUpdownTypeApiController.java          | 10 +++++-----
 .../service/impl/WarehouseUpdownTypeServiceImpl.java   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java
index cb633c2a8..b7168c8a6 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java
@@ -403,15 +403,15 @@ public class WarehouseUpdownTypeApiController {
 	public R downZeroOrder(@RequestBody UpdownTypeDTO updownTypeDTO ) {
 		String method = "###########downZeroOrder: ";
 		log.info(method + "下架零担 updownTypeDTO={}", updownTypeDTO);
-		List<UpShelfZeroOrderDTO> upShelfPackageList = updownTypeDTO.getUpShelfZeroOrderList();
+		List<UpShelfZeroOrderDTO> upShelfZeroOrderList = updownTypeDTO.getUpShelfZeroOrderList();
 		try{
-			int size = upShelfPackageList.size();
+			int size = upShelfZeroOrderList.size();
 			if(size == 0 ){
 				log.warn(method+"没有处理的数据");
 				return R.fail(403,"无处理数据");
 			}
 			//查询该库位的货物信息
-			return warehouseUpdownTypeService.downZeroOrder(upShelfPackageList);
+			return warehouseUpdownTypeService.downZeroOrder(upShelfZeroOrderList);
 		}catch (CustomerException e){
 			log.warn(e.message);
 			return R.fail(e.code,e.message);
@@ -645,10 +645,10 @@ public class WarehouseUpdownTypeApiController {
 	@ResponseBody
 	@PostMapping("/moveAllocationByTrayCode")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "移库通过托盘", notes = "传入trayTypeDTO")
+	@ApiOperation(value = "移库托盘", notes = "传入trayTypeDTO")
 	public R moveAllocationByTrayCode(@RequestBody UpdownTypeDTO updownTypeDTO) {
 		String method = "###########moveAllocationByTrayCode: ";
-		log.info(method + "移库通过托盘 updownTypeDTO={}", updownTypeDTO);
+		log.info(method + "移库托盘 updownTypeDTO={}", updownTypeDTO);
 		String trayCode = updownTypeDTO.getTrayCode();
 		Long allocationId = updownTypeDTO.getAllocationId();
 		try{
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
index 1bbc620bb..7e63127fc 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java
@@ -1058,7 +1058,7 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		//上架新的库位
 		upShelfPackage(upShelfPackageList,allocationId);
 
-		return R.success("上架成功");
+		return R.success("移库成功");
 	}
 
 	@Override