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 40c04a156..fab541a8e 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 @@ -65,5 +65,8 @@ public class MdpbBoxtype implements Serializable { */ private String expend_width; - + /** + * 箱体结构 + */ + private String box_structure; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java index eb35762ac..435efc23e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java @@ -371,7 +371,11 @@ public class LashManageServiceImpl implements LashManageService { throw new BadRequestException("第一次捆扎数量不能为空!"); } result.put("bundleTimes", boxTypeDao.getLash_num_one()); - + // 木箱结构 + if (ObjectUtil.isEmpty(boxTypeDao.getBox_structure())) { + throw new BadRequestException("木箱结构不能为空!"); + } + result.put("box_structure", boxTypeDao.getBox_structure()); return result; } 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 5b5268dc1..3b1014dca 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 @@ -90,6 +90,26 @@ + + + + + + + + + @@ -160,6 +180,7 @@ +