From a4886fe4bf74f143ea8d14734b28df89bccc279f Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Fri, 31 Mar 2023 10:43:05 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9E=9A=E4=B8=BE=EF=BC=8C=E5=89=8D=E7=AB=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E6=88=90=E7=B1=BB=E5=9E=8B=E5=90=8E=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/common/utils/AcsUtil.java     |  5 +++--
 mes/qd/src/views/wms/sch/task/index.vue                | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
index ef40fac6..5c4f137d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
@@ -6,6 +6,7 @@ import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.common.enums.StatusEnum;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
@@ -23,9 +24,9 @@ public class AcsUtil {
     public static JSONObject notifyAcs(String api, JSONArray list) {
         log.info("下发ACS参数----------------------------------------+"+api+",---"+list.toString());
         //判断是否连接ACS系统
-        String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue();
+        String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue();
         JSONObject result = new JSONObject();
-        if (StrUtil.equals("0", isConnect)) {
+        if (StrUtil.equals(StatusEnum.STATUS_FLASE.getCode(), isConnect)) {
             result.put("status", HttpStatus.OK.value());
             result.put("message", "下发成功，但未连接ACS!");
             result.put("data", new JSONObject());
diff --git a/mes/qd/src/views/wms/sch/task/index.vue b/mes/qd/src/views/wms/sch/task/index.vue
index 7ba411e4..892e10ff 100644
--- a/mes/qd/src/views/wms/sch/task/index.vue
+++ b/mes/qd/src/views/wms/sch/task/index.vue
@@ -140,11 +140,6 @@
           </template>
         </el-table-column>
         <el-table-column prop="task_name" label="任务描述" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ dict.label.task_finished_type[scope.row.finished_type] }}
-          </template>
-        </el-table-column>
         <el-table-column v-if="false" prop="task_type_name" label="任务类型" min-width="120" show-overflow-tooltip />
         <el-table-column v-if="false" prop="task_status" label="任务状态" />
         <el-table-column prop="product_area" label="生产区域" />
@@ -165,6 +160,11 @@
         <el-table-column prop="vehicle_code" label="载具编码1" min-width="100" show-overflow-tooltip />
         <el-table-column prop="vehicle_code2" label="载具编码2" min-width="100" show-overflow-tooltip />
         <el-table-column prop="remark" label="提示" width="120" show-overflow-tooltip />
+        <el-table-column prop="finished_type" label="任务完成类型" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ dict.label.task_finished_type[scope.row.finished_type] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="create_time" label="创建时间" width="135" />
         <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column