Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -240,7 +240,7 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
             reject.setLotId(bizDayworkAuxiliaryItem.getLotId());
             rejects.add(reject);
         });
-        Integer rejectNum = bizDayworkAuxiliaryItem.getRejectList().stream().mapToInt(BizDayworkAuxiliaryItemReject::getRejectNum).sum();
+        Integer rejectNum = bizDayworkAuxiliaryItem.getRejectList().stream().mapToInt(t -> t.getRejectNum() == null ? 0 : t.getRejectNum()).sum();
         // 修改报工表的合格数量
         BizDaywork bizDaywork = bizDayworkService.getById(bizDayworkAuxiliaryItem.getDayworkId());
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").list();

src/main/java/cn/ezhizao/project/business/product/controller/SortDayworkController.java

@@ -63,15 +63,31 @@ public class SortDayworkController extends BaseController {
     private IBizDayworkItemConsultPictureService bizDayworkItemConsultPictureService;
     // 修改报工状态为开始
     @PostMapping("/start")
+    @Transactional
     public AjaxResult start(@RequestBody BizDaywork bizDaywork) {
         // 获取最新报工
         List<BizDayworkItem> items = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").lt("status", "4").list();
+        BizDaywork currentDaywork = bizDayworkService.getById(bizDaywork.getId());
         BizDayworkItem item = items.get(0);
         if (item.getStatus().equals("0")) {
             item.setStatus("1");
             item.setStartTime(new Date());
             item.setIsSort(1);
             bizDayworkItemService.updateById(item);
+            // 判断是否是最后一道序，假设是最后一道序则申请打印合格证
+            if(currentDaywork.getIsAmend().equals(1) || currentDaywork.getIsWasteRecycling().equals(1)) {
+                List<BizLotTechnologicalProcessDetail> bizLotTechnologicalProcessDetails = bizLotTechnologicalProcessDetailService.query().eq("lot_technological_process_id", item.getTechnologicalProcessId()).ne("tenant_id", 9).orderByDesc("process_step_number").list();
+                if (bizLotTechnologicalProcessDetails.get(0).getProcessId().equals(item.getProcessId())) {
+                    currentDaywork.setIsCertificate(1);
+                    bizDayworkService.updateById(currentDaywork);
+                }
+            } else {
+                List<BizTechnologicalProcessDetail> bizTechnologicalProcessDetails = bizTechnologicalProcessDetailService.query().eq("technological_process_id", item.getTechnologicalProcessId()).ne("tenant_id", 9).orderByDesc("process_step_number").list();
+                if (bizTechnologicalProcessDetails.get(0).getProcessId().equals(item.getProcessId())) {
+                    currentDaywork.setIsCertificate(1);
+                    bizDayworkService.updateById(currentDaywork);
+                }
+            }
         }
         BizDayworkItem conditions = new BizDayworkItem();
         conditions.setId(item.getId());

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

@@ -138,6 +138,8 @@ public class BizDaywork extends BaseEntity
 
     private Integer isLast;
 
+    private Integer isCertificate;
+
     /** 单批量 */
     @TableField(exist = false)
     private Integer oneLotQuantity;

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

@@ -109,7 +109,7 @@ public class BizDayworkItemReject extends BaseEntity
         this.dayworkId = l.getDayworkId();
         this.dayworkItemId = l.getDayworkItemId();
         this.reason = "5";
-        this.rejectNum = Long.valueOf(l.getRejectNum());
+        this.rejectNum = l.getRejectNum() != null ? Long.valueOf(l.getRejectNum()) : 0L;
         this.dayworkAuxiliaryItemId = l.getDayworkAuxiliaryItemId();
         this.dayworkAuxiliaryItemRejectId = l.getId();
     }

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

@@ -7,6 +7,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.deptProcess.domain.BizDeptProcess;
+import cn.ezhizao.project.business.deptProcess.service.IBizDeptProcessService;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawing.domain.BizTechnologicalProcessDetailDrawing;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawing.service.IBizTechnologicalProcessDetailDrawingService;
 import cn.ezhizao.project.business.technologicalProcessDetailDrawingRecords.domain.BizTechnologicalProcessDetailDrawingRecords;
@@ -20,6 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 电子图纸Controller
@@ -35,6 +38,8 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
     private IBizTechnologicalProcessDetailDrawingService bizTechnologicalProcessDetailDrawingService;
     @Resource
     private IBizTechnologicalProcessDetailDrawingRecordsService bizTechnologicalProcessDetailDrawingRecordsService;
+    @Resource
+    private IBizDeptProcessService bizDeptProcessService;
 
     /**
      * 查询电子图纸列表
@@ -48,7 +53,16 @@ public class BizTechnologicalProcessDetailDrawingController extends BaseControll
         List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
         return success(list);
     }
-
+//    @GetMapping("/list")
+    public AjaxResult listNew(BizTechnologicalProcessDetailDrawing bizTechnologicalProcessDetailDrawing) throws NoSuchFieldException, IllegalAccessException
+    {
+//        setTenantId(bizTechnologicalProcessDetailDrawing);
+//        startPage();
+        List<BizDeptProcess> bizDeptProcesses = bizDeptProcessService.query().eq("dept_id", bizTechnologicalProcessDetailDrawing.getDeptId()).list();
+        bizTechnologicalProcessDetailDrawing.setProcessCodes(bizDeptProcesses.stream().map(BizDeptProcess::getProcessCode).collect(Collectors.toList()));
+        List<BizTechnologicalProcessDetailDrawing> list = bizTechnologicalProcessDetailDrawingService.getList(bizTechnologicalProcessDetailDrawing);
+        return success(list);
+    }
     /**
      * 查询电子图纸列表
      */

src/main/java/cn/ezhizao/project/business/technologicalProcessDetailDrawing/domain/BizTechnologicalProcessDetailDrawing.java

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringExclude;
 
+import java.util.List;
+
 
 /**
  * 电子图纸对象 biz_technological_process_detail_drawing
@@ -108,4 +110,9 @@ public class BizTechnologicalProcessDetailDrawing extends BaseEntity
     @ApiModelProperty(value = "工艺版本编码")
     private String productVersion;
 
+    @TableField(exist = false)
+    private List<String> processCodes;
+    @TableField(exist = false)
+    private Long deptId;
+
 }

src/main/resources/mybatis/business/technologicalProcessDetailDrawing/BizTechnologicalProcessDetailDrawingMapper.xml

@@ -31,6 +31,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productId != null">and product_id = #{productId} </if>
             <if test="productVersion != null and productVersion !=''">AND product_version = #{productVersion}</if>
             <if test="processCode != null and processCode != ''">AND process_code = #{processCode}</if>
+            <if test="processCodes != null and processCodes.size > 0">
+                <foreach collection="processCodes" item="item" open="AND process_code IN (" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
             <if test="drawingName != null  and drawingName != ''"> AND drawing_name = #{drawingName}</if>
             <if test="technologicalProcessId !=null and technologicalProcessId !=''">AND technological_process_detail_id IN (select id from biz_technological_process_detail where deleted = 0  AND technological_process_id = #{technologicalProcessId})</if>
         </trim>