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

代码更新

Browse Source
This commit is contained in:
liuxy
2023-02-08 17:26:07 +08:00
parent ebf0093b2e
commit c5260fdd89
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
View File

@@ -100,9 +100,9 @@ public class OutTask extends AbstractAcsTask {
} }
// 更新任务为下发 // 更新任务为下发
JSONObject paramMap = new JSONObject(); /* JSONObject paramMap = new JSONObject();
paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode()); paramMap.put("task_status", TaskStatusEnum.ISSUE.getCode());
wo_Task.update(paramMap,"task_group_id ='"+json.getString("task_group_id")+"'"); wo_Task.update(paramMap,"task_group_id ='"+json.getString("task_group_id")+"'");*/
} }
} }
return resultList; return resultList;
@@ -119,9 +119,9 @@ public class OutTask extends AbstractAcsTask {
if (ObjectUtil.isNotEmpty(jsonTask)) { if (ObjectUtil.isNotEmpty(jsonTask)) {
if (StrUtil.equals(status, "0")) { if (StrUtil.equals(status, "0")) {
// 任务为执行中之后就不允许取消 // 任务为下发之后就不允许取消
if (StrUtil.equals(TaskStatusEnum.EXECUTING.getCode(), jsonTask.getString("task_status"))) { if (jsonTask.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.START_AND_POINT.getCode())) {
throw new BadRequestException("任务:"+jsonTask.getString("task_code")+"正在执行中，不可取消"); throw new BadRequestException("任务:"+jsonTask.getString("task_code")+"已下发，不可取消");
} }
// 更新删除字段 // 更新删除字段

7
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -619,6 +619,13 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表 WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); // 任务表
String task_id = whereJson.getString("task_id"); String task_id = whereJson.getString("task_id");
JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0);
// 任务为下发之后就不允许取消
if (jsonTask.getIntValue("task_status") > Integer.valueOf(TaskStatusEnum.START_AND_POINT.getCode())) {
throw new BadRequestException("任务:"+jsonTask.getString("task_code")+"已下发，不可取消");
}
// 更新分配明细 任务状态、清空任务id // 更新分配明细 任务状态、清空任务id
JSONObject paramMap = new JSONObject(); JSONObject paramMap = new JSONObject();
paramMap.put("task_id", ""); paramMap.put("task_id", "");