rev：手动回传mes

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java

@@ -208,9 +208,9 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         }
         // 根据标识找到任务
         SchBaseTask taskOne = this.getByCode(task_code);
-        if (Integer.parseInt(taskOne.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())) {
+       /* if (Integer.parseInt(taskOne.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())) {
             throw new BadRequestException("任务已完成或已取消!");
-        }
+        }*/
         // 根据配置去工厂类获得类对象
         String processing_class = config_code;
         String message = "";
@@ -229,6 +229,9 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             case "cancel":
                 abstractTask.cancel(task_code);
                 break;
+            case "back":
+                abstractTask.backMes(task_code);
+                break;
             default:
                 break;
         }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java

@@ -215,4 +215,5 @@ public abstract class AbstractTask {
     public void apply(JSONObject param) throws BadRequestException {
     }
 
+    public abstract void backMes(String task_code);
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java

@@ -117,6 +117,11 @@ public class KABDMTask extends AbstractTask {
         this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
         // 任务完成

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java

@@ -99,6 +99,11 @@ public class KDMABTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java

@@ -99,6 +99,11 @@ public class MABCTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java

@@ -99,6 +99,11 @@ public class MABDMTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java

@@ -99,6 +99,11 @@ public class MABGPTHJTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java

@@ -99,6 +99,11 @@ public class MBZCPTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java

@@ -99,6 +99,11 @@ public class MCDTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java

@@ -117,6 +117,11 @@ public class MDDMTask extends AbstractTask {
         this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) {
         // 任务完成

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java

@@ -99,6 +99,11 @@ public class MDMCPTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java

@@ -99,6 +99,11 @@ public class MGPTHJABTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java

@@ -99,6 +99,11 @@ public class MGPTHJCPTask extends AbstractTask {
         }
     }
 
+    @Override
+    public void backMes(String task_code) {
+        wmsToMesService.receiveTaskStatusMesData(taskService.getByCode(task_code));
+    }
+
     @Override
     public void forceFinish(String task_code) {
         SchBaseTask taskObj = taskService.getByCode(task_code);

lms/nladmin-ui/src/views/wms/sch/task/index.vue

@@ -247,6 +247,11 @@
               @click="doOperate(scope.row, 'b')"
               :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
             >取消</el-button>
+            <el-button
+              type="text"
+              icon="el-icon-success"
+              @click="doOperate(scope.row, 'e')"
+            >回传</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -374,6 +379,9 @@ export default {
         case 'd':// 详情
           method_name = 'view'
           break
+        case 'e':// 回传mes
+          method_name = 'back'
+          break
       }
       if (method_name === 'view') {
         // this.view(row)