feat:产线待机规格查询,删除计划改空批号

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

@@ -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.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
+                        List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentSpecification()+"-"+plan.getCurrentColorCode() + "-(" + 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.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
+                        List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan ->  plan.getCurrentSpecification()+"-"+plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
                         rs1.setPlannedProduction(collect);
                         list.add(rs1);
                     }
@@ -276,6 +276,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
         saleProducts.setId(Long.valueOf(productId));
         saleProducts.setStatus("3");
         saleProducts.setOnBoardState("");
+        saleProducts.setLotNumber("");
         saleProductsMapper.updateSaleProductsNull(saleProducts);
        return detailsOfTheRefuelingPlanSpinningMapper.deleteDetailsOfTheRefuelingPlanSpinningById(id);
 
@@ -315,10 +316,11 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
         });
         //更新产线
         int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
-        if(saleProductsList2.size() > 0){
+        if(saleProductsList2.size()>0){
             //更新产线
             int i3= saleProductsMapper.updateSaleProductBatch(saleProductsList2);
         }
+
         return detailsOfTheRefuelingPlanSpinningMapper.insertBatchDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
     }
     @Override

zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml

@@ -385,7 +385,8 @@
             <if test="sliceType != null">slice_type = #{sliceType},</if>
             <if test="colourNumber != null">colour_number = #{colourNumber},</if>
             on_board_state="",
-            production_line_no=null
+            production_line_no=null,
+            lot_number=""
         </trim>
         where id = #{id}
     </update>