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

zkqy-admin/src/main/resources/application.yml

@@ -35,9 +35,18 @@ server:
 
 # 日志配置
 logging:
+  # 定义全局日志级别，此处可以针对不同包或类设置不同的日志输出级别
   level:
+    # 设置com.zkqy包及其子包下的日志级别为debug
     com.zkqy: debug
+    # 设置org.springframework包及其子包下的日志级别为warn
     org.springframework: warn
+  # 文件日志相关配置
+  file:
+    # 指定日志文件的输出目录
+    # 此处将所有生成的日志文件存储在D:/rz/logs路径下（日志文件必须名为）
+    # logback-spring.xml中可以读取这个配置项（注意:日志配置文件必须叫logback-spring.xml）
+    path: D:/logs
 
 # 用户配置
 user:

zkqy-admin/src/main/resources/logback.xml → zkqy-admin/src/main/resources/logback-spring.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="./logs" />
+    <!--<property name="log.path" value="./logs" />-->
+    <!-- 日志存放路径 -->
+    <!-- 引入Spring Boot的环境变量 文件名必须叫 logback-spring 否则不能引用logging.file.path -->
+    <springProperty scope="context" name="log.path" source="logging.file.path"/>
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

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

@@ -0,0 +1,68 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+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.service.IRunBPMService;
+import com.zkqy.execution.produce.utils.EchoNodeFormData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 记录质控卡-异常节点
+ */
+@Service("f7c5527a-cbfe-4993-bce7-77d5ae538290")
+@Scope("prototype")
+public class ExceptionRecordQualityControlCard implements IRunBPMService {
+
+    @Autowired
+    private EchoNodeFormData echoNodeFormData;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        // 物料需求信息info
+        Map<String,Object> map = new HashMap<>();
+        map.put("id",bpmRunNodeFromVo.getTaskPlanKey());
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("master_task", map, false));
+        //质控卡号
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
+        map1.put("task_node_key",bpmRunNodeFromVo.getTaskNodeKey());
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("record_quality_control_card", map1, true));
+
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}