11.13

src/main/java/cn/ezhizao/project/business/product/domain/BizProcessInspecion.java

@@ -240,6 +240,10 @@ public class BizProcessInspecion extends BaseEntity
     private BizDayworkItem dayworkItem;
     @TableField(exist = false)
     private Integer isMaster;
+    @TableField(exist = false)
+    private Integer isWasteRecycling;
+    @TableField(exist = false)
+    private Integer isAmend;
 
     public BizProcessInspecion() {
     }

src/main/java/cn/ezhizao/project/business/technologicalProcess/controller/BizTechnologicalProcessController.java

@@ -10,6 +10,8 @@ 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.product.domain.BizLotTechnologicalProcess;
+import cn.ezhizao.project.business.product.service.IBizLotTechnologicalProcessService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +37,8 @@ public class BizTechnologicalProcessController extends BaseController
 {
     @Resource
     private IBizTechnologicalProcessService bizTechnologicalProcessService;
+    @Resource
+    private IBizLotTechnologicalProcessService bizLotTechnologicalProcessService;
 
     /**
      * 查询工艺主表列表
@@ -71,6 +75,11 @@ public class BizTechnologicalProcessController extends BaseController
     {
         return success(bizTechnologicalProcessService.getById(id));
     }
+    @GetMapping("/getLotTechnologicalProcess")
+    public AjaxResult getLotTechnologicalProcess(BizLotTechnologicalProcess bizTechnologicalProcess)
+    {
+        return success(bizLotTechnologicalProcessService.getById(bizTechnologicalProcess));
+    }
 
     /**
      * 新增工艺主表

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

@@ -1,5 +1,6 @@
 package cn.ezhizao.project.business.technologicalProcessDetail.controller;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -15,6 +16,10 @@ 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.product.domain.BizDaywork;
+import cn.ezhizao.project.business.product.domain.BizLotTechnologicalProcessDetail;
+import cn.ezhizao.project.business.product.service.IBizDayworkService;
+import cn.ezhizao.project.business.product.service.IBizLotTechnologicalProcessDetailService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -39,6 +44,10 @@ public class BizTechnologicalProcessDetailController extends BaseController
 
     @Resource
     private IBizOutsourcedOrderDetailService bizOutsourcedOrderDetailService;
+    @Resource
+    private IBizDayworkService bizDayworkService;
+    @Resource
+    private IBizLotTechnologicalProcessDetailService bizLotTechnologicalProcessDetailService;
     /**
      * 查询工艺工序中间表列表
      */
@@ -87,13 +96,27 @@ public class BizTechnologicalProcessDetailController extends BaseController
         //外协检查查询工序数据
         //1.传入的参数为外协发出明细id,查询批次发出信息
         BizOutsourcedOrderDetail orderDetail=bizOutsourcedOrderDetailService.getById(id);
+        BizDaywork daywork = bizDayworkService.query().eq("id", orderDetail.getDayworkId()).one();
         //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);
+        if(daywork.getIsAmend() == 1 || daywork.getIsWasteRecycling() == 1) {
+            List<BizLotTechnologicalProcessDetail> lotTechnologicalProcessDetailList = bizLotTechnologicalProcessDetailService.query().in("id", technologicalProcessDetailIds).list();
+            List<BizTechnologicalProcessDetail> newList = new ArrayList<>();
+            lotTechnologicalProcessDetailList.forEach(v->{
+                BizTechnologicalProcessDetail techTechnologicalProcessDetail = new BizTechnologicalProcessDetail();
+                techTechnologicalProcessDetail.setProcessAlias(v.getProcessAlias());
+                techTechnologicalProcessDetail.setProcessCode(v.getProcessCode());
+                newList.add(techTechnologicalProcessDetail);
+            });
+            orderDetail.setTechnologicalProcessDetailList(newList);
+        }else {
+            List<BizTechnologicalProcessDetail> technologicalProcessDetails = bizTechnologicalProcessDetailService.query().in("id", technologicalProcessDetailIds).list();
+            orderDetail.setTechnologicalProcessDetailList(technologicalProcessDetails);
+        }
+
         return success(orderDetail);
     }
     /**

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/controller/BizTechnologicalProcessDetailDrawingController.java

@@ -9,6 +9,8 @@ import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
 import cn.ezhizao.project.business.deptProcess.domain.BizDeptProcess;
 import cn.ezhizao.project.business.deptProcess.service.IBizDeptProcessService;
+import cn.ezhizao.project.business.product.domain.BizLotTechnologicalProcessDetail;
+import cn.ezhizao.project.business.product.service.IBizLotTechnologicalProcessDetailService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawing.domain.BizTechnologicalProcessDetailDrawing;
@@ -44,6 +46,8 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     private IBizDeptProcessService bizDeptProcessService;
     @Resource
     private IBizTechnologicalProcessDetailService iBizTechnologicalProcessDetailService;
+    @Resource
+    private IBizLotTechnologicalProcessDetailService bizLotTechnologicalProcessDetailService;
 
     /**
      * 查询电子图纸列表
@@ -69,6 +73,18 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
 
         return success(technologicalProcessDetails.stream().filter(v -> bizDeptProcesses.stream().anyMatch(t -> t.getProcessId().equals(v.getProcessId()))).collect(Collectors.toList()));
     }
+    @GetMapping("/listLotProcess")
+    public AjaxResult listLotProcess(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
+    {
+//        setTenantId(bizTechnologicalProcessDetailDrawing);
+//        startPage();
+        List<BizDeptProcess> bizDeptProcesses = bizDeptProcessService.query().eq("dept_id", bizTechnologicalProcessDetailDrawing.getDeptId()).list();
+        List<BizLotTechnologicalProcessDetail> technologicalProcessDetails = bizLotTechnologicalProcessDetailService.query().eq("product_id", bizTechnologicalProcessDetailDrawing.getProductId()).eq("technology_version", bizTechnologicalProcessDetailDrawing.getProductVersion()).eq("lot_technological_process_id", bizTechnologicalProcessDetailDrawing.getTechnologicalProcessId()).list();
+//        bizTechnologicalProcessDetailDrawing.setProcessCodes(bizDeptProcesses.stream().map(BizDeptProcess::getProcessCode).collect(Collectors.toList()));
+//        List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
+
+        return success(technologicalProcessDetails.stream().filter(v -> bizDeptProcesses.stream().anyMatch(t -> t.getProcessId().equals(v.getProcessId()))).distinct().collect(Collectors.toList()));
+    }
     /**
      * 查询电子图纸列表
      */

src/main/resources/mybatis/business/product/BizProcessInspecionMapper.xml

@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by t1.is_inspection_carrier_changed, ( case when t1.status = 0 then 3 else t1.status end) desc, t1.create_time asc
     </select>
     <select id="getInfoByIds" resultMap="BizProcessInspecionResult">
-        select t1.*,t3.id as process_id,t3.process_code as processCodeLabel,t3.process_alias,t4.technology_version,t5.drawing_number from biz_process_inspecion t1
+        select t1.*,t3.id as process_id,t4.is_waste_recycling,t4.is_amend,t3.process_code as processCodeLabel,t3.process_alias,t4.technology_version,t5.drawing_number from biz_process_inspecion t1
         left join biz_daywork_item t2 on t1.daywork_item_id = t2.id
         left join biz_process t3 on t2.process_id = t3.id
         left join biz_lot t4 on t1.lot_id = t4.id