DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成wip-退火模块

Browse Source
This commit is contained in:
86156
2026-03-15 15:10:17 +08:00
parent 9a645100df
commit 5487f04cf5
5 changed files with 137 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-wms/src/main/java/com/klp/domain/vo/WmsFurnacePlanCoilVo.java
View File

@@ -28,6 +28,12 @@ public class WmsFurnacePlanCoilVo {
@ExcelProperty(value = "入场钢卷号")
private String enterCoilNo;
@ExcelProperty(value = "实际库位ID")
private Long actualWarehouseId;
@ExcelProperty(value = "实际库位")
private String actualWarehouseName;
@ExcelProperty(value = "创建时间")
private Date createTime;
}

31
klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java
View File

@@ -192,9 +192,27 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService {
if (coilIds.isEmpty()) {
return list;
}
java.util.Map<Long, String> enterNoMap = materialCoilMapper.selectBatchIds(coilIds).stream()
.collect(Collectors.toMap(WmsMaterialCoil::getCoilId, WmsMaterialCoil::getEnterCoilNo, (a, b) -> a));
list.forEach(item -> item.setEnterCoilNo(enterNoMap.get(item.getCoilId())));
List<WmsMaterialCoil> materialCoils = materialCoilMapper.selectBatchIds(coilIds);
java.util.Map<Long, WmsMaterialCoil> coilMap = materialCoils.stream()
.collect(Collectors.toMap(WmsMaterialCoil::getCoilId, item -> item, (a, b) -> a));
List<Long> actualWarehouseIds = materialCoils.stream()
.map(WmsMaterialCoil::getActualWarehouseId)
.filter(id -> id != null)
.distinct()
.collect(Collectors.toList());
java.util.Map<Long, String> warehouseMap = actualWarehouseIds.isEmpty()
? java.util.Collections.emptyMap()
: actualWarehouseMapper.selectBatchIds(actualWarehouseIds).stream()
.collect(Collectors.toMap(WmsActualWarehouse::getActualWarehouseId,
WmsActualWarehouse::getActualWarehouseName, (a, b) -> a));
list.forEach(item -> {
WmsMaterialCoil coil = coilMap.get(item.getCoilId());
if (coil != null) {
item.setEnterCoilNo(coil.getEnterCoilNo());
item.setActualWarehouseId(coil.getActualWarehouseId());
item.setActualWarehouseName(warehouseMap.get(coil.getActualWarehouseId()));
}
});
return list;
}
@@ -321,10 +339,9 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService {
warehouse.setIsEnabled(1);
actualWarehouseMapper.updateById(warehouse);
}
WmsMaterialCoil updateCoil = new WmsMaterialCoil();
updateCoil.setCoilId(coilId);
updateCoil.setActualWarehouseId(null);
materialCoilMapper.updateById(updateCoil);
materialCoilMapper.update(null, Wrappers.<WmsMaterialCoil>lambdaUpdate()
.eq(WmsMaterialCoil::getCoilId, coilId)
.set(WmsMaterialCoil::getActualWarehouseId, null));
}
private void occupyActualWarehouse(Long coilId, Long actualWarehouseId) {