diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanLocationItemBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanLocationItemBo.java index 2498f498..6ac9c7f6 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanLocationItemBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsFurnacePlanLocationItemBo.java @@ -18,4 +18,9 @@ public class WmsFurnacePlanLocationItemBo { @NotNull(message = "逻辑库位不能为空") private Long warehouseId; + + /** + * 合同ID + */ + private Long contractId; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java index b2698a58..a609b4a5 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsFurnacePlanServiceImpl.java @@ -380,6 +380,13 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService { .collect(java.util.stream.Collectors.toMap(com.klp.domain.bo.WmsFurnacePlanLocationItemBo::getCoilId, com.klp.domain.bo.WmsFurnacePlanLocationItemBo::getWarehouseId, (a, b) -> a)); + java.util.Map contractIdMap = locations.stream() + .filter(l -> l.getContractId() != null) + .collect(java.util.stream.Collectors.toMap( + com.klp.domain.bo.WmsFurnacePlanLocationItemBo::getCoilId, + com.klp.domain.bo.WmsFurnacePlanLocationItemBo::getContractId, + (a, b) -> a)); + for (WmsFurnacePlanCoilVo coil : coils) { Long targetLocation = locationMap.get(coil.getCoilId()); if (targetLocation == null) { @@ -407,6 +414,7 @@ public class WmsFurnacePlanServiceImpl implements IWmsFurnacePlanService { updateBo.setStatus(0); updateBo.setExportBy(null); updateBo.setExportTime(null); + updateBo.setContractId(contractIdMap.get(coil.getCoilId())); materialCoilService.updateByBo(updateBo, "annealing"); diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index f236b436..cd1aa521 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -2044,7 +2044,7 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // } // 加工操作必须绑定合同 - if (bo.getContractId() == null && StringUtils.isBlank(qrcodeStepType)) { + if (bo.getContractId() == null) { throw new RuntimeException("未填写合同"); }