Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionProductObsolescence.java

@@ -5,6 +5,7 @@ import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
 import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
 import com.zkqy.execution.produce.utils.EchoNodeFormData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +26,9 @@ public class ExceptionProductObsolescence implements IRunBPMService {
     @Autowired
     private EchoNodeFormData echoNodeFormData;
 
+    @Autowired // 执行流程
+    private BpmExecuteProcessMapper runBpmExecuteProcessMapper;
+
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
         Map<String,Object> map1 = new HashMap<>();
@@ -39,6 +43,8 @@ public class ExceptionProductObsolescence implements IRunBPMService {
 
     @Override
     public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        // 更改任务流程状态
+        runBpmExecuteProcessMapper.endProcess(iRunBPMEntity.getExecutionFlowKey());
         return AjaxResult.success();
     }
 

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionQualityControlCardSubCard.java

@@ -27,6 +27,10 @@ public class ExceptionQualityControlCardSubCard implements IRunBPMService {
 
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        //数量
+        Map<String,Object> map2 = new HashMap<>();
+        map2.put("id",bpmRunNodeFromVo.getTaskPlanKey());
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("master_task", map2, false));
         //质控卡
         Map<String,Object> map = new HashMap<>();
         map.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionTaskTermination.java

@@ -1,10 +1,13 @@
 package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
 
 import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.BpmExecuteNode;
 import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
 import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteNodeMapper;
+import com.zkqy.execution.produce.dispersed.mapper.BpmExecuteProcessMapper;
 import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
 import com.zkqy.execution.produce.utils.EchoNodeFormData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +28,12 @@ public class ExceptionTaskTermination implements IRunBPMService {
     @Autowired
     private EchoNodeFormData echoNodeFormData;
 
+    @Autowired // 执行流程
+    private BpmExecuteProcessMapper runBpmExecuteProcessMapper;
+
+//    @Autowired  // 执行流程节点表
+//    private BpmExecuteNodeMapper runBpmExecuteNodeMapper;
+
     @Override
     public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
         Map<String,Object> map1 = new HashMap<>();
@@ -39,6 +48,13 @@ public class ExceptionTaskTermination implements IRunBPMService {
 
     @Override
     public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        // 更改任务流程状态
+        runBpmExecuteProcessMapper.endProcess(iRunBPMEntity.getExecutionFlowKey());
+        // 更改节点任务状态
+//        BpmExecuteNode bpmExecuteNode = new BpmExecuteNode();
+//        bpmExecuteNode.setTaskProcessKey(iRunBPMEntity.getExecutionFlowKey());
+//        bpmExecuteNode.setTaskNodeType(iRunBPMEntity.getExecutionNodeKey());
+//        runBpmExecuteNodeMapper.updateNodeState(bpmExecuteNode);
         return AjaxResult.success();
     }
 

zkqy-ui/src/views/bussiness/dialogCompments/Mec/QualityControlCardSubCardProcessing.vue

@@ -23,7 +23,7 @@
         <el-col :span="12">
           <el-form-item>
             <el-form-item>
-              <span>{{this.recordQualityControlCard.number}}</span>
+              <span>{{this.recordQualityControlCard.tasklumber}}</span>
             </el-form-item>
           </el-form-item>
         </el-col>
@@ -62,7 +62,7 @@
         //表单数据
         recordQualityControlCard:{
           qualityControlCard:"",
-          number:"1"
+          tasklumber:"1"
         },
         form: {
           qualityControlCard: '',