Skip to content

M
mes
Commit 0572ea54 authored by 温志超's avatar 温志超
Browse files
Options

更新排序

parent 37cedcbe
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java
View file @ 0572ea54
...@@ -1359,7 +1359,7 @@ public class ProTaskServiceImpl implements IProTaskService { ...@@ -1359,7 +1359,7 @@ public class ProTaskServiceImpl implements IProTaskService {
query.eq(StringUtils.isNotEmpty(proTask.getArrangeCode()), "t.arrange_code", proTask.getArrangeCode()); query.eq(StringUtils.isNotEmpty(proTask.getArrangeCode()), "t.arrange_code", proTask.getArrangeCode());
query.gt(proTask.getAllowProduce() != null && proTask.getAllowProduce() == 1, "t.quantity_wait", 0); query.gt(proTask.getAllowProduce() != null && proTask.getAllowProduce() == 1, "t.quantity_wait", 0);
query.gt("ptw.quantity", 0); query.gt("ptw.quantity", 0);
query.orderByAsc("t.workstation_id").orderByAsc("ptw.workunit_id").orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date"); query.orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date");
//搜索条件为工单号查询相应任务ID作为查询条件 //搜索条件为工单号查询相应任务ID作为查询条件
// if (StringUtils.isNotEmpty(proTask.getWorkorderCode())) { // if (StringUtils.isNotEmpty(proTask.getWorkorderCode())) {
// QueryWrapper<ProTask> taskQuery = new QueryWrapper<>(); // QueryWrapper<ProTask> taskQuery = new QueryWrapper<>();
...@@ -1388,7 +1388,7 @@ public class ProTaskServiceImpl implements IProTaskService { ...@@ -1388,7 +1388,7 @@ public class ProTaskServiceImpl implements IProTaskService {
query.eq(StringUtils.isNotEmpty(proTask.getArrangeCode()), "t.task_code", proTask.getArrangeCode()); query.eq(StringUtils.isNotEmpty(proTask.getArrangeCode()), "t.task_code", proTask.getArrangeCode());
query.gt(proTask.getAllowProduce() != null && proTask.getAllowProduce() == 1, "t.quantity_wait", 0); query.gt(proTask.getAllowProduce() != null && proTask.getAllowProduce() == 1, "t.quantity_wait", 0);
query.gt("ptw.quantity", 0); query.gt("ptw.quantity", 0);
query.orderByAsc("t.workstation_id").orderByAsc("ptw.workunit_id").orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date"); query.orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date");
list = this.selectProTaskJoinTaskWorkUnit(query); list = this.selectProTaskJoinTaskWorkUnit(query);
} }
rst = list.stream().filter(t -> !TaskStatusEnum.FINISHED.getStatus().equals(t.getStatus())).collect(Collectors.toList()); rst = list.stream().filter(t -> !TaskStatusEnum.FINISHED.getStatus().equals(t.getStatus())).collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment