Merge remote-tracking branch 'origin/b_lms' into master_merge

# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue

@@ -67,7 +67,7 @@
         请仔细核对子卷与木箱规格是否匹配，
         <br>
         <br>
-        <span class="red-text">木箱长度为：{{ this.boxLength }}</span>，
+        <span class="red-text">木箱规格为：{{ this.boxLength }}</span>，
         <br>
         <br>
         <span class="red-text">子卷规格为：{{ this.paperTubeDescription }}</span>，
@@ -211,7 +211,7 @@ export default {
     submit() {
       debugger
       this.rows = this.$refs.table.selection
-      this.boxLength = this.rows[0].box_length
+      this.boxLength = this.rows[0].material_code
       if (this.rows.length <= 0) {
         this.$message('请先选择木箱信息')
         return