|
@@ -185,7 +185,7 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
|
|
|
item.setProductHeight(rawMaterial.getHeight());
|
|
|
item.setProductColor(rawMaterial.getColor());
|
|
|
});
|
|
|
- Map<Long, ContractProductBomVo> rawMaterialMap = contractProductBomVoList.stream().collect(Collectors.toMap(ContractProductBomVo::getContractProductId, Function.identity()));
|
|
|
+
|
|
|
|
|
|
|
|
|
List<Long> tIds = records.stream().map(ProductionOrderDetail::getId).collect(Collectors.toList());
|
|
@@ -233,12 +233,12 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- ContractProductBomVo rawMaterial = rawMaterialMap.get(record.getContractDetailId());
|
|
|
- if (ObjectUtil.isNotEmpty(rawMaterial)) {
|
|
|
- record.setRawMaterialCode(rawMaterial.getProductCode());
|
|
|
- record.setRawMaterialName(rawMaterial.getProductName());
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
record.setUsageTime(0L);
|