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

fix:出库任务查询，不查询任务组

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-05-11 16:08:51 +08:00
parent 671eda39a9
commit 9505647cee
1 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,19 +45,18 @@ public class OutTask extends AbstractAcsTask {
*/ */
//任务表 //任务表
WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
WQLObject dis_tab = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();
map.put("flag", "1"); map.put("flag", "1");
map.put("handle_class", THIS_CLASS); map.put("handle_class", THIS_CLASS);
JSONArray arr = WQL.getWO("TASK01").addParamMap(map).process().getResultJSONArray(0); //JSONArray arr = WQL.getWO("TASK01").addParamMap(map).process().getResultJSONArray(0);
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
ArrayList<AcsTaskDto> resultList = new ArrayList<>(); ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i); JSONObject json = arr.getJSONObject(i);
// 1.查询此任务是否有任务组 // 1.查询此任务是否有任务组
if (ObjectUtil.isEmpty(json.getString("task_group_id"))) { //if (ObjectUtil.isEmpty(json.getString("task_group_id"))) {
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1); char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
AcsTaskDto dto = AcsTaskDto.builder() AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id")) .ext_task_id(json.getString("task_id"))
@@ -76,7 +75,7 @@ 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_id ='" + json.getString("task_id") + "'"); wo_Task.update(paramMap, "task_id ='" + json.getString("task_id") + "'");
} else { /*} else {
// 2.有任务组：按照执行顺序下发 大到小 // 2.有任务组：按照执行顺序下发 大到小
JSONArray taskArr = wo_Task.query("task_group_id = '" + json.getString("task_group_id") + "' order by sort_seq ASC").getResultJSONArray(0); JSONArray taskArr = wo_Task.query("task_group_id = '" + json.getString("task_group_id") + "' order by sort_seq ASC").getResultJSONArray(0);
@@ -100,10 +99,10 @@ 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;
} }