From d0f93cf68336ca58cb185b18801bb99b8aa3d063 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 24 Oct 2024 16:46:21 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=89=8B=E5=8A=A8=E5=9B=9E?=
 =?UTF-8?q?=E4=BC=A0mes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/sch/task/service/impl/SchBaseTaskServiceImpl.java | 7 +++++--
 .../java/org/nl/wms/sch/task_manage/AbstractTask.java     | 1 +
 .../nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java   | 5 +++++
 .../nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java   | 5 +++++
 .../nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java    | 5 +++++
 .../nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java   | 5 +++++
 .../wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java   | 5 +++++
 .../nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java   | 5 +++++
 .../org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java | 5 +++++
 .../nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java    | 5 +++++
 .../nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java   | 5 +++++
 .../wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java   | 5 +++++
 .../wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java   | 5 +++++
 lms/nladmin-ui/src/views/wms/sch/task/index.vue           | 8 ++++++++
 14 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
index bda8b0b..0d68029 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
+++ b/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;
         }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
index 1ff15f7..d7a568a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/AbstractTask.java
+++ b/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);
 }
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java
index e2070c9..022152d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KABDMTask.java
+++ b/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) {
         // 任务完成
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java
index 8b99cee..68e5a4a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/KDMABTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java
index 19c1cfc..ca8eb7a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABCTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java
index fcdfe82..1dea0a0 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABDMTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java
index 3c04caa..5069bb5 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MABGPTHJTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java
index a05716b..f05c74b 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MBZCPTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java
index 540731e..710a072 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MCDTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java
index 63ffb70..f30e3bd 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDDMTask.java
+++ b/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) {
         // 任务完成
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java
index 99a1db8..ef32ea9 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MDMCPTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java
index 5a824d7..c0f1295 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJABTask.java
+++ b/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);
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java
index 26acc0f..437c24d 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/MGPTHJCPTask.java
+++ b/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);
diff --git a/lms/nladmin-ui/src/views/wms/sch/task/index.vue b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
index 1b1f9fd..e9d0f51 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/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)