Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

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 = '停用'

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");
         //生产日期