ソースを参照

feat:包装节点取消计划

hmc 1 年間 前
コミット
4200dbf4b1

+ 3 - 3
zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/chemicalfiber/WrappingNode.java

@@ -51,7 +51,7 @@ public class WrappingNode implements IRunBPMService {
             CommonEntity commonEntity3 = new CommonEntity();
             //查询这个产线属于哪个车间的
             commonEntity3.getBasicMap().put("tableName","production_line");
-            commonEntity3.getQueryMap().put("production_line_no",productionLineNo);
+            commonEntity3.getQueryMap().put("id",productionLineNo);
             List<CommonEntity> commonEntities3 = commonService.selectList(commonEntity3);
             if(commonEntities3!=null&&commonEntities3.size()>0){
                 //产线信息
@@ -76,7 +76,7 @@ public class WrappingNode implements IRunBPMService {
                         CommonEntity commonEntity5 = new CommonEntity();
                         commonEntity5.getBasicMap().put("tableName","details_of_the_refueling_plan");
                         commonEntity5.getQueryMap().put("product_id",productId);
-                        commonEntity5.getQueryMap().put("machine_id",productionLineNo);
+                        commonEntity5.getQueryMap().put("mac_id",productionLineNo);
                         commonEntity5.getCommMap().put("plan_status","3");
                         commonService.edit(commonEntity5);
                     }
@@ -98,7 +98,7 @@ public class WrappingNode implements IRunBPMService {
                         CommonEntity commonEntity5 = new CommonEntity();
                         commonEntity5.getBasicMap().put("tableName","details_of_the_refueling_plan_spinning");
                         commonEntity5.getQueryMap().put("product_id",productId);
-                        commonEntity5.getQueryMap().put("machine_id",productionLineNo);
+                        commonEntity5.getQueryMap().put("mac_id",productionLineNo);
                         commonEntity5.getCommMap().put("plan_status","3");
                         commonService.edit(commonEntity5);
                     }

+ 4 - 0
zkqy-ui/src/views/orderMange/planTable/fangsi.vue

@@ -679,4 +679,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>

+ 4 - 0
zkqy-ui/src/views/orderMange/planTable/fankuang.vue

@@ -679,4 +679,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>

+ 8 - 2
zkqy-ui/src/views/orderMange/planTable/index.vue

@@ -1167,15 +1167,17 @@ export default {
           });
           this.getAmmunitionPlanInfo();
           //最后把弹窗关掉
-          this.nanInsertDialogTableVisible=false
+          this.nanInsertDialogTableVisible = false
+          this.beiInsertDialogTableVisible = false
           //更改订单投产信息的批号,
         } else {
           this.$message({
             message: '添加失败',
             type: 'error'
           });
+          this.nanInsertDialogTableVisible = false
+          this.beiInsertDialogTableVisible = false
           //最后把弹窗关掉
-          this.nanInsertDialogTableVisible=false
         }
       });
 
@@ -1304,4 +1306,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>

+ 4 - 0
zkqy-ui/src/views/orderMange/planTable/luotong.vue

@@ -679,4 +679,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>

+ 4 - 0
zkqy-ui/src/views/orderMange/planTable/show/fangsi.vue

@@ -995,4 +995,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>

+ 4 - 0
zkqy-ui/src/views/orderMange/planTable/show/fankuang.vue

@@ -1085,4 +1085,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>

+ 3 - 0
zkqy-ui/src/views/orderMange/planTable/show/luotong.vue

@@ -1093,4 +1093,7 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
 </style>

+ 4 - 0
zkqy-ui/src/views/orderMange/planTable/show/northWorkshop.vue

@@ -690,4 +690,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>

+ 4 - 0
zkqy-ui/src/views/orderMange/planTable/show/southWorkshop.vue

@@ -542,4 +542,8 @@ export default {
 .el-table__body-wrapper.grabbing {
   cursor: grabbing;
 }
+.container >>> .el-table .cell {
+  white-space: pre-line;
+}
+
 </style>