From 26365aeb79c2c9fc3fd00f26388247553c57f5b9 Mon Sep 17 00:00:00 2001 From: Huluwa22 <2667400744@qq.com> Date: Wed, 12 Mar 2025 17:19:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BB=E6=89=BE?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E9=97=AE=E9=A2=98;=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8F=92=E5=85=A5wcs=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=97=AE=E9=A2=98;=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppTaskController.java | 22 ++++--- .../com/ruoyi/quartz/task/TaskExecutor.java | 2 +- .../mapper/app/AppLocationMapper.xml | 5 +- .../resources/mapper/app/AppWcsTaskMapper.xml | 60 +++++++++---------- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index ea797769..93db5e0b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -4,6 +4,7 @@ import java.math.BigDecimal; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import javax.servlet.http.HttpServletResponse; +import javax.xml.stream.Location; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson2.JSON; @@ -185,7 +186,6 @@ public class AppTaskController extends BaseController @Anonymous public AjaxResult receiveTaskResult(@RequestBody TaskResultFeedRequest feedBackRequest) { - logger.info("反馈任务状态：{}", JSON.toJSONString(feedBackRequest)); // 判断请求参数是否齐全 if (feedBackRequest == null || StringUtils.isEmpty(feedBackRequest.getTaskId()) @@ -196,18 +196,15 @@ public class AppTaskController extends BaseController } // 判断任务状态是否正确 if (!wcsTaskStatusList.contains(feedBackRequest.getTaskStatus())) { - logger.info("任务状态码反馈不正确。"); return error("任务状态码反馈不正确。"); } // 查询任务号 AppWcsTask thisFbWcsTask = appWcsTaskService.selectAppWcsTaskByWcsTaskId(feedBackRequest.getTaskId()); if (thisFbWcsTask == null) { - logger.info("反馈的任务号不存在。"); return error("反馈的任务号不存在。"); } // 判断反馈的任务号与数据库中是否一致 if (Objects.equals(thisFbWcsTask.getWcsTaskStatus(), feedBackRequest.getTaskStatus())) { - logger.info("请勿重复反馈相同任务状态。"); return error("请勿重复反馈相同任务状态。"); } AppTask wmsTaskQuery = new AppTask(); @@ -238,7 +235,6 @@ public class AppTaskController extends BaseController // appTaskService.batchUpdateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList); } - logger.info("反馈任务完成成功。"); return success("反馈任务完成成功。"); } if (998 == feedBackRequest.getTaskStatus()) { @@ -254,7 +250,6 @@ public class AppTaskController extends BaseController // appTaskService.batchUpdateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList); } - logger.info("反馈任务取消成功。"); return success("反馈任务取消成功。"); } if (999 == feedBackRequest.getTaskStatus()) { @@ -269,7 +264,6 @@ public class AppTaskController extends BaseController // appTaskService.batchUpdateAppTask(thisWmsTaskList); updateAppTask(thisWmsTaskList); } - logger.info("反馈任务异常成功。"); return success("反馈任务异常成功。"); } @@ -333,7 +327,11 @@ public class AppTaskController extends BaseController if(i == 0 ){ return error("wcs生成入库任务异常"); } - + // 占用库位 + AppLocation updateLocation = new AppLocation(); + updateLocation.setLocationId(location.getLocationId()); + updateLocation.setLocationStatus(1); + appLocationService.updateAppLocation(updateLocation); WcsDate wcsDate = new WcsDate(); wcsDate.setTaskId(appTask2.getTaskId()); wcsDate.setUser("WMS"); @@ -390,6 +388,12 @@ public class AppTaskController extends BaseController wcsDate.setUser("WMS"); wcsDate.setVehicleNo(wcsStackerTask.getVehicleNo()); wcsDate.setDestination(location.getLocationId()); + // 占用库位 + AppLocation updateLocation = new AppLocation(); + updateLocation.setLocationId(location.getLocationId()); + updateLocation.setLocationStatus(1); + appLocationService.updateAppLocation(updateLocation); + logger.info("更新库位成功"); return success(wcsDate); } @@ -1029,7 +1033,7 @@ public class AppTaskController extends BaseController } // 创建移库任务 moveTask.setTaskId(IdUtils.fastUUID()); - moveTask.setTaskType(3); + moveTask.setTaskType(9); moveTask.setTaskStatus(0); moveTask.setTaskPriority(1); moveTask.setVehicleId(moveLocation.getVehicleId()); diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java index 9b6274bb..e10356c9 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/TaskExecutor.java @@ -48,7 +48,7 @@ public class TaskExecutor { private final HashMap taskTypeMap = new HashMap() {{ put(1, 1);// 入库 put(2, 2);// 出库 - put(3, 3);// 移库 + put(9, 9);// 移库 }}; @Autowired private AppLocationMapper appLocationMapper; diff --git a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml index a74bc5c3..aab5c7e8 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppLocationMapper.xml @@ -189,9 +189,8 @@ update app_location - location_id = #{locationId}, - location_type = #{locationType}, location_status = #{locationStatus}, + location_type = #{locationType}, outer_id = #{outerId}, area_id = #{areaId}, tunnel_id = #{tunnelId}, @@ -206,7 +205,7 @@ is_working = #{isWorking}, is_enable = #{isEnable}, - where id = #{id} + where location_id = #{locationId} diff --git a/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml index 0b0e21b6..4b6de99b 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppWcsTaskMapper.xml @@ -73,38 +73,38 @@ insert into app_wcs_task - - ( - - wcs_task_id, - wcs_task_status, - wcs_task_type, - task_priority, - vehicle_id, - origin, - destination, - create_time, - send_time, - finish_time, - remark, - - ) + + + wcs_task_id, + wcs_task_status, + wcs_task_type, + task_priority, + vehicle_id, + origin, + destination, + create_time, + send_time, + finish_time, + remark, + + values - ( - - #{appWcsTask.wcsTaskId}, - #{appWcsTask.wcsTaskStatus}, - #{appWcsTask.wcsTaskType}, - #{appWcsTask.taskPriority}, - #{appWcsTask.vehicleId}, - #{appWcsTask.origin}, - #{appWcsTask.destination}, - #{appWcsTask.createTime}, - #{appWcsTask.sendTime}, - #{appWcsTask.finishTime}, - #{appWcsTask.remark}, + + + + #{appWcsTask.wcsTaskId}, + #{appWcsTask.wcsTaskStatus}, + #{appWcsTask.wcsTaskType}, + #{appWcsTask.taskPriority}, + #{appWcsTask.vehicleId}, + #{appWcsTask.origin}, + #{appWcsTask.destination}, + #{appWcsTask.createTime}, + #{appWcsTask.sendTime}, + #{appWcsTask.finishTime}, + #{appWcsTask.remark}, + - ) From 62aab3ede9f4379113b16dbb972cc866ac907773 Mon Sep 17 00:00:00 2001 From: Huluwa22 <2667400744@qq.com> Date: Wed, 12 Mar 2025 17:46:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7;=E5=BA=93=E4=BD=8D=E5=85=88?= =?UTF-8?q?=E5=85=A5=E4=BA=8C=E6=B7=B1=E5=BA=A6,=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E5=86=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/web/controller/app/AppTaskController.java | 3 ++- .../com/ruoyi/app/service/impl/AppLocationServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java index 93db5e0b..55b22019 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java @@ -1035,7 +1035,8 @@ public class AppTaskController extends BaseController moveTask.setTaskId(IdUtils.fastUUID()); moveTask.setTaskType(9); moveTask.setTaskStatus(0); - moveTask.setTaskPriority(1); + // 设置移库任务优先级 + moveTask.setTaskPriority(2); moveTask.setVehicleId(moveLocation.getVehicleId()); moveTask.setOrigin(moveLocation.getLocationId()); moveTask.setDestination(moveDestination.getLocationId()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java index 43b8fb72..1d8b70bc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/app/service/impl/AppLocationServiceImpl.java @@ -127,6 +127,8 @@ public class AppLocationServiceImpl implements IAppLocationService { locationQuery.setIsWorking(0); locationQuery.setLocationStatus(0); locationQuery.setIsLock(0); + // todo 先放进二深度后 + locationQuery.setwDepth(2); List appLocationList = appLocationMapper.selectAppLocationList(locationQuery); if (appLocationList == null || appLocationList.isEmpty()) { return null; From 7492ac85151c1b5ed0fd0a9ff85bcd565f14b2b5 Mon Sep 17 00:00:00 2001 From: Huluwa22 <2667400744@qq.com> Date: Wed, 12 Mar 2025 20:34:40 +0800 Subject: [PATCH 3/3] 1 --- .../java/com/ruoyi/web/controller/app/AppPmsController.java | 1 + .../src/main/resources/mapper/app/AppPmsOrderInMapper.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java index 457e6995..a4b59b2e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppPmsController.java @@ -309,6 +309,7 @@ public class AppPmsController extends BaseController { @Anonymous @PostMapping("/pmsStockInComplete") public AjaxResult pmsStockInComplete(@RequestBody PmsStockInCompleteReq request) { + logger.info("请求码盘,码盘请求信息：{}", JSON.toJSONString(request)); return toAjax(appPmsOrderInService.pmsStockInComplete(request)); } diff --git a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml index 44e9e13c..5e0cf5f7 100644 --- a/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/app/AppPmsOrderInMapper.xml @@ -150,7 +150,7 @@ or goods_code like concat('%',#{param},'%') or goods_desc like concat('%',#{para update_time = #{updateTime}, remark = #{remark}, - where id = #{id} + where list_id = #{listId}