生产计划

hx-admin/src/main/resources/application.yml

@@ -63,6 +63,8 @@ spring:
        max-file-size:  10MB
        # 设置总上传的文件大小
        max-request-size:  20MB
+  main:
+    allow-circular-references: true
 
 # token配置
 token:

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionPlanController.java

@@ -1,5 +1,7 @@
 package com.fjhx.mes.controller.production;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.production.vo.ProductionPlanVo;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author 
  * @since 2023-03-29
  */
+@DS(SourceConstant.MES)
 @RestController
 @RequestMapping("/productionPlan")
 public class ProductionPlanController {

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionPlan.java

@@ -22,7 +22,7 @@ public class ProductionPlan extends BasePo {
     /**
      * 工单id
      */
-    private Integer workOrderId;
+    private Long workOrderId;
 
     /**
      * 计划开始时间

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

@@ -14,4 +14,7 @@ import lombok.Setter;
 @Setter
 public class ProductionPlanVo extends ProductionPlan {
 
+    /**产品名称*/
+    private String productName;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/technology/dto/TechnologyDto.java

@@ -21,4 +21,7 @@ public class TechnologyDto extends Technology {
     /**适用产品列表*/
     private List<ApplicableProducts> productList;
 
+    /**工序列表*/
+    private List<String> processRouteList;
+
 }

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

@@ -1,9 +1,15 @@
 package com.fjhx.mes.service.production.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.fjhx.item.entity.product.po.ProductInfo;
+import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.mes.entity.production.po.ProductionPlan;
+import com.fjhx.mes.entity.work.po.WorkOrder;
 import com.fjhx.mes.mapper.production.ProductionPlanMapper;
 import com.fjhx.mes.service.production.ProductionPlanService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.mes.service.work.WorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.mes.entity.production.vo.ProductionPlanVo;
@@ -12,6 +18,10 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.mes.entity.production.dto.ProductionPlanDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 
 /**
  * <p>
@@ -24,11 +34,35 @@ import cn.hutool.core.bean.BeanUtil;
 @Service
 public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper, ProductionPlan> implements ProductionPlanService {
 
+    @Autowired
+    WorkOrderService workOrderService;
+    @Autowired
+    ProductInfoService productInfoService;
+
     @Override
     public Page<ProductionPlanVo> getPage(ProductionPlanSelectDto dto) {
         IWrapper<ProductionPlan> wrapper = getWrapper();
         wrapper.orderByDesc("pp", ProductionPlan::getId);
         Page<ProductionPlanVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<ProductionPlanVo> records = page.getRecords();
+
+        //获取工单信息
+        List<Long> workOrderIds = records.stream().map(ProductionPlanVo::getWorkOrderId).collect(Collectors.toList());
+        List<WorkOrder> workOrderList = workOrderService.list(q -> q.in(WorkOrder::getId, workOrderIds));
+        Map<Long, WorkOrder> workOrderMap = workOrderList.stream().collect(Collectors.groupingBy(WorkOrder::getId,
+                Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+        //获取产品信息
+        List<Long> productIds = workOrderList.stream().map(WorkOrder::getProductId).collect(Collectors.toList());
+        List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
+        Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
+                Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
+        for (ProductionPlanVo productionPlanVo : records){
+            WorkOrder workOrder = workOrderMap.get(productionPlanVo.getWorkOrderId());
+            ProductInfo productInfo = productInfoMap.get(workOrder.getProductId());
+            if(ObjectUtil.isNotEmpty(productInfo)){
+                productionPlanVo.setProductName(productInfo.getName());
+            }
+        }
         return page;
     }
 
@@ -41,6 +75,7 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
 
     @Override
     public void add(ProductionPlanDto productionPlanDto) {
+        productionPlanDto.setStatus(0);
         this.save(productionPlanDto);
     }
 

hx-mes/src/main/java/com/fjhx/mes/service/technology/impl/TechnologyServiceImpl.java

@@ -140,6 +140,8 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(TechnologyDto technologyDto) {
+        String join = String.join(",", technologyDto.getProcessRouteList());
+        technologyDto.setProcessRoute(join);
         this.save(technologyDto);
         List<ApplicableProducts> productList = technologyDto.getProductList();
         for (ApplicableProducts applicableProducts : productList){
@@ -151,6 +153,8 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void edit(TechnologyDto technologyDto) {
+        String join = String.join(",", technologyDto.getProcessRouteList());
+        technologyDto.setProcessRoute(join);
         this.updateById(technologyDto);
         List<ApplicableProducts> productList = technologyDto.getProductList();
         applicableProductsService.remove(q->q.eq(ApplicableProducts::getTechnologyId,technologyDto.getId()));

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -17,6 +17,7 @@ import com.fjhx.mes.service.work.WorkOrderService;
 import com.fjhx.mes.utils.code.CodeEnum;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;