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 @@ - - - @@ -165,6 +160,11 @@ + + +