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

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

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -228,6 +228,16 @@
             {{ dict.label.placement_type[scope.row.placement_type] }}
           </template>
         </el-table-column>
+        <el-table-column prop="zdepth" label="深度" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.zdepth[scope.row.zdepth] }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="storagevehicle_type" label="托盘类型" min-width="120" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
+          </template>
+        </el-table-column>
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
             <el-switch
@@ -322,7 +332,7 @@ const defaultForm = {
 }
 export default {
   name: 'Structattr',
-  dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type'],
+  dicts: ['ST_HEIGHT_TYPE', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'placement_type', 'zdepth', 'storagevehicle_type'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {

lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue

@@ -414,6 +414,7 @@ export default {
         this.divBtn = true
         this.form.sect_id = this.sect_id
         this.form.stor_id = this.stor_id
+        this.form.is_send = ''
         crudRawAssist.divStruct(this.form).then(res => {
           crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code, 'open_flag': '1' }).then(res => {
             this.openParam = res