上传工序选项接口代码

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/machineLogsMapper.xml

@@ -17,6 +17,9 @@
     </insert>
     <update id="updateMachineLogs" >
         UPDATE tb_rst_pts_machine_logs SET
+        <if test="logsProcessPrompt != null and logsProcessPrompt != ''" >
+            logs_process_prompt = #{logsProcessPrompt},
+        </if>
         <if test="logsErrorType != null and logsErrorType != ''" >
             logs_error_type = #{logsErrorType}
         </if>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/MachineController.java

@@ -103,7 +103,7 @@ public class MachineController {
             }else{//默认为正常
                 ptsMachineLogs.setLogsProcessStatus(processNode.getNodeStatus());
             }
-            ptsMachineLogs.setLogsProcessPrompt(processNode.getNodeStatus() == 0?"异常操作": null);
+            ptsMachineLogs.setLogsProcessPrompt(processNode.getNodeStatus() == 0?"检查不通过": null);
             ptsMachineLogs.setLogsProcessTime(logsProcessDate);
             ptsMachineLogs.setLogsCreateTime(new Date());
             //根据上一条工序选项信息判断当前工序是否正常，如果当前为修理工序则忽略，如果上一条为修理工序则查询上上一条
@@ -120,6 +120,7 @@ public class MachineController {
                         //判断当前工序是否是修理工序，如果是，则修改上一条为次品
                         if(produceProcess.getProcessType() == 2){
                             ptsMachineLogs.setLogsErrorType(2);//异常类型 1:流程异常 2:次品异常
+                            ptsMachineLogs.setLogsProcessPrompt("次品异常");
                             machineLogsService.updateMachineLogs(ptsMachineLogs);
                             isAbnormality = false;
                             ptsMachineLogs.setLogsId(null);
@@ -130,6 +131,7 @@ public class MachineController {
                                 if(produceProcess.getProcessSort() - produceProcess2.getProcessSort() != 1){
                                     ptsMachineLogs.setLogsProcessStatus(0);
                                     ptsMachineLogs.setLogsErrorType(1);//异常类型 1:流程异常 2:次品异常
+                                    ptsMachineLogs.setLogsProcessPrompt("流程异常");
                                     isAbnormality = false;
                                 }
                             }else{
@@ -145,6 +147,7 @@ public class MachineController {
                                             if(produceProcess.getProcessSort() > produceProcess2.getProcessSort()){
                                                 ptsMachineLogs.setLogsProcessStatus(0);
                                                 ptsMachineLogs.setLogsErrorType(1);//异常类型 1:流程异常 2:次品异常
+                                                ptsMachineLogs.setLogsProcessPrompt("流程异常");
                                                 isAbnormality = false;
                                             }
                                             break;