fix:修改工序领料、工序检验节点逻辑

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

@@ -31,11 +31,12 @@ public class ProcessGetMaterials implements IRunBPMService {
         //基础信息
         Map<String,Object> map = new HashMap<>();
         map.put("id",bpmRunNodeFromVo.getTaskPlanKey());
-        System.err.println(bpmRunNodeFromVo.getTaskPlanKey());
         bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("master_task", map, false));
         //质控
         Map<String,Object> map1 = new HashMap<>();
         map1.put("task_id",bpmRunNodeFromVo.getTaskPlanKey());
+        map1.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
+//        map1.put("task_node_key",bpmRunNodeFromVo.getTaskNodeKey());
         bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("record_quality_control_card", map1, false));
 
         //执行流程节点信息

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

@@ -36,19 +36,18 @@ public class ProcessInspect implements IRunBPMService {
         //质控
         Map<String,Object> map1 = new HashMap<>();
         map1.put("task_id",bpmRunNodeFromVo.getTaskPlanKey());
+        map1.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
         bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("record_quality_control_card",map1,false));
 
         //工序状态
-        Map<String,Object> map2 = new HashMap<>();
-        map2.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
-        map2.put("task_node_key",bpmRunNodeFromVo.getTaskNodeKey());
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("process_inspect",map2,false));
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("bpm_execute_node",new HashMap<>(),true));
 
         //人员及工时分配
         Map<String,Object> map3 = new HashMap<>();
-        map.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
-        map.put("task_node_key",bpmRunNodeFromVo.getTaskNodeKey());
-        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("process_inspect_personnel",map3,false));
+        map3.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
+        map3.put("task_node_key",bpmRunNodeFromVo.getTaskNodeKey());
+        map3.put("del_flag","0");
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("process_inspect_personnel",map3,false,"personnelList"));
 
         return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
     }