rev：盘点明细字段出书画

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/pick/service/PickingService.java

@@ -116,7 +116,10 @@ public class PickingService {
     public void taskOpen(JSONObject form){
         PmFormData mst = form.toJavaObject(PmFormData.class);
         if (StringUtils.isEmpty(mst.getProc_inst_id())){
-            throw new BadRequestException("当前单据不存在流程实例id");
+            throw new BadRequestException("下发失败：当前单据不存在流程实例id");
+        }
+        if (!mst.getStatus().equals(StatusEnum.FORM_STATUS.code("已分配"))){
+            throw new BadRequestException("下发失败：当前单据未分配或者一下发");
         }
         PickingService pickingService = SpringContextHolder.getBean(this.getClass());
         pickingService.disGroup(mst);

wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml

@@ -119,6 +119,7 @@
         left join md_pb_vehicleMater vm on struct.vehicle_code = vm.vehicle_code
         left join md_me_materialbase material on vm.material_id = material.material_id
         <where>
+            struct.vehicle_code is not null
             <if test="query.search != null and query.search != ''">
                 and (struct.struct_code LIKE '%${query.search}%'
                 or struct.struct_name LIKE '%${query.search}%')

wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
 
@@ -22,7 +22,7 @@ spring:
       # 超时时间(以秒数为单位)
       remove-abandoned-timeout: 180
       # 获取连接超时时间
-      max-wait: 3000
+      max-wait: 9000
       # 连接有效性检测时间
       time-between-eviction-runs-millis: 60000
       # 连接在池中最小生存的时间

wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue

@@ -191,7 +191,7 @@
         <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value"
                          :label="item.lable">
           <template slot-scope="scope">
-            <el-switch v-if="item.value == 'is_artificiality'"
+            <el-switch v-if="item.value == 'is_artificial'"
               v-model="tabledis[scope.$index].form_data[item.value]"
               active-color="#409EFF"
               inactive-color="#F56C6C"
@@ -229,9 +229,10 @@
                 :value="item.value"
               />
             </el-select>
+            <el-input v-if="item.value == 'end_struct_code'" v-model="tabledis[scope.$index].form_data[item.value]"  />
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作" width="160" fixed="right">
+        <el-table-column align="center" label="操作"  fixed="right">
           <template scope="scope">
             <el-button  type="danger"  size="mini" icon="el-icon-delete" @click="subRow(scope.$index)">删除</el-button>
           </template>
@@ -282,7 +283,7 @@ export default {
       dtlCols: [],
       unitDict: [],
       disCols: [],
-      disFormData: [],
+      disFormData: {},
       tableDtl: [],
       tabledis: [],
       vehicledis: [],
@@ -320,7 +321,7 @@ export default {
       formstruc.getHeader("Picking_Task").then(res => {
         this.disCols = res
         res.forEach(a => {
-          this.disFormData[a.value,'']
+          this.$set(this.disFormData, a.value, '')
         })
       }),
         measureunit.getSelect().then(res => {
@@ -350,10 +351,9 @@ export default {
       dtl.source_form_id = this.currentDtl.id
       dtl.source_form_date = this.currentDtl.create_time
       dtl.parent_id = this.currentDtl.id
-      dtl.form_data = {}
-      this.disFormData.forEach(a => {
-          dtl.form_data[a.value,'']
-      })
+      debugger
+      dtl.form_data = this.disFormData
+
       this.tabledis.push(dtl)
     },
     subRow(index){

wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/ViewDialog.vue

@@ -145,7 +145,7 @@
         <el-table-column show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value"
                          :label="item.lable">
           <template slot-scope="scope">
-            <el-switch disabled v-if="item.value == 'is_artificiality'"
+            <el-switch disabled v-if="item.value == 'is_artificial'"
                        v-model="tabledis[scope.$index].form_data[item.value]"
                        active-color="#409EFF"
                        inactive-color="#F56C6C"