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
       # 连接在池中最小生存的时间