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

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java

@@ -69,4 +69,8 @@ public class MdpbBoxtype implements Serializable {
      * 箱体结构
      */
     private String box_structure;
+    /**
+     * 干燥机数量
+     */
+    private Integer desiccant_num;
 }

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

@@ -34,7 +34,9 @@ import org.nl.b_lms.sch.tasks.first_floor_area.MzhcwTask;
 import org.nl.b_lms.sch.tasks.first_floor_area.SsxDjwTask;
 import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
 import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
+import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService;
 import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
+import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype;
 import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
 import org.nl.b_lms.storage_manage.ios.enums.TASKEnum;
 import org.nl.b_lms.storage_manage.ios.service.iostorInv.util.service.*;
@@ -119,6 +121,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      * 空载具出库处理服务
      */
     private final OutVehicleManageService outVehicleManageService;
+    
+    @Autowired
+    private IMdpbBoxtypeService iMdpbBoxtypeService;
 
     /**
      * 发货处理服务
@@ -2944,13 +2949,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         //获取包装关系
         JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + material_barcode + "'").uniqueResult(0);
         if (ObjectUtil.isNotEmpty(sub_jo)) {
-            String material_type = sub_jo.getString("material_type");
-            if (material_type.equals("FG1")) {
-                desiccantTemplate = "6";
+            //木箱类型
+            String box_type = sub_jo.getString("box_type");
+            if(ObjectUtil.isEmpty(box_type)){
+                throw new BadRequestException("未查询到木箱号【" + material_barcode + "】对应的包装关系缺少木箱类型信息！");
             }
-            if (material_type.equals("FG2")) {
-                desiccantTemplate = "4";
+            //查询木箱类型数据
+            LambdaQueryWrapper<MdpbBoxtype> queryWrapper = new QueryWrapper<MdpbBoxtype>().lambda();
+            queryWrapper.eq(MdpbBoxtype::getBox_type,box_type);
+            MdpbBoxtype boxType = iMdpbBoxtypeService.getOne(queryWrapper);
+            if(ObjectUtil.isEmpty(boxType)){
+                throw new BadRequestException("未查询到木箱类型【" + box_type + "】信息！");
             }
+            desiccantTemplate = String.valueOf(boxType.getDesiccant_num());
+        }else{
+            throw new BadRequestException("未查询到木箱号【" + material_barcode + "】对应的包装关系！");
         }
         //根据木箱高度，判断入库仓位的高度
         String height = "";

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

@@ -47,7 +47,6 @@
       </crudOperation>
       <!--表单组件-->
       <el-dialog
-        :close-on-click-modal="false"
         :before-close="crud.cancelCU"
         :visible.sync="crud.status.cu > 0"
         :title="crud.status.title"
@@ -109,6 +108,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="干燥剂数量:" prop="desiccant_num">
+                <el-input-number :precision="0" :step="1" :min="0" :max="100" v-model="form.desiccant_num" size="mini" :controls="true" style="width: 200px" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
@@ -174,13 +178,14 @@
       >
         <el-table-column prop="box_type" sortable label="木箱类型" />
         <el-table-column prop="box_name" label="木箱描述" width="150" />
-        <el-table-column prop="lash_num" label="捆扎模版" width="150" />
-        <el-table-column prop="lash_num_one" label="一次捆扎次数" width="150" />
-        <el-table-column prop="lash_num_tow" label="二次捆扎次数" width="150" />
-        <el-table-column prop="need_lash_one" label="是否一次捆扎" width="150" :formatter="formatOne" />
-        <el-table-column prop="need_lash_two" label="是否二次捆扎" width="150" :formatter="formatTwo" />
-        <el-table-column prop="expend_width" label="叉车取货宽度" width="150" />
-        <el-table-column prop="box_structure" label="箱体结构" width="150" :formatter="boxType"/>
+        <el-table-column prop="lash_num" label="捆扎模版" width="100" />
+        <el-table-column prop="lash_num_one" label="一次捆扎次数" width="100" />
+        <el-table-column prop="lash_num_tow" label="二次捆扎次数" width="100" />
+        <el-table-column prop="need_lash_one" label="是否一次捆扎" width="100" :formatter="formatOne" />
+        <el-table-column prop="need_lash_two" label="是否二次捆扎" width="100" :formatter="formatTwo" />
+        <el-table-column prop="expend_width" label="叉车取货宽度" width="100" />
+        <el-table-column prop="box_structure" label="箱体结构" width="100" :formatter="boxType"/>
+        <el-table-column prop="desiccant_num" label="干燥剂数量" width="100"/>
         <el-table-column
           v-permission="['admin','sectattr:edit','sectattr:del']"
           label="操作"
@@ -218,7 +223,8 @@ const defaultForm = {
   lash_num_tow: null,
   need_lash_one: '0',
   need_lash_two: '0',
-  box_structure: null
+  box_structure: null,
+  desiccant_num: 6
 }
 export default {
   name: 'BoxType',
@@ -231,7 +237,7 @@ export default {
       optShow: { add: true, reset: true },
       url: 'api/boxtype',
       idField: 'box_type',
-      sort: 'box_type,desc',
+      sort: '',
       crudMethod: { ...crudBoxtype }
     })
   },
@@ -272,6 +278,9 @@ export default {
     updateOne() {
       this.dialogVisible2 = true
     },
+    close() {
+      this.dialogVisible2 = false
+    },
     confirmUpdate() {
       crudBoxtype.confirmUpdate(this.formMst).then(res => {
         this.dialogVisible2 = false