更新工作任务查询方式

mes/src/main/java/com/ximai/mes/pro/controller/mobile/ProTaskMobController.java

@@ -13,7 +13,11 @@ import com.ximai.common.core.page.TableDataInfo;
 import com.ximai.common.enums.BusinessType;
 import com.ximai.common.exception.ServiceException;
 import com.ximai.common.utils.MessageUtils;
+import com.ximai.common.utils.SecurityUtils;
 import com.ximai.common.utils.data.StringUtils;
+import com.ximai.mes.md.domain.MdWorkunit;
+import com.ximai.mes.md.service.IMdWorkunitService;
+import com.ximai.mes.md.vo.MdWorkunitVo;
 import com.ximai.mes.pro.domain.ProFeedback;
 import com.ximai.mes.pro.domain.ProProductQrcodeRecord;
 import com.ximai.mes.pro.domain.proWorkOrder.ProWorkorder;
@@ -99,6 +103,8 @@ public class ProTaskMobController extends BaseController {
     private IProProductionSolutionProcessService proProductionSolutionProcessService;
     @Autowired
     ProProductionSolutionMapper proProductionSolutionMapper;
+    @Autowired
+    private IMdWorkunitService mdWorkunitService;
 
     @GetMapping("/getlist")
     public AjaxResult getIssueList(ProTaskIssue proTaskIssue) {
@@ -118,6 +124,26 @@ public class ProTaskMobController extends BaseController {
         return getDataTable(rst);
     }
 
+    /**
+     * 查询工作站的生产任务
+     */
+    @ApiOperation("查询状态未完成的生产任务接口")
+    @GetMapping("/getAllTaskList")
+    public TableDataInfo<ProTask> getAllTaskList(ProTaskQuery proTask) {
+        startPage();
+        List<MdWorkunitVo> list = mdWorkunitService.selectMdWorkunitListByUser(new QueryWrapper<MdWorkunit>().eq("user_name", SecurityUtils.getUsername()));
+        if(list.size() < 1){
+            return getDataTable(new ArrayList<ProTask>());
+        }
+        if(proTask == null){
+            proTask = new ProTaskQuery();
+        }
+        proTask.setWorkunitIdList(list.stream().map(mdWorkunitVo -> mdWorkunitVo.getWorkunitId()).collect(Collectors.toList()));
+        List<ProTask> rst = proTaskService.getTaskList(proTask);
+        return getDataTable(rst);
+    }
+
+
 
     /**
      * 查询工作站的生产任务

mes/src/main/java/com/ximai/mes/pro/domain/vo/ProTaskQuery.java

 package com.ximai.mes.pro.domain.vo;
 
+import com.ximai.mes.md.vo.MdWorkunitVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 生产任务对象 ProTaskQuery
  *
@@ -36,5 +39,6 @@ public class ProTaskQuery {
     @ApiModelProperty("是否外委确认，1:是 0:否")
     private Integer outsourced;
 
-
+    @ApiModelProperty("作业单元ID组合")
+    private List<Long> workunitIdList;
 }

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskServiceImpl.java

@@ -1354,11 +1354,12 @@ public class ProTaskServiceImpl implements IProTaskService {
                 TaskStatusEnum.PAUSE.getStatus(), TaskStatusEnum.ERROR_STOP.getStatus());
         query.in("ptw.status", statusList);
         query.eq(proTask.getWorkunitId() != null, "mw.workunit_id", proTask.getWorkunitId());
+        query.in(proTask.getWorkunitIdList() != null, "mw.workunit_id", proTask.getWorkunitIdList());
         query.eq(proTask.getOutsourced() != null, "ptw.outsourced", proTask.getOutsourced());
         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("ptw.quantity", 0);
-        query.orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date");
+        query.orderByAsc("t.workstation_id").orderByAsc("ptw.workunit_id").orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date");
         //搜索条件为工单号查询相应任务ID作为查询条件
 //        if (StringUtils.isNotEmpty(proTask.getWorkorderCode())) {
 //            QueryWrapper<ProTask> taskQuery = new QueryWrapper<>();
@@ -1382,11 +1383,12 @@ public class ProTaskServiceImpl implements IProTaskService {
             query = new QueryWrapper<>();
             query.in("ptw.status", statusList);
             query.eq(proTask.getWorkunitId() != null, "mw.workunit_id", proTask.getWorkunitId());
+            query.in(proTask.getWorkunitIdList() != null, "mw.workunit_id", proTask.getWorkunitIdList());
             query.eq(proTask.getOutsourced() != null, "ptw.outsourced", proTask.getOutsourced());
             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("ptw.quantity", 0);
-            query.orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date");
+            query.orderByAsc("t.workstation_id").orderByAsc("ptw.workunit_id").orderByAsc("statusIndex").orderByAsc("ptw.schedule_start_date");
             list = this.selectProTaskJoinTaskWorkUnit(query);
         }
         rst = list.stream().filter(t -> !TaskStatusEnum.FINISHED.getStatus().equals(t.getStatus())).collect(Collectors.toList());