From 43921ffb6ba7bafdd730d7bc1adc56c173bb4400 Mon Sep 17 00:00:00 2001
From: psh <psh>
Date: Tue, 26 Mar 2024 09:18:50 +0800
Subject: [PATCH] fix

---
 .../service/impl/SchBaseTaskServiceImpl.java     | 16 +++++++++++++++-
 lms/nladmin-ui/src/views/wms/sch/task/index.vue  |  8 ++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

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 a76c5aa..3c3b568 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
@@ -228,7 +228,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
         }
         // 根据标识找到任务
         SchBaseTask taskOne = schBaseTaskMapper.selectById(task_id);
-        if (Integer.parseInt(taskOne.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())) {
+        if (Integer.parseInt(taskOne.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())
+        &&!"feedback".equals(method_name)) {
             throw new BadRequestException("任务已完成或已取消!");
         }
         // 根据配置去工厂类获得类对象
@@ -248,9 +249,22 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
             case "cancel":
                 abstractTask.cancel(task_id);
                 break;
+            case "feedback":
+                sendToMes(taskOne);
+                break;
             default:
                 break;
         }
     }
 
+    private void sendToMes(SchBaseTask task){
+        if(task.getPoint_code2().startsWith("YL")){
+//            QPMES062
+        }else if(task.getPoint_code2().startsWith("HW")){
+//            QPMES065
+        }else{
+            throw new RuntimeException("目的地非入原材料库或出库，无需反馈MES！");
+        }
+    }
+
 }
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 4865b33..514b988 100644
--- a/lms/nladmin-ui/src/views/wms/sch/task/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/task/index.vue
@@ -233,6 +233,12 @@
               :disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
               @click="doOperate(scope.row, 'b')"
             >取消</el-button>
+            <!-- <el-button
+              type="text"
+              icon="el-icon-upload"
+              :disabled="scope.row.task_status!=='5' && scope.row.task_status!=='6'"
+              @click="doOperate(scope.row, 'e')"
+            >MES反馈</el-button> -->
           </template>
         </el-table-column>
       </el-table>
@@ -352,6 +358,8 @@ export default {
         case 'd':// 详情
           method_name = 'view'
           break
+        case 'e':// 反馈MES
+          method_name = 'feedback'
       }
       if (method_name === 'view') {
         // this.view(row)