Merge remote-tracking branch 'origin/master'

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/product/controller/BizDayworkController.java

@@ -1283,6 +1283,6 @@ public class BizDayworkController extends BaseController {
             carrierCode = carrierList.stream().collect(Collectors.joining("、"));
             item.setCarrierCode(carrierCode);
         }
-        return success(dayworkItemList);
+        return success(dayworkItemList.stream().sorted(Comparator.comparing(BizDayworkItem::getLotCode)).collect(Collectors.toList()));
     }
 }

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

@@ -565,6 +565,8 @@ public class BizDayworkItemController extends BaseController {
                 item.setDayworkItemId(bizDayworkItem.getId());
                 item.setDayworkId(bizDayworkItem.getDayworkId());
                 item.setLotId(bizDayworkItem.getLotId());
+                item.setDeptId(bizDayworkItem.getDeptId());
+                item.setProcessId(bizDayworkItem.getProcessId());
             }
         }
         // 自动派活

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

@@ -333,6 +333,7 @@ public class BizProcessInspecionController extends BaseController {
         processInspecion.setCarrierId(processInspecion.getLot().getCarrierId());
         processInspecion.setCarrierCode(processInspecion.getLot().getCarrierCode());
         processInspecion.setDayworkId(daywork.getId());
+        processInspecion.setProductDescription(processInspecion.getLot().getProductDescription());
         processInspecion.setProductionPlanId(daywork.getProductionPlanId());
         processInspecion.setDayworkItemId(dayworkItem.getId());
         processInspecion.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
@@ -501,7 +502,8 @@ public class BizProcessInspecionController extends BaseController {
                 reject.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
                 reject.setLotId(processInspecion.getLot().getId());
                 reject.setDayworkItemId(dayworkItem.getId());
-                newRej.setRejectNum(newRej.getRejectNum() + reject.getRejectNum());
+                Long rejectNum = reject.getRejectNum() == null? 0L : reject.getRejectNum();
+                newRej.setRejectNum(newRej.getRejectNum());
                 newRej.setUserId(user == null ? 0L : user.getUserId());
                 newRej.setProcessInspectionId(processInspecion.getId());
                 newRej.setDayworkId(0L);
@@ -603,7 +605,7 @@ public class BizProcessInspecionController extends BaseController {
             return error("未找到该箱号");
         }
         //查询箱号是否废弃
-        BizCarrierReject carrierReject = bizCarrierRejectService.query().eq("carrier_id", carrier.getId()).eq("deleted", 0).one();
+        BizCarrierReject carrierReject = bizCarrierRejectService.query().eq("carrier_id", carrier.getId()).eq("deleted", 0).eq("is_abandoned", 1).last("limit 1").one();
         if (carrierReject != null) {
             return error("该载具已废弃");
         }
@@ -661,11 +663,16 @@ public class BizProcessInspecionController extends BaseController {
         if (detailList.stream().noneMatch(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())))) {
             throw new RuntimeException("该批次不需要外协检查");
         }
-        if (detailList.stream().noneMatch(detail -> detail.getIsAudit().equals(1) && detail.getStatus().equals(1))) {
-            throw new RuntimeException("该批次需要审核通过后才能外协检查");
-        }
+//                        现在先不考虑 审核通过后才能外协检查限制先放到下一迭代 20240625
+//        if (detailList.stream().noneMatch(detail -> detail.getIsAudit().equals(1) && detail.getStatus().equals(1))) {
+//            throw new RuntimeException("该批次需要审核通过后才能外协检查");
+//        }
         detailList = detailList.stream()
-                .filter(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())) && detail.getIsAudit().equals(1) && detail.getStatus().equals(1))
+                .filter(detail -> processCodes.stream().anyMatch(l -> l.trim().equals(detail.getProcessCode())) &&
+                        detail.getIsAudit().equals(1)
+//                        现在先不考虑 审核通过后才能外协检查限制先放到下一迭代 20240625
+//                        && detail.getStatus().equals(1)
+                )
                 .collect(Collectors.toList());
         //如果有多道工序，则根据工序的排序找到最后一条
         if (detailList.size() > 1) {
@@ -880,7 +887,17 @@ public class BizProcessInspecionController extends BaseController {
      */
     @Log(title = "序检主", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
+    @Transactional
     public AjaxResult remove(@PathVariable List<Long> ids) {
+        List<BizProcessInspectionDetail> bizProcessInspectionDetails = processInspectionDetailService.query().in("process_inspection_id", ids).list();
+        List<BizDayworkCarrier> carriers = bizDayworkCarrierService.query().in("process_inspection_id", ids).list();
+        List<BizDayworkItemReject> rejects = bizDayworkItemRejectService.query().in("process_inspection_id", ids).list();
+        List<BizDayworkItemConsult> consults = bizDayworkItemConsultService.query().in("process_inspection_id", ids).list();
+
+        processInspectionDetailService.removeBatchByIds(bizProcessInspectionDetails);
+        bizDayworkItemRejectService.removeBatchByIds(rejects);
+        bizDayworkCarrierService.removeBatchByIds(carriers);
+        bizDayworkItemConsultService.removeBatchByIds(consults);
         return toAjax(bizProcessInspecionService.removeBatchByIds(ids));
     }
 
@@ -896,6 +913,14 @@ public class BizProcessInspecionController extends BaseController {
         if (bizProcessInspecion.getStatus().equals(0) && newCarriers.isEmpty()) {
             return error("该序检未完成，不能解绑载具");
         }
+        List<BizCarrierReject> carrierRejects = bizProcessInspecion.getRejectCarrier();
+        List<BizCarrier> carriers = bizCarrierService.query().in("id", carrierRejects.isEmpty() ?
+                Collections.singletonList(0L) :
+                carrierRejects.stream().map(BizCarrierReject::getCarrierId)
+                        .collect(Collectors.toList())).list();
+        carriers.forEach(l -> l.setIsAbandoned(1));
+        bizCarrierService.updateBatchById(carriers);
+        bizCarrierRejectService.saveBatch(carrierRejects);
         bizDayworkCarriers.forEach(l -> l.setIsChanged(1));
         bizDayworkCarrierService.updateBatchById(bizDayworkCarriers);
         if (newCarriers.isEmpty()) {

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

@@ -161,7 +161,6 @@ public class SortDayworkController extends BaseController {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult finish(@RequestBody BizDayworkItem bizDayworkItem) {
         BizDayworkItem item = bizDayworkItemService.getById(bizDayworkItem.getId());
-
         BizDayworkItemReject delCondition = new BizDayworkItemReject();
         delCondition.setDayworkItemId(item.getId());
         bizDayworkItemRejectService.physicalDelete(delCondition);
@@ -174,6 +173,8 @@ public class SortDayworkController extends BaseController {
             l.setProductionPlanDetailId(item.getProductionPlanDetailId());
             l.setProductionPlanDetailSubDetailId(item.getProductionPlanDetailSubDetailId());
             l.setReason(l.getReason());
+            l.setDeptId(item.getDeptId());
+            l.setProcessId(item.getProcessId());
         });
         boolean result = rejectList.isEmpty() || bizDayworkItemRejectService.saveBatch(rejectList);
         item.setRejectNum(bizDayworkItem.getRejectNum());

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

@@ -3,6 +3,7 @@ package cn.ezhizao.project.business.product.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -38,6 +39,8 @@ public class BizDayworkItemReject extends BaseEntity
     /** 计划单明细id */
     @ApiModelProperty(value = "${comment}")
     private Long productionPlanDetailId;
+    private Long deptId;
+    private Long processId;
 
     /** 子计划id */
     @ApiModelProperty(value = "${comment}")
@@ -82,7 +85,4 @@ public class BizDayworkItemReject extends BaseEntity
     @ApiModelProperty("类型")
     private Integer type;
 
-    @ApiModelProperty("部门id")
-    private Long deptId;
-
 }

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

@@ -5,7 +5,9 @@ import java.util.List;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.framework.web.domain.BaseEntity;
+import cn.ezhizao.project.business.carrierReject.domain.BizCarrierReject;
 import cn.ezhizao.project.system.domain.SysUser;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -168,10 +170,13 @@ public class BizProcessInspecion extends BaseEntity
     private Integer isInspectionCarrierChanged;
 
     @ApiModelProperty("质检箱解绑时间")
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date inspectionCarrierChangedTime;
 
     @TableField(exist = false)
     private List<BizDayworkCarrier> dayworkCarriers;
+    @TableField(exist = false)
+    private List<BizCarrierReject> rejectCarrier;
 
     @ApiModelProperty("外协序检工序")
     private String processNames;

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);
+    }
     /**
      * 新增工艺工序中间表
      */