From a714b8e2d671d75173f2ff5b64cfe487782b384e Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Thu, 27 Jun 2024 15:11:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=AD=90=E5=8D=B7=E5=8F=B7=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sch/point/dao/BstIvtPackageinfoivt.java     | 17 ++++++++++++++++-
 .../impl/BstIvtPackageinfoivtServiceImpl.java   |  2 +-
 .../src/views/wms/pdm/sub/MaterDialog.vue       |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java
index fac1b0812..6970892ad 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java
@@ -136,10 +136,25 @@ public class BstIvtPackageinfoivt extends Model<BstIvtPackageinfoivt> {
     private String plan;
 
     /**
-     * 规划
+     * 所属等待点
      */
     private String wait_point_type;
 
+    /**
+     * 排
+     */
+    private String row_num;
+
+    /**
+     * 列
+     */
+    private String col_num;
+
+    /**
+     * 深浅位
+     */
+    private String depth;
+
     /**
      * 获取主键值
      *
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index 5057a7640..9d13409d6 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -422,7 +422,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         BstIvtPackageinfoivt dto = bstIvtPackageinfoivtMapper.selectOne(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name")));
         if (dto == null) {
             result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value());
-            result.put("message", "不存在该数据！");
+            result.put("message", "子卷号有误，请核对是否存在！");
             return result;
         }
         dto.setIvt_status(whereJson.getString("ivt_status"));
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
index c406f6ecb..5eaf298d1 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
@@ -39,7 +39,7 @@
     >
       <el-table-column type="selection" width="55" />
       <el-table-column prop="box_no" label="木箱号" />
-      <el-table-column prop="material_code" label="物料编码" />
+      <el-table-column prop="material_code" label="木箱规格" />
       <el-table-column prop="material_name" label="物料名称" />
       <el-table-column prop="box_length" label="木箱长度" />
       <el-table-column prop="box_width" label="木箱宽度" />

From c9c93cd2ccf0de19b7c2c987208484a9554d15e0 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 27 Jun 2024 15:19:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20api=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
index 2491a7a6b..2c1dac31b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java
@@ -469,7 +469,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
 
     @Override
     public JSONObject getTubeMsg(JSONObject whereJson) {
-        String api = "api/wms/getTubeMes";
+        String api = "api/wms/getTubeMsg";
         JSONArray arr = new JSONArray();
         arr.add(whereJson);
         return AcsUtil.notifyAcs(api, arr);