From 48353a2ab47d7aea643e05a1076206d287f77dbc Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Sun, 28 Sep 2025 14:58:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E5=85=A5=E5=BA=93=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/api/domain/WmsJobRequest.java |  2 ++
 .../ruoyi/api/service/impl/ToWmsServiceImpl.java | 16 +++++++++-------
 ruoyi-ui/src/views/stock/management/index.vue    |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
index 2731e4a..4b0ec5f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java
@@ -22,4 +22,6 @@ public class WmsJobRequest {
     private String positionCode1;
     //终点
     private String positionCode2;
+    //任务id
+    private String jobId;
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
index 04cae49..310ce9b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
@@ -264,6 +264,7 @@ public class ToWmsServiceImpl implements IToWmsService {
         result.put("cargoSpaceId", mydoJob.getCargoSpaceId());
         result.put("roadwayId", mydoJob.getRoadwayId());
         result.put("entranceId", mydoJob.getEntranceId());
+        result.put("inOrOut", mydoJob.getInOrOut());
         return AjaxResult.success(result);
     }
 
@@ -287,7 +288,7 @@ public class ToWmsServiceImpl implements IToWmsService {
         String width = basProduct.getSpare37();
         String height = basProduct.getSpare38();
         String volume = basProduct.getSpare39();
-        return 0;
+        return 1;
     }
 
     @Override
@@ -334,18 +335,19 @@ public class ToWmsServiceImpl implements IToWmsService {
         MydoJob mydoJobParam = new MydoJob();
         switch (wmsJobRequest.getWmsType()) {
             case "1":
-                if (StrUtil.isEmpty(wmsJobRequest.getTrayCode())) {
-                    return AjaxResult.error(MessageUtils.message("error.message1"));
-                }
+
                 if (StrUtil.isEmpty(wmsJobRequest.getTaskNo())) {
-                    return AjaxResult.error(MessageUtils.message("error.message2"));
+                    return AjaxResult.error("任务号不能为空");
+                }
+                if (StrUtil.isEmpty(wmsJobRequest.getJobId())) {
+                    return AjaxResult.error("任务Id不能为空");
                 }
                 //入库
                 mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
-                mydoJobParam.setTrayCode(wmsJobRequest.getTrayCode());
+                mydoJobParam.setJobId(wmsJobRequest.getJobId());
                 List<MydoJob> inMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
                 if (inMydoJobs.isEmpty()) {
-                    return AjaxResult.error(MessageUtils.message("warn.message"));
+                    return AjaxResult.error("任务不存在");
                 }
                 MydoJob inMydoJob = inMydoJobs.get(0);
                 mydoJobService.manualCompleted(inMydoJob, 1);
diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue
index 7e8583c..39e3ad7 100644
--- a/ruoyi-ui/src/views/stock/management/index.vue
+++ b/ruoyi-ui/src/views/stock/management/index.vue
@@ -140,7 +140,7 @@
           <dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStockStatus"/>
         </template>
       </el-table-column>
-      <el-table-column width=120 label="货位状态" align="left" prop="cargoSpaceStatus" ><!--货位状态-->
+      <el-table-column width=120 label="是否锁定" align="left" prop="cargoSpaceStatus" ><!--是否锁定-->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cargo_space_lock_status" :value="scope.row.cargoSpaceStatus"/>
         </template>