From a1e3180f77765f2474a9a7672f9426f13f48edb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com>
Date: Sun, 28 Sep 2025 16:34:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/api/service/IToWcsService.java   |  2 ++
 .../ruoyi/api/service/impl/ToWcsServiceImpl.java    |  6 +++---
 .../mydojob/service/impl/MydoJobServiceImpl.java    | 13 ++++++-------
 .../mapper/bas/cargoSpace/BasCargoSpaceMapper.xml   |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java
index 6e42f20..b8a6933 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWcsService.java
@@ -38,4 +38,6 @@ public interface IToWcsService {
      * @return
      */
     AjaxResult cancelTaskByTaskNo(String taskNo);
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
index 8099063..e12aff1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
@@ -44,8 +44,6 @@ public class ToWcsServiceImpl implements IToWcsService {
         mydoJobParam.setStatus("1");
         List<String> list = new ArrayList<>();
         list.add("21");
-        list.add("23");
-        list.add("25");
         mydoJobParam.setInOutIds(list);
         List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobListApi(mydoJobParam);
         for (MydoJob outMydoJob : outMydoJobs) {
@@ -121,6 +119,8 @@ public class ToWcsServiceImpl implements IToWcsService {
         if ("1".equals(requestLog.getIsSuccessful())){
             return AjaxResult.success();
         }
-        return AjaxResult.error(MessageUtils.message("error.message17"));
+        return AjaxResult.error(requestLog.getErrorDetails());
     }
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
index 41631f2..984e34c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
@@ -344,7 +344,6 @@ public class MydoJobServiceImpl implements IMydoJobService {
             }
             TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure();
             trayCodeMakeSure.setTrayCode(job.getTrayCode());
-            iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
             pdaService.outMakeSure(trayCodeMakeSure);
         }
         return AjaxResult.success();
@@ -392,12 +391,12 @@ public class MydoJobServiceImpl implements IMydoJobService {
                 updateMydoJob(job);
                 insertHistory(jobId);
                 //通知wcs
-//                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
-//                if (ajaxResult.isSuccess()){
-//                    return AjaxResult.success();
-//                }else {
-//                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
-//                }
+                AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo());
+                if (ajaxResult.isSuccess()){
+                    return AjaxResult.success();
+                }else {
+                    throw new RuntimeException(Convert.toStr(ajaxResult.get("msg")));
+                }
             }
 
         } catch (Exception e) {
diff --git a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
index 5e577dc..c195949 100644
--- a/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/bas/cargoSpace/BasCargoSpaceMapper.xml
@@ -188,7 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="roadwayId != null">
             and roadway_id = #{roadwayId}
         </if>
-        ORDER BY the_platoon, the_column, the_floor
+        ORDER BY the_platoon, the_floor,the_column
     </select>
     <select id="selectBasCargoSpaceListByRoadway" parameterType="BasCargoSpace" resultMap="BasCargoSpaceResult">
         select bcs.cargo_space_id, bcs.warehouse_id, bw.warehouse_name, bcs.roadway_id, bcs.cargo_area_id, bcs.the_type,