From a7b254599b0c1d62c38e12e420c9d56ad2e4d48e Mon Sep 17 00:00:00 2001 From: Huluwa22 <2667400744@qq.com> Date: Tue, 4 Mar 2025 15:20:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=85=A5=E5=BA=93=E8=AE=A2=E5=8D=95):=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=A5=E5=BA=93=E8=AE=A2=E5=8D=95=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/app/AppPmsController.java | 10 +------ ...sCommonResponse.java => WcsCommonRes.java} | 2 +- ...askRequest.java => WcsStackerTaskReq.java} | 2 +- .../com/ruoyi/quartz/task/TaskExecutor.java | 30 +++++++++---------- 4 files changed, 18 insertions(+), 26 deletions(-) rename ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/{WcsCommonResponse.java => WcsCommonRes.java} (95%) rename ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/{WcsStackerTaskRequest.java => WcsStackerTaskReq.java} (98%) 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 d4876b2c..177405fa 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 @@ -58,7 +58,6 @@ public class AppPmsController extends BaseController { Integer orderType = orderInRequest.getOrderType(); if (StringUtils.isEmpty(orderInRequest.getListId()) || !orderInTypeList.contains(orderInRequest.getOrderType()) - || StringUtils.isEmpty(orderInRequest.getCustomerId()) || StringUtils.isEmpty(orderInRequest.getOrderId()) || StringUtils.isEmpty(orderInRequest.getGoodsId()) || StringUtils.isEmpty(orderInRequest.getGoodsCode()) @@ -81,13 +80,7 @@ public class AppPmsController extends BaseController { appPmsOrderIn.setCreateTime(new Date()); appPmsOrderIn.setUpdateTime(new Date()); - AppPendingStorage appPendingStorage = new AppPendingStorage(); - appPendingStorage.setRecordId(UUID.randomUUID().toString()); - BeanUtils.copyProperties(appPmsOrderIn, appPendingStorage); - int i = appPendingStorageService.insertAppPendingStorage(appPendingStorage); - if (i == 0) { - return error("存入入库码盘信息失败"); - } + int i1 = appPmsOrderInService.insertAppPmsOrderIn(appPmsOrderIn); if (i1 == 0) { return error("入库单保存失败"); @@ -107,7 +100,6 @@ public class AppPmsController extends BaseController { // 判断请求数据完整性 if (StringUtils.isEmpty(orderOutRequest.getListId()) || orderOutRequest.getOrderType() == null - || StringUtils.isEmpty(orderOutRequest.getCustomerId()) || StringUtils.isEmpty(orderOutRequest.getGoodsId()) || orderOutRequest.getGoodsNum() == null || StringUtils.isEmpty(orderOutRequest.getGoodsDesc())) { diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonResponse.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonRes.java similarity index 95% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonResponse.java rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonRes.java index 40feb3ec..08cae4ba 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonResponse.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsCommonRes.java @@ -3,7 +3,7 @@ package com.ruoyi.quartz.domain.app; /** * Wcs通用响应信息 */ -public class WcsCommonResponse { +public class WcsCommonRes { /** * code */ diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskRequest.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskReq.java similarity index 98% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskRequest.java rename to ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskReq.java index 728e5b96..0c72867f 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskRequest.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/app/WcsStackerTaskReq.java @@ -5,7 +5,7 @@ import java.math.BigDecimal; /** * 向wcs发送堆垛机任务请求 */ -public class WcsStackerTaskRequest { +public class WcsStackerTaskReq { /** * 任务id */ 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 b8c5b5d0..bde56266 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 @@ -6,8 +6,8 @@ import com.ruoyi.app.service.*; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.http.HttpUtils; import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.quartz.domain.app.WcsCommonResponse; -import com.ruoyi.quartz.domain.app.WcsStackerTaskRequest; +import com.ruoyi.quartz.domain.app.WcsCommonRes; +import com.ruoyi.quartz.domain.app.WcsStackerTaskReq; import com.ruoyi.system.service.ISysConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -117,14 +117,14 @@ public class TaskExecutor { } for (AppWcsTask appWcsTask : wcsTaskList) { // 添加wcs任务请求 - WcsStackerTaskRequest wcsStackerTaskRequest = getWcsStackerTaskRequest(appWcsTask); + WcsStackerTaskReq wcsStackerTaskReq = getWcsStackerTaskRequest(appWcsTask); // 发送http请求---请求5次 for (int i = 0; i < 5; i++) { - WcsCommonResponse wcsCommonResponse = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(wcsStackerTaskRequest)), WcsCommonResponse.class); - if (wcsCommonResponse == null) { + WcsCommonRes wcsCommonRes = JSON.parseObject(HttpUtils.sendPost(url, JSON.toJSONString(wcsStackerTaskReq)), WcsCommonRes.class); + if (wcsCommonRes == null) { continue; } - if (wcsCommonResponse.getCode() == 0) { + if (wcsCommonRes.getCode() == 0) { // 返回ok appWcsTask.setWcsTaskStatus(1);// 已经发送成功 } else { @@ -145,15 +145,15 @@ public class TaskExecutor { * @param appWcsTask 任务 * @return 请求详情 */ - private WcsStackerTaskRequest getWcsStackerTaskRequest(AppWcsTask appWcsTask) { - WcsStackerTaskRequest wcsStackerTaskRequest = new WcsStackerTaskRequest(); - wcsStackerTaskRequest.setTaskId(appWcsTask.getWcsTaskId()); - wcsStackerTaskRequest.setTaskType(appWcsTask.getWcsTaskType()); - wcsStackerTaskRequest.setPriority(appWcsTask.getTaskPriority()); - wcsStackerTaskRequest.setOrigin(appWcsTask.getOrigin()); - wcsStackerTaskRequest.setDestination(appWcsTask.getDestination()); - wcsStackerTaskRequest.setVehicleNo(appWcsTask.getVehicleId()); - return wcsStackerTaskRequest; + private WcsStackerTaskReq getWcsStackerTaskRequest(AppWcsTask appWcsTask) { + WcsStackerTaskReq wcsStackerTaskReq = new WcsStackerTaskReq(); + wcsStackerTaskReq.setTaskId(appWcsTask.getWcsTaskId()); + wcsStackerTaskReq.setTaskType(appWcsTask.getWcsTaskType()); + wcsStackerTaskReq.setPriority(appWcsTask.getTaskPriority()); + wcsStackerTaskReq.setOrigin(appWcsTask.getOrigin()); + wcsStackerTaskReq.setDestination(appWcsTask.getDestination()); + wcsStackerTaskReq.setVehicleNo(appWcsTask.getVehicleId()); + return wcsStackerTaskReq; } @Transactional