root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:新增一楼待检区看板是否装箱；提示优化

Browse Source
This commit is contained in:
zhouz
2025-11-12 19:31:22 +08:00
parent df75bf7e93
commit 9cb6940d9e
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/screen/store/InMemoryStore.java
View File

@@ -56,7 +56,6 @@ public class InMemoryStore {
blkList.add(row.getString("device_code")); blkList.add(row.getString("device_code"));
} }
WmsToAcsServiceImpl bean = SpringContextHolder.getBean(WmsToAcsServiceImpl.class); WmsToAcsServiceImpl bean = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
JSONObject result2; JSONObject result2;
try { try {
@@ -67,7 +66,7 @@ public class InMemoryStore {
} }
// 调用acs接口获取设备 // 调用acs接口获取设备
JSONArray blk_data = result2.getJSONArray("data"); JSONArray blk_data = result2.getJSONArray("data");
return ObjectUtil.isEmpty(blk_data) ? blk_data : new JSONArray(); return ObjectUtil.isNotEmpty(blk_data) ? blk_data : new JSONArray();
} }
} }

7
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
View File

@@ -454,16 +454,15 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) { if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
// 判断浅货位木箱和深货位木箱是否相同规格 // 判断浅货位木箱和深货位木箱是否相同规格
task_group_id = outBoxManageService.createBoxMove(浅Attr); task_group_id = outBoxManageService.createBoxMove(浅Attr);
} else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) { } else {
List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>() List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
.eq("is_delete", "0") .eq("is_delete", "0")
.eq("point_code1", 浅Attr.getString("struct_code")) .eq("point_code1", 浅Attr.getString("struct_code"))
.lt("task_status", TaskStatusEnum.FINISHED.getCode())); .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code")); throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位【存在任务】" + 浅Attr.getString("task_code"));
} }
} else { throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】" + 浅Attr.getString("task_code"));
throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code"));
} }
} }
} }

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
View File

@@ -31,4 +31,6 @@ public class BstIvtPackageinfoivtVO extends BstIvtPackageinfoivt {
/** 子卷理论长度 */ /** 子卷理论长度 */
private Integer split_height; private Integer split_height;
private String box_no;
} }

9
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
View File

@@ -125,11 +125,16 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
List<BstIvtPackageinfoivt> records = selectPage.getRecords(); List<BstIvtPackageinfoivt> records = selectPage.getRecords();
Set<String> containers = records.stream().map(BstIvtPackageinfoivt::getContainer_name).filter(a -> StringUtils.isNotEmpty(a)).collect(Collectors.toSet()); Set<String> containers = records.stream().map(BstIvtPackageinfoivt::getContainer_name).filter(a -> StringUtils.isNotEmpty(a)).collect(Collectors.toSet());
Map<String, PdmBiSlittingproductionplan> listMap = new HashMap(); Map<String, PdmBiSlittingproductionplan> listMap = new HashMap();
Map<String, PdmBiSubpackagerelation> subMap = new HashMap();
if (!CollectionUtils.isEmpty(containers)) { if (!CollectionUtils.isEmpty(containers)) {
List<PdmBiSlittingproductionplan> containerInfo = iPdmBiSlittingproductionplanService.list(new QueryWrapper<PdmBiSlittingproductionplan>() List<PdmBiSlittingproductionplan> containerInfo = iPdmBiSlittingproductionplanService.list(new QueryWrapper<PdmBiSlittingproductionplan>()
.in("container_name", containers) .in("container_name", containers)
.select("container_name", "weight", "paper_weight", "split_breadth", "split_height")); .select("container_name", "weight", "paper_weight", "split_breadth", "split_height"));
listMap = containerInfo.stream().collect(HashMap::new, (m, o) -> m.put(o.getContainer_name(), o), HashMap::putAll); listMap = containerInfo.stream().collect(HashMap::new, (m, o) -> m.put(o.getContainer_name(), o), HashMap::putAll);
List<PdmBiSubpackagerelation> subInfo = subpackagerelationService.list(new QueryWrapper<PdmBiSubpackagerelation>()
.in("container_name", containers)
.select("container_name", "package_box_sn"));
subMap = subInfo.stream().collect(HashMap::new, (m, o) -> m.put(o.getContainer_name(), o), HashMap::putAll);
} }
List<BstIvtPackageinfoivtVO> voRecords = new ArrayList<>(); List<BstIvtPackageinfoivtVO> voRecords = new ArrayList<>();
for (BstIvtPackageinfoivt record : records) { for (BstIvtPackageinfoivt record : records) {
@@ -142,6 +147,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
vo.setSplit_breadth(planInfo.getSplit_breadth().intValue()); vo.setSplit_breadth(planInfo.getSplit_breadth().intValue());
vo.setSplit_height(planInfo.getSplit_height().intValue()); vo.setSplit_height(planInfo.getSplit_height().intValue());
} }
PdmBiSubpackagerelation subInfo = subMap.get(record.getContainer_name());
if (subInfo != null) {
vo.setBox_no(subInfo.getPackage_box_sn());
}
voRecords.add(vo); voRecords.add(vo);
} }
selectPage.setRecords(voRecords); selectPage.setRecords(voRecords);