root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-19 20:16:46 +08:00
parent a066792ffa
commit d374da8786
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -187,7 +187,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (StrUtil.equals(jsonObject.getString("status"), "200")) { if (StrUtil.equals(jsonObject.getString("status"), "200")) {
// 成功返回 更新任务状态 // 成功返回 更新任务状态
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); 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); taskTab.update(jsonTask);
} else { } else {
throw new BadRequestException(jsonObject.getString("message")); throw new BadRequestException(jsonObject.getString("message"));
@@ -220,7 +220,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject jsonObject = taskBean.renotifyAcs(task_id); JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) { if (StrUtil.equals(jsonObject.getString("status"), "200")) {
// 成功返回 更新任务状态 // 成功返回 更新任务状态
jsonTask.put("task_status", "05"); jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask); taskTab.update(jsonTask);
} else { } else {
throw new BadRequestException(jsonObject.getString("message")); throw new BadRequestException(jsonObject.getString("message"));
@@ -238,7 +238,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject jsonObject = taskBean.renotifyAcs(task_id); JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) { if (StrUtil.equals(jsonObject.getString("status"), "200")) {
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); 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); taskTab.update(jsonTask);
} else { } else {
throw new BadRequestException(jsonObject.getString("message")); throw new BadRequestException(jsonObject.getString("message"));
@@ -271,7 +271,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 下发 // 下发
JSONObject jsonObject = taskBean.renotifyAcs(task_id); JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) { if (StrUtil.equals(jsonObject.getString("status"), "200")) {
jsonTask.put("task_status", "05"); jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask); taskTab.update(jsonTask);
} else { } else {
throw new BadRequestException(jsonObject.getString("message")); throw new BadRequestException(jsonObject.getString("message"));
@@ -290,7 +290,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject jsonObject = taskBean.renotifyAcs(task_id); JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) { if (StrUtil.equals(jsonObject.getString("status"), "200")) {
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); 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); taskTab.update(jsonTask);
} else { } else {
throw new BadRequestException(jsonObject.getString("message")); throw new BadRequestException(jsonObject.getString("message"));
@@ -320,7 +320,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
JSONObject jsonObject = taskBean.renotifyAcs(task_id); JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) { if (StrUtil.equals(jsonObject.getString("status"), "200")) {
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); 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); taskTab.update(jsonTask);
// 更新载具对应数量表 // 更新载具对应数量表
// veQtyTab.update(jsonVeQty); // veQtyTab.update(jsonVeQty);
@@ -357,7 +357,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 下发 // 下发
JSONObject jsonObject = taskBean.renotifyAcs(task_id); JSONObject jsonObject = taskBean.renotifyAcs(task_id);
if (StrUtil.equals(jsonObject.getString("status"), "200")) { if (StrUtil.equals(jsonObject.getString("status"), "200")) {
jsonTask.put("task_status", "05"); jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask); taskTab.update(jsonTask);
} else { } else {
throw new BadRequestException(jsonObject.getString("message")); throw new BadRequestException(jsonObject.getString("message"));

7
lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java
View File

@@ -10,9 +10,8 @@ import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.acs.service.WmsToAcsService;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.tasks.PointToPointTask; import org.nl.wms.sch.tasks.PointToPointTask;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -106,7 +105,7 @@ public class AutoQueryTask {
if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) { if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) {
// 4.5.下发成功、更新任务状态 // 4.5.下发成功、更新任务状态
jsonTask.put("task_status", "05"); jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask); taskTab.update(jsonTask);
} }
// 5.1判断SSX02A1 、 SSX02A2是否是空位 无任务 // 5.1判断SSX02A1 、 SSX02A2是否是空位 无任务
@@ -130,7 +129,7 @@ public class AutoQueryTask {
if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) { if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) {
// 4.5.下发成功、更新任务状态 // 4.5.下发成功、更新任务状态
jsonTask.put("task_status", "05"); jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode());
taskTab.update(jsonTask); taskTab.update(jsonTask);
} }
} }