|
@@ -215,7 +215,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
|
|
AmmunitionPlanInformationIntermediateTableRVo rs1 = new AmmunitionPlanInformationIntermediateTableRVo();
|
|
AmmunitionPlanInformationIntermediateTableRVo rs1 = new AmmunitionPlanInformationIntermediateTableRVo();
|
|
rs1.setMachineId(item.getProductionLineNo());//产线号
|
|
rs1.setMachineId(item.getProductionLineNo());//产线号
|
|
rs1.setMacId(item.getId().toString());//产线iD
|
|
rs1.setMacId(item.getId().toString());//产线iD
|
|
- String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+ "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
|
|
|
|
|
|
+ String collect = detailsOfTheRefuelingPlans2.stream().map(plan ->plan.getCurrentSpecification()+"-"+ plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
|
|
rs1.setListOfPendingProduction(collect);
|
|
rs1.setListOfPendingProduction(collect);
|
|
rs1.setProductType("A面");
|
|
rs1.setProductType("A面");
|
|
list.add(rs1);
|
|
list.add(rs1);
|