diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java index fab541a8e..5f8723dfa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/MdpbBoxtype.java +++ b/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; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 0cd5d58d8..0da6ae6cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -36,7 +36,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.IStIvtIostorinvOutService; @@ -157,6 +159,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Resource private SsxDjwTask ssxDjwTask; + @Autowired + private IMdpbBoxtypeService iMdpbBoxtypeService; @Autowired private ISysParamService iSysParamService; @@ -2750,13 +2754,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 queryWrapper = new QueryWrapper().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 = ""; diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue index 3b1014dca..bd1b40f73 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue @@ -47,7 +47,6 @@ + + + + + @@ -174,13 +178,14 @@ > - - - - - - - + + + + + + + + { this.dialogVisible2 = false