feat:包装节点取消计划2

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

@@ -413,9 +413,9 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
     }
 
     @Override
-    public List<DetailsOfTheRefuelingPlan> getAllPlanListByMachineId(String machineId) {
+    public List<DetailsOfTheRefuelingPlan> getAllPlanListByMachineId(String macId) {
         DetailsOfTheRefuelingPlan detailsOfTheRefuelingPlan3=new DetailsOfTheRefuelingPlan();
-        detailsOfTheRefuelingPlan3.setMachineId(machineId);//产线号
+        detailsOfTheRefuelingPlan3.setMacId(macId);//产线号
         List<DetailsOfTheRefuelingPlan> detailsOfTheRefuelingPlans3 = detailsOfTheRefuelingPlanMapper.selectDetailsOfTheRefuelingPlanListDetiles(detailsOfTheRefuelingPlan3);
         return detailsOfTheRefuelingPlans3;
     }
@@ -423,7 +423,7 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
     @Override
     public List<DetailsOfTheRefuelingPlan> getAllPlanListByProductType(DetailsOfTheRefuelingPlan detailsOfTheRefuelingPlan) {
         DetailsOfTheRefuelingPlan detailsOfTheRefuelingPlan3=new DetailsOfTheRefuelingPlan();
-        detailsOfTheRefuelingPlan3.setMachineId(detailsOfTheRefuelingPlan.getMachineId());//产线号
+        detailsOfTheRefuelingPlan3.setMachineId(detailsOfTheRefuelingPlan.getMacId());//产线号
         detailsOfTheRefuelingPlan3.setProductType(detailsOfTheRefuelingPlan.getProductType());//类型
         detailsOfTheRefuelingPlan3.setPlanStatus(detailsOfTheRefuelingPlan.getPlanStatus());//状态
         List<DetailsOfTheRefuelingPlan> detailsOfTheRefuelingPlans3 = detailsOfTheRefuelingPlanMapper.selectDetailsOfTheRefuelingPlanListDetiles(detailsOfTheRefuelingPlan3);

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

@@ -135,6 +135,7 @@ public class DetailsOfTheRefuelingPlanServiceImpl implements IDetailsOfTheRefuel
         }
         saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlan.getSalesmanId());//合同号
         saleProducts.setOnBoardState(detailsOfTheRefuelingPlan.getPlanStatus());//更新上机状态
+        saleProducts.setProductionLineNo(detailsOfTheRefuelingPlan.getMacId());//产线号
         //修改产品上机状态
         productsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
         return detailsOfTheRefuelingPlanMapper.updateDetailsOfTheRefuelingPlan(detailsOfTheRefuelingPlan);

zkqy-ui/src/views/orderMange/planTable/index.vue

@@ -852,7 +852,7 @@ export default {
         }
       }
       //待生产列表
-      if (columnIndex === 8) {
+      if (columnIndex === 9) {
         const prevRow2 = this.tableData[rowIndex - 1] //上一行数据
         let nextRow2 = this.tableData[rowIndex + 1] //下一行数据
         // 当上一行的数据等于当前行数据时，当前行单元格隐藏
@@ -1195,7 +1195,8 @@ export default {
       this.machineId=""
       //当前操作机台号
       this.machineId=row.machineId;
-      getAllPlanListByMachineId(row.machineId).then((response) => {
+      this.macId=row.macId;
+      getAllPlanListByMachineId(this.macId).then((response) => {
         //得到生产中，停产的，待产的
         response.data.forEach(item => {
           item.isEditing=false;
@@ -1257,7 +1258,7 @@ export default {
     },
     //弹窗里边的点击查询
     onSubmit(){
-      this.formData.machineId=this.machineId;
+      this.formData.macId=this.macId;
       getAllPlanListByProductTypeAndStatus(this.formData).then(response => {
         //得到生产中，停产的，待产的
         response.data.forEach(item => {
@@ -1279,6 +1280,7 @@ export default {
           this.getAmmunitionPlanInfo();
           //最后把弹窗关掉
           this.nanInsertDialogTableVisible=false
+          this.beiUpdateDialogTableVisible=false
         } else {
           this.$message({
             message: '修改失败',
@@ -1286,6 +1288,7 @@ export default {
           });
           //最后把弹窗关掉
           this.nanInsertDialogTableVisible=false
+          this.beiUpdateDialogTableVisible=false
         }
       })
     }