From d374da878611e3c3d3cc47e21c18c0050750ef48 Mon Sep 17 00:00:00 2001 From: ldj_willow Date: Wed, 19 Oct 2022 20:16:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/acs/service/impl/AcsToWmsServiceImpl.java | 14 +++++++------- .../java/org/nl/wms/ext/auto/AutoQueryTask.java | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index e61e3fd..136211c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -187,7 +187,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (StrUtil.equals(jsonObject.getString("status"), "200")) { // 成功返回 更新任务状态 JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } else { throw new BadRequestException(jsonObject.getString("message")); @@ -220,7 +220,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject jsonObject = taskBean.renotifyAcs(task_id); if (StrUtil.equals(jsonObject.getString("status"), "200")) { // 成功返回 更新任务状态 - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } else { throw new BadRequestException(jsonObject.getString("message")); @@ -238,7 +238,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject jsonObject = taskBean.renotifyAcs(task_id); if (StrUtil.equals(jsonObject.getString("status"), "200")) { JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } else { throw new BadRequestException(jsonObject.getString("message")); @@ -271,7 +271,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 下发 JSONObject jsonObject = taskBean.renotifyAcs(task_id); if (StrUtil.equals(jsonObject.getString("status"), "200")) { - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } else { throw new BadRequestException(jsonObject.getString("message")); @@ -290,7 +290,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject jsonObject = taskBean.renotifyAcs(task_id); if (StrUtil.equals(jsonObject.getString("status"), "200")) { JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } else { throw new BadRequestException(jsonObject.getString("message")); @@ -320,7 +320,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject jsonObject = taskBean.renotifyAcs(task_id); if (StrUtil.equals(jsonObject.getString("status"), "200")) { JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); // 更新载具对应数量表 // veQtyTab.update(jsonVeQty); @@ -357,7 +357,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 下发 JSONObject jsonObject = taskBean.renotifyAcs(task_id); if (StrUtil.equals(jsonObject.getString("status"), "200")) { - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } else { throw new BadRequestException(jsonObject.getString("message")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java index 63ef726..e40b413 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java @@ -10,9 +10,8 @@ import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.tasks.PointToPointTask; - - import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -106,7 +105,7 @@ public class AutoQueryTask { if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) { // 4.5.下发成功、更新任务状态 - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } // 5.1判断SSX02A1 、 SSX02A2是否是空位 无任务 @@ -130,7 +129,7 @@ public class AutoQueryTask { if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) { // 4.5.下发成功、更新任务状态 - jsonTask.put("task_status", "05"); + jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); taskTab.update(jsonTask); } }