生产任务列表添加排程信息

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionTaskProgressVo.java

@@ -1,9 +1,12 @@
 package com.fjhx.mes.entity.production.vo;
 
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
 import com.fjhx.mes.entity.production.po.ProductionTaskProgress;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 生产任务进度列表查询返回值实体
  *
@@ -19,4 +22,9 @@ public class ProductionTaskProgressVo extends ProductionTaskProgress {
      */
     private String progressName;
 
+    /**
+     * 排程列表
+     */
+    private List<ProductionScheduling> schedulingList;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -12,6 +12,7 @@ import com.fjhx.mes.entity.production.dto.ProductionOrderDetailDto;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
 import com.fjhx.mes.entity.production.po.ProductionOrder;
 import com.fjhx.mes.entity.production.po.ProductionOrderDetail;
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
 import com.fjhx.mes.entity.production.po.ProductionTaskProgress;
 import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.fjhx.mes.entity.production.vo.ProductionTaskProgressVo;
@@ -19,6 +20,7 @@ import com.fjhx.mes.mapper.production.ProduceOrderDetailMapper;
 import com.fjhx.mes.mapper.production.ProductionTaskProgressMapper;
 import com.fjhx.mes.service.production.ProduceOrderDetailService;
 import com.fjhx.mes.service.production.ProduceOrderService;
+import com.fjhx.mes.service.production.ProductionSchedulingService;
 import com.fjhx.sale.entity.contract.po.ContractProductBom;
 import com.fjhx.sale.entity.contract.vo.ContractProductBomVo;
 import com.fjhx.sale.service.contract.ContractProductBomService;
@@ -61,6 +63,8 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     private ProduceOrderService produceOrderService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ProductionSchedulingService productionSchedulingService;
 
     @Override
     public Page<ProductionOrderDetailVo> getPage(ProduceOrderDetailSelectDto dto) {
@@ -140,6 +144,18 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         Map<Long, List<ProductionTaskProgressVo>> productionTaskProgressMap = productionTaskProgressList
                 .stream().collect(Collectors.groupingBy(ProductionTaskProgress::getTaskId));
 
+        //对进度列表赋值排程信息
+        List<ProductionScheduling> pShList = productionSchedulingService.list(q -> q.in(ProductionScheduling::getTaskId, tIds));
+        for (ProductionTaskProgressVo productionTaskProgressVo : productionTaskProgressList) {
+            List<ProductionScheduling> schedulingList = pShList.stream()
+                    .filter(item ->
+                            ObjectUtil.equals(item.getTaskId(), productionTaskProgressVo.getTaskId()) &&
+                                    ObjectUtil.equals(item.getProcessesId(), productionTaskProgressVo.getProcessesId())
+                    ).collect(Collectors.toList());
+            productionTaskProgressVo.setSchedulingList(schedulingList);
+        }
+
+
         //获取生产公司信息
         List<Long> companyIds = records.stream().map(ProductionOrderDetail::getCompanyId).collect(Collectors.toList());
         Map<Long, String> companyNameMap = DeptUstil.getDeptNameMap(companyIds);