From 8903b27276c7b9db1c05d55508725a4d506dddc6 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Sun, 9 Mar 2025 11:16:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                             |  1 +
 .idea/encodings.xml                                    |  1 +
 .../com/wms_main/controller/wms/mes/MesController.java |  9 +++++----
 .../serviceImpl/MesControllerServiceImpl.java          |  9 ++++++---
 src/main/resources/application.yml                     | 10 +++++-----
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index c30f72e..9d3670e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ hs_err_pid*
 replay_pid*
 
 /target/
+/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 63e9001..eebab54 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="Encoding">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/java/com/wms_main/service/quartz_job/serviceImpl/JobServiceImpl.java" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/wms_main/controller/wms/mes/MesController.java b/src/main/java/com/wms_main/controller/wms/mes/MesController.java
index 7a5d76f..a0d25d2 100644
--- a/src/main/java/com/wms_main/controller/wms/mes/MesController.java
+++ b/src/main/java/com/wms_main/controller/wms/mes/MesController.java
@@ -1,6 +1,7 @@
 package com.wms_main.controller.wms.mes;
 
 import com.wms_main.model.dto.request.mes.MesInTaskRequest;
+import com.wms_main.model.dto.request.mes.MesOutTaskRequest;
 import com.wms_main.model.dto.response.wms.BaseWmsApiResponse;
 import com.wms_main.service.controller.IMesControllerService;
 import lombok.RequiredArgsConstructor;
@@ -17,13 +18,13 @@ import org.springframework.web.bind.annotation.*;
 public class MesController {
     private final IMesControllerService mesControllerService;
 
-    @PostMapping("requestIn")
+    @PostMapping("/requestIn")
     public BaseWmsApiResponse requestIn(@RequestBody MesInTaskRequest mesInTaskRequest) {
         return mesControllerService.requestIn(mesInTaskRequest);
     }
 
-    @PostMapping("requestOut")
-    public BaseWmsApiResponse requestOut(@RequestBody MesInTaskRequest mesInTaskRequest) {
-        return mesControllerService.requestIn(mesInTaskRequest);
+    @PostMapping("/requestOut")
+    public BaseWmsApiResponse requestOut(@RequestBody MesOutTaskRequest mesOutTaskRequest) {
+        return mesControllerService.requestOut(mesOutTaskRequest);
     }
 }
diff --git a/src/main/java/com/wms_main/service/controller/serviceImpl/MesControllerServiceImpl.java b/src/main/java/com/wms_main/service/controller/serviceImpl/MesControllerServiceImpl.java
index 5df3c90..35204a3 100644
--- a/src/main/java/com/wms_main/service/controller/serviceImpl/MesControllerServiceImpl.java
+++ b/src/main/java/com/wms_main/service/controller/serviceImpl/MesControllerServiceImpl.java
@@ -64,11 +64,15 @@ public class MesControllerServiceImpl implements IMesControllerService {
         // 验证请求
         String validateInfo = validateMesInRequest(mesInTaskRequest);
         if (StringUtils.isNotEmpty(validateInfo)) {
+            // 请求处理结束，删除任务号缓存
+            mesTaskIdMap.remove(mesInTaskRequest.getTaskId());
             return BaseWmsApiResponse.error(validateInfo);
         }
         // 请求一个空库位
         TAppLocation targetLocation = stackerTaskService.requestOneLocation(null, mesInTaskRequest.getVehicleId());
         if (targetLocation == null) {
+            // 请求处理结束，删除任务号缓存
+            mesTaskIdMap.remove(mesInTaskRequest.getTaskId());
             return BaseWmsApiResponse.error("可用库位不足，请稍后重试。");
         }
         // 生成入库任务
@@ -98,7 +102,6 @@ public class MesControllerServiceImpl implements IMesControllerService {
         }
         // 保存任务
         appTaskService.saveBatch(inTasks);
-
         // 请求处理结束，删除任务号缓存
         mesTaskIdMap.remove(mesInTaskRequest.getTaskId());
         return BaseWmsApiResponse.success("请求入库成功。");
@@ -118,11 +121,11 @@ public class MesControllerServiceImpl implements IMesControllerService {
         for (MesDetailTaskInfo mesDetailTaskInfo : mesOutTaskRequest.getDetailTaskInfoList()) {
             outTasks.add(new TAppTask(
                     UUIDUtils.getNewUUID(),
-                    WmsTaskTypeEnums.IN.getCode(),
+                    WmsTaskTypeEnums.OUT.getCode(),
                     WmsStackerTaskStatusEnums.WAIT.getCode(),
                     1,
                     "test01",
-                    "",
+                    "A01-01-01-01",
                     "",
                     null,
                     LocalDateTime.now(),
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 03498f5..61a6c0d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,13 +9,13 @@ spring:
 #    username: developer
 #    password: developer
     # 本地
+#    url: jdbc:mysql://localhost:3306/wms_yachi_nantong?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+#    username: root
+#    password: liangzhou
+    # 服务器
     url: jdbc:mysql://localhost:3306/wms_yachi_nantong?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
     username: root
-    password: liangzhou
-    #    卡特服务器
-#    url: jdbc:mysql://10.90.83.37:3306/wms_kate_wuxi?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
-#    username: developer
-#    password: baokai
+    password: root1234
 
   profiles:
     active: online