外协检查查看图纸

src/main/java/cn/ezhizao/project/business/outsource/domain/BizOutsourcedOrderDetail.java

@@ -6,6 +6,7 @@ import java.util.List;
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
 import cn.ezhizao.project.business.product.domain.BizCarrier;
+import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -112,4 +113,7 @@ public class BizOutsourcedOrderDetail extends BaseEntity
 
     @ApiModelProperty("工序名")
     private String processNames;
+
+    @TableField(exist = false)
+    private List<BizTechnologicalProcessDetail> technologicalProcessDetailList;
 }

src/main/java/cn/ezhizao/project/business/outsource/domain/BizOutsourcedOrderDetailProcess.java

@@ -76,6 +76,10 @@ public class BizOutsourcedOrderDetailProcess extends BaseEntity
     @ApiModelProperty(value = "产品描述")
     private Long technologicalProcessId;
 
+    /** 工艺id（通过工艺id，获取版本号） */
+    @ApiModelProperty(value = "产品描述")
+    private Long technologicalProcessDetailId;
+
     /** 工艺版本A,B,C */
     @Excel(name = "工艺版本A,B,C")
     @ApiModelProperty(value = "工艺版本A,B,C")

src/main/java/cn/ezhizao/project/business/technologicalProcessDetail/controller/BizTechnologicalProcessDetailController.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.technologicalProcessDetail.controller;
 
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
@@ -10,6 +11,10 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetail;
+import cn.ezhizao.project.business.outsource.domain.BizOutsourcedOrderDetailProcess;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailProcessService;
+import cn.ezhizao.project.business.outsource.service.IBizOutsourcedOrderDetailService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,6 +34,11 @@ public class BizTechnologicalProcessDetailController extends BaseController
     @Resource
     private IBizTechnologicalProcessDetailService bizTechnologicalProcessDetailService;
 
+    @Resource
+    private IBizOutsourcedOrderDetailProcessService bizOutsourcedOrderDetailProcessService;
+
+    @Resource
+    private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
     /**
      * 查询工艺工序中间表列表
      */
@@ -67,6 +77,25 @@ public class BizTechnologicalProcessDetailController extends BaseController
         return success(byId);
     }
 
+    /**
+     * 外协检查查询
+     * 获取工艺工序中间表详细信息
+     */
+    @GetMapping(value = "/infoToInspecion/{id}")
+    public AjaxResult getInfoToInspecion(@PathVariable("id") Long id)
+    {
+        //外协检查查询工序数据
+        //1.传入的参数为外协发出明细id,查询批次发出信息
+        BizOutsourcedOrderDetail orderDetail=bizOutsourcedOrderDetailService.getById(id);
+        //2.根据外协发出明细id查询发出工序信息
+        List<BizOutsourcedOrderDetailProcess> processList=bizOutsourcedOrderDetailProcessService.query().eq("detail_id",id).list();
+        List<Long> technologicalProcessDetailIds=processList.stream().map(BizOutsourcedOrderDetailProcess::getTechnologicalProcessDetailId) // 假设每个元素都有getId()方法
+                .collect(Collectors.toList());
+        //3.根据工序id查询所有工序信息
+        List<BizTechnologicalProcessDetail> technologicalProcessDetails=bizTechnologicalProcessDetailService.query().in("id",technologicalProcessDetailIds).list();
+        orderDetail.setTechnologicalProcessDetailList(technologicalProcessDetails);
+        return success(orderDetail);
+    }
     /**
      * 新增工艺工序中间表
      */