生产任务单

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.item.entity.product.po.ProductInfo;
-import com.fjhx.item.service.product.ProductBomDetailService;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.dto.ProduceOrderDetailSelectDto;
 import com.fjhx.mes.entity.production.dto.ProductionTaskDetailDto;
@@ -16,9 +15,9 @@ import com.fjhx.mes.entity.production.po.ProductionTaskProgress;
 import com.fjhx.mes.entity.production.vo.ProductionOrderDetailVo;
 import com.fjhx.mes.entity.production.vo.ProductionTaskProgressVo;
 import com.fjhx.mes.mapper.production.ProduceOrderDetailMapper;
-import com.fjhx.mes.mapper.production.ProductionProcessesMapper;
 import com.fjhx.mes.mapper.production.ProductionTaskProgressMapper;
 import com.fjhx.mes.service.production.ProduceOrderDetailService;
+import com.fjhx.mes.service.production.ProduceOrderService;
 import com.fjhx.sale.entity.contract.po.ContractProductBom;
 import com.fjhx.sale.entity.contract.vo.ContractProductBomVo;
 import com.fjhx.sale.service.contract.ContractProductBomService;
@@ -50,13 +49,11 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     @Autowired
     private ProductInfoService productInfoService;
     @Autowired
-    private ProductionProcessesMapper productionProcessesMapper;
-    @Autowired
-    private ProductBomDetailService productBomDetailService;
-    @Autowired
     private ProductionTaskProgressMapper productionTaskProgressMapper;
     @Autowired
     private ContractProductBomService contractProductBomService;
+    @Autowired
+    private ProduceOrderService produceOrderService;
 
     @Override
     public Page<ProductionOrderDetailVo> getPage(ProduceOrderDetailSelectDto dto) {
@@ -115,14 +112,6 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
         });
         Map<Long, ContractProductBomVo> rawMaterialMap = contractProductBomVoList.stream().collect(Collectors.toMap(ContractProductBomVo::getContractProductId, Function.identity()));
 
-
-//        //赋值工序列表
-//        Map<Long, List<ProductionProcessesVo>> processesMap = new HashMap<>();
-//        if (ObjectUtil.isNotEmpty(pIds)) {
-//            List<ProductionProcessesVo> processes = productionProcessesMapper.getProcessesByProductId(IWrapper.getWrapper().in("pi.id", pIds));
-//            processesMap = processes.stream().collect(Collectors.groupingBy(ProductionProcessesVo::getProductId));
-//        }
-
         //获取生产进度列表
         List<Long> tIds = records.stream().map(ProductionOrderDetail::getId).collect(Collectors.toList());
         List<ProductionTaskProgressVo> productionTaskProgressList = productionTaskProgressMapper.getList(IWrapper.<ProductionTaskProgress>getWrapper()
@@ -161,10 +150,6 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
                 record.setUsageTime(usageTime / 1000 / 60 / 60);
             }
 
-//            //赋值工序列表
-//            List<ProductionProcessesVo> productionProcessesVo = processesMap.get(record.getProductId());
-//            record.setProductionProcessesList(productionProcessesVo);
-
             //赋值生产进度列表
             record.setProductionTaskProgressList(productionTaskProgressMap.get(record.getId()));
         }
@@ -176,6 +161,14 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
     public ProductionOrderDetailVo detail(ProductionTaskDetailDto dto) {
         ProductionOrderDetailVo detail = BeanUtil.copyProperties(getById(dto.getId()), ProductionOrderDetailVo.class);
         Assert.notEmpty(detail, "查询不到任务明细信息！");
+
+        //赋值订单信息
+        ProductionOrder productionOrder = produceOrderService.getById(detail.getProduceOrderId());
+        if (ObjectUtil.isNotEmpty(productionOrder)) {
+            detail.setOrderCode(productionOrder.getCode());
+            detail.setDeliveryPeriod(productionOrder.getDeliveryPeriod());
+        }
+
         //赋值产品信息
         ProductInfo product = productInfoService.getById(detail.getProductId());
         if (ObjectUtil.isNotEmpty(product)) {