From 5d36b7681302fd191e07c0e60083a169775bb1c6 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 25 Nov 2022 11:10:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acs/nladmin-ui/src/views/acs/route/routeLine/index.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
index 6c2f8970d..032fc9146 100644
--- a/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
+++ b/acs/nladmin-ui/src/views/acs/route/routeLine/index.vue
@@ -93,7 +93,6 @@
               clearable
               multiple
               reserveKeyword
-              @change="change"
               placeholder="请选择"
               style="width: 370px;"
             >
@@ -156,7 +155,7 @@
         ref="table"
         v-loading="crud.loading"
         :data="crud.data"
-        fit="false"
+        fit="fit"
         size="medium"
         style="width: 100%;"
         @selection-change="crud.selectionChangeHandler"
@@ -259,6 +258,7 @@ export default {
   },
   data() {
     return {
+      fit: false,
       routePlanList: [],
       deviceList: [],
       deviceType: [
@@ -308,6 +308,12 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
+    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
+    [CRUD.HOOK.beforeToEdit](data) {
+      this.form.device_code = Array.of(data.form.device_code.split('').join(''))
+      this.form.next_device_code = Array.of(data.form.next_device_code.split('').join(''))
+      return true
+    },
     // 改变状态
     changeEnabled(data) {
       var msg = '停用'

From 673758226e1921b87db6e6b846742d7ce9132b76 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 25 Nov 2022 11:12:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
index 3f9531bd2..ea94c000f 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
@@ -66,10 +66,10 @@ public class PrintServiceImpl implements PrintService {
         //规格
         String width = box_jo.getString("width");
         //批号
-        String pcsn = "";
+        String pcsn = box_jo.getString("date_of_production");
 
         //入库日期
-        String date_of_FG_inbound = box_jo.getString("date_of_FG_inbound");
+        String date_of_FG_inbound = box_jo.getString("date_of_fg_inbound");
         //毛重
         String box_weight = box_jo.getString("box_weight");
         //生产日期