From efbe57735cf9bd4ca6026ba644062d850f60090d Mon Sep 17 00:00:00 2001 From: btobab Date: Fri, 9 Jan 2026 16:01:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=99=E7=AE=B1=E5=BA=93,?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E4=B8=80=E6=AC=A1=E5=8F=AA=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E4=B8=80=E4=B8=AA=E4=BB=BB=E5=8A=A1=E7=BB=99wcs?= =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6,=20=E6=B7=BB=E5=8A=A0=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E4=B8=8A=E4=BD=8D=E6=9C=BA=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms_serve_mengyang/.gitignore | 1 + .../dto/request/mywms/OrderInCancel.java | 15 ++++ .../serviceImpl/StackerTaskServiceImpl.java | 74 +++++++++---------- .../job_executor/WcsStackerTaskSender.java | 4 - .../src/main/resources/application.yml | 6 +- .../com/wms_main/model/bo/tuple/Tuple2.java | 0 .../api/serviceImpl/WcsApiServiceImpl.java | 18 ++--- .../src/main/resources/application.yml | 6 +- 8 files changed, 68 insertions(+), 56 deletions(-) create mode 100644 202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/model/dto/request/mywms/OrderInCancel.java create mode 100644 202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/java/com/wms_main/model/bo/tuple/Tuple2.java diff --git a/202504-Wms-MengYang-box/wms_serve_mengyang/.gitignore b/202504-Wms-MengYang-box/wms_serve_mengyang/.gitignore index f58d42e..069ce0b 100644 --- a/202504-Wms-MengYang-box/wms_serve_mengyang/.gitignore +++ b/202504-Wms-MengYang-box/wms_serve_mengyang/.gitignore @@ -28,3 +28,4 @@ replay_pid* /.idea/inspectionProfiles/Project_Default.xml /.idea/CoolRequestHistoryPersistent.xml /.idea/CoolRequestCookiePersistent.xml +/.mvn diff --git a/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/model/dto/request/mywms/OrderInCancel.java b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/model/dto/request/mywms/OrderInCancel.java new file mode 100644 index 0000000..2775a35 --- /dev/null +++ b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/model/dto/request/mywms/OrderInCancel.java @@ -0,0 +1,15 @@ +package com.wms_main.model.dto.request.mywms; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@AllArgsConstructor +@NoArgsConstructor +@Data +public class OrderInCancel { + @JsonProperty("vehicleNo") + private String vehicleNo; +} diff --git a/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java index 69e12d7..5a2e871 100644 --- a/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java +++ b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java @@ -457,24 +457,24 @@ public class StackerTaskServiceImpl implements IStackerTaskService { if (!appTaskBakService.save(wmsTask.of())) { log.info("备份入库任务失败，任务：{}", wmsTask.getTaskId()); } - // OrderInCBReq orderInCBReq = new OrderInCBReq(); - // orderInCBReq.setTaskId(orderIn.getOrderId()); - // orderInCBReq.setVehicleNo(wmsTask.getVehicleId()); - // orderInCBReq.setLocationId(wmsTask.getDestination()); - // orderInCBReq.setResult(OrderInCBEnums.COMPLETE.getCode()); - // orderInCBReq.setResultMessage("入库完成"); - // int times = 0; - // MesApiResponse response = null; - // do { - // Thread.sleep(15000L * times); - // response = externalApiService.invokeOrderInCB(orderInCBReq); - // times++; - // } while (response.getCode() != 0 && times <= 10); - // if (response.getCode() != 0) { - // log.error("[wms]上报失败"); - // } else { - // log.info("[wms]上报成功"); - // } + OrderInCBReq orderInCBReq = new OrderInCBReq(); + orderInCBReq.setTaskId(orderIn.getOrderId()); + orderInCBReq.setVehicleNo(wmsTask.getVehicleId()); + orderInCBReq.setLocationId(wmsTask.getDestination()); + orderInCBReq.setResult(OrderInCBEnums.COMPLETE.getCode()); + orderInCBReq.setResultMessage("入库完成"); + int times = 0; + MesApiResponse response = null; + do { + Thread.sleep(15000L * times); + response = externalApiService.invokeOrderInCB(orderInCBReq); + times++; + } while (response.getCode() != 0 && times <= 10); + if (response.getCode() != 0) { + log.error("[wms]上报失败"); + } else { + log.info("[wms]上报成功"); + } } } @@ -580,26 +580,26 @@ public class StackerTaskServiceImpl implements IStackerTaskService { appOrderOutService.removeBatchByIds(orderOuts); } } - // for (TAppOrderOut orderOut : orderOuts) { - // OrderOutCBReq orderOutCBReq = new OrderOutCBReq(); - // orderOutCBReq.setTaskId(orderOut.getOrderId()); - // orderOutCBReq.setVehicleNo(vehicleId); - // orderOutCBReq.setResult(OrderOutCBEnums.COMPLETE.getCode()); - // orderOutCBReq.setResultMessage("出库完成"); + for (TAppOrderOut orderOut : orderOuts) { + OrderOutCBReq orderOutCBReq = new OrderOutCBReq(); + orderOutCBReq.setTaskId(orderOut.getOrderId()); + orderOutCBReq.setVehicleNo(vehicleId); + orderOutCBReq.setResult(OrderOutCBEnums.COMPLETE.getCode()); + orderOutCBReq.setResultMessage("出库完成"); - // int times = 0; - // MesApiResponse response = null; - // do { - // response = externalApiService.invokeOrderOutCB(orderOutCBReq); - // times++; - // Thread.sleep(15000L * times); - // } while (response.getCode() != 0 && times <= 10); - // if (response.getCode() != 0) { - // log.error("[WMS]上报失败"); - // } else { - // log.info("[WMS]上报成功"); - // } - // } + int times = 0; + MesApiResponse response = null; + do { + response = externalApiService.invokeOrderOutCB(orderOutCBReq); + times++; + Thread.sleep(15000L * times); + } while (response.getCode() != 0 && times <= 10); + if (response.getCode() != 0) { + log.error("[WMS]上报失败"); + } else { + log.info("[WMS]上报成功"); + } + } } } } diff --git a/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/quartz_job/job_executor/WcsStackerTaskSender.java b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/quartz_job/job_executor/WcsStackerTaskSender.java index cd1b6f7..1f1af14 100644 --- a/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/quartz_job/job_executor/WcsStackerTaskSender.java +++ b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/java/com/wms_main/service/quartz_job/job_executor/WcsStackerTaskSender.java @@ -49,10 +49,6 @@ public class WcsStackerTaskSender implements Job { */ @Override public void execute(JobExecutionContext jobExecutionContext) { - if (appWcsTaskService.exists(new LambdaQueryWrapper().eq(TAppWcsTask::getWcsTaskStatus, - WcsStackerTaskStatusEnums.WAIT.getCode()))) { - return; - } // 查询到所有的待下发的wcsTask并按优先级排序 List waitSendWcsTaskList = appWcsTaskService.list( new LambdaQueryWrapper() diff --git a/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/resources/application.yml b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/resources/application.yml index 6ed7502..491c2d0 100644 --- a/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/resources/application.yml +++ b/202504-Wms-MengYang-box/wms_serve_mengyang/src/main/resources/application.yml @@ -5,9 +5,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver # 本地 - # url: jdbc:mysql://localhost:3306/wms_mengyang_box?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true - # username: root - # password: root +# url: jdbc:mysql://localhost:3306/wms_mengyang_box?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true +# username: root +# password: root # 服务器 url: jdbc:mysql://localhost:3306/wms_mengyang_box?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true username: user diff --git a/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/java/com/wms_main/model/bo/tuple/Tuple2.java b/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/java/com/wms_main/model/bo/tuple/Tuple2.java new file mode 100644 index 0000000..e69de29 diff --git a/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/java/com/wms_main/service/api/serviceImpl/WcsApiServiceImpl.java b/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/java/com/wms_main/service/api/serviceImpl/WcsApiServiceImpl.java index 1f87385..e32f40c 100644 --- a/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/java/com/wms_main/service/api/serviceImpl/WcsApiServiceImpl.java +++ b/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/java/com/wms_main/service/api/serviceImpl/WcsApiServiceImpl.java @@ -1,4 +1,4 @@ -package com.wms_main.service.api.serviceImpl; +package com.wms_main.service.api.serviceImpl; import com.wms_main.app.AppCommon; @@ -45,14 +45,14 @@ public class WcsApiServiceImpl implements IWcsApiService { public WcsApiResponse sendWcsStackerTask(WcsStackerTaskRequest request) { // 设置http请求 HttpRequest httpRequest = HttpRequest.postInstanceOf(appCommon.getConfigByKey(AppConfigKeyEnums.WCS_STACKER_TASK_URL.getKey()), request); - HttpResponse httpResponse = httpClient.httpPost(httpRequest); - if (httpResponse != null && httpResponse.isSuccess()) { - WcsApiResponse response = new WcsApiResponse<>(); - response = httpResponse.getData(response.getClass().asSubclass(WcsApiResponse.class)); - return response; - } - return WcsApiResponse.error("请求未获得响应信息。", null); - // return WcsApiResponse.success("请求未获得响应信息。", null); + HttpResponse httpResponse = httpClient.httpPost(httpRequest); + if (httpResponse != null && httpResponse.isSuccess()) { + WcsApiResponse response = new WcsApiResponse<>(); + response = httpResponse.getData(response.getClass().asSubclass(WcsApiResponse.class)); + return response; + } + return WcsApiResponse.error("请求未获得响应信息。", null); +// return WcsApiResponse.success("请求未获得响应信息。", null); } /** diff --git a/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/resources/application.yml b/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/resources/application.yml index b2a9989..21ab1e5 100644 --- a/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/resources/application.yml +++ b/202504-Wms-MengYang-tp/wms_serve_mengyang/src/main/resources/application.yml @@ -5,9 +5,9 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver # 本地 - # url: jdbc:mysql://localhost:3306/wms_mengyang_tp?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true - # username: root - # password: root +# url: jdbc:mysql://localhost:3306/wms_mengyang_tp?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true +# username: root +# password: root # 服务器 url: jdbc:mysql://localhost:3306/wms_mengyang_tp?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true username: user