feat:加弹删除重置批号

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/AmmunitionPlanInformationIntermediateTableServiceImpl.java

@@ -162,7 +162,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                     BeanUtils.copyProperties(item1, rs1);
                     rs1.setCurrentLotNumber(item1.getCurrentLotNumber().toString());
                     //当前产线A面待生产
-                    String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
+                    String collect = detailsOfTheRefuelingPlans2.stream().map(plan ->plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+  "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
                     rs1.setListOfPendingProduction(collect);
                     list.add(rs1);
                 });
@@ -188,7 +188,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                         rs1.setPlannedEndTime(rs1.getPlannedEndTime() + "停机");
                         rs1.setCurrentLotNumber(item1.getCurrentLotNumber().toString());
                         //当前产线A面待生产
-                        String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
+                        String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+ "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
                         rs1.setListOfPendingProduction(collect);
                         list.add(rs1);
                     });
@@ -204,7 +204,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                         rs1.setProductType("A面");
                         rs1.setPlannedEndTime("停机");
                         //当前产线A面待生产
-                        String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
+                        String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode()+"-"+plan.getCurrentSpecification()+ "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
                         rs1.setListOfPendingProduction(collect);
                         list.add(rs1);
                     });
@@ -215,7 +215,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                 AmmunitionPlanInformationIntermediateTableRVo rs1 = new AmmunitionPlanInformationIntermediateTableRVo();
                 rs1.setMachineId(item.getProductionLineNo());//产线号
                 rs1.setMacId(item.getId().toString());//产线iD
-                String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
+                String collect = detailsOfTheRefuelingPlans2.stream().map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+  "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
                 rs1.setListOfPendingProduction(collect);
                 rs1.setProductType("A面");
                 list.add(rs1);
@@ -247,7 +247,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                     BeanUtils.copyProperties(item1, rs1);
                     rs1.setCurrentLotNumber(item1.getCurrentLotNumber().toString());
                     //当前产线b面待生产
-                    String collect = detailsOfTheRefuelingPlans3.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
+                    String collect = detailsOfTheRefuelingPlans3.stream().map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+  "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
                     rs1.setListOfPendingProduction(collect);
                     list.add(rs1);
                 });
@@ -267,7 +267,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                     rs1.setProductType("B面");
                     rs1.setPlannedEndTime("停机");
                     //当前产线b面待生产
-                    String collect = detailsOfTheRefuelingPlans3.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
+                    String collect = detailsOfTheRefuelingPlans3.stream().map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+ "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
                     rs1.setListOfPendingProduction(collect);
                     list.add(rs1);
                 });
@@ -278,7 +278,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
                 AmmunitionPlanInformationIntermediateTableRVo rs1 = new AmmunitionPlanInformationIntermediateTableRVo();
                 rs1.setMachineId(item.getProductionLineNo());//产线号
                 rs1.setMacId(item.getId().toString());//产线iD
-                String collect = detailsOfTheRefuelingPlans3.stream().map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
+                String collect = detailsOfTheRefuelingPlans3.stream().map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+  "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.joining(","));
                 rs1.setListOfPendingProduction(collect);
                 rs1.setProductType("B面");
                 list.add(rs1);

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java

@@ -98,7 +98,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                 rs2.setCurrentSpecification("停机");
                 rs2.setStartTime("");
                 rs2.setPlannedEndTime("");
-                List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
+                List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+ "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
                 rs2.setPlannedProduction(collect);
                 list.add(rs2);
             }else {
@@ -115,7 +115,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                         //把第一个元素给拷贝过去
                         BeanUtils.copyProperties(spinning1, rs1);
                         rs1.setMachineName(item.getProductionLineName());
-                        List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentSpecification()+"-"+plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
+                        List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+ "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
                         rs1.setPlannedProduction(collect);
                         list.add(rs1);
 
@@ -125,7 +125,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                         rs1.setMachineId(item.getProductionLineNo());//产线号
                         rs1.setMacId(item.getId().toString());//产线iD
                         rs1.setMachineName(item.getProductionLineName());
-                        List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan ->  plan.getCurrentSpecification()+"-"+plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
+                        List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentColorCode() +"-"+plan.getCurrentSpecification()+ "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
                         rs1.setPlannedProduction(collect);
                         list.add(rs1);
                     }