Merge remote-tracking branch 'origin/master'

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

@@ -1331,6 +1331,9 @@ public class BizDayworkController extends BaseController {
         dayworkItemList = dayworkItemList.stream().filter(CommonUtils.distinctByKey(BizDayworkItem::getId)).collect(Collectors.toList());
         //根据dayworkId，取daywork_carrier查箱号
         List<Long> dayworkIds = dayworkItemList.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList());
+        List<BizDaywork> dayworks = bizDayworkService.query().in("id", dayworkIds.isEmpty() ? Collections.singletonList(0L) : dayworkIds).list();
+        dayworkItemList = dayworkItemList.stream().filter(v -> dayworks.stream().filter(e -> e.getId().equals(v.getDayworkId())).anyMatch(e -> e.getDeptId().equals(v.getDeptId()))).collect(Collectors.toList());
+        dayworkIds = dayworkItemList.stream().map(BizDayworkItem::getDayworkId).collect(Collectors.toList());
         //正常批次列表
         List<BizDaywork> normalDayworkList = new ArrayList<>();
         //z正常批号

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

@@ -506,6 +506,10 @@ public class BizProcessInspecionController extends BaseController {
     @Transactional
     @PostMapping("/saveOutsourcedInspecion")
     public AjaxResult saveOutsourcedInspectionV2(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
+//        // 判断是否已有未确认外协检查
+//        if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
+//            return error("已有未完成外协检查单。");
+//        }
         //根据lot信息保存序检表
         BizDaywork daywork = bizDayworkService.query().eq("lot_code", processInspecion.getLot().getLotCode()).one();
         BizProduct product = bizProductService.getById(processInspecion.getLot().getProductId());

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

@@ -105,14 +105,16 @@ public class SortDayworkController extends BaseController {
         if (bizDayworkItem.getKeywords() != null ) {
             // 如果 keywords 不为空或空字符串，则添加 LIKE 条件
             list = bizProductInspectionInstructionService.query()
-                    .eq("technological_process_id", bizDayworkItem.getTechnologicalProcessId())
+                    .eq("product_id", bizLot.getProductId())
+                    .eq("technology_version", bizLot.getTechnologyVersion())
                     .eq("process_id", bizDayworkItem.getProcessId())
                     .like("standard", bizDayworkItem.getKeywords()) // 添加 LIKE 条件
                     .list();
         } else {
             // 如果 keywords 为空，则不添加 LIKE 条件
             list = bizProductInspectionInstructionService.query()
-                    .eq("technological_process_id", bizDayworkItem.getTechnologicalProcessId())
+                    .eq("product_id", bizLot.getProductId())
+                    .eq("technology_version", bizLot.getTechnologyVersion())
                     .eq("process_id", bizDayworkItem.getProcessId())
                     .list();
         }

src/main/java/cn/ezhizao/project/business/technologicalProcess/domain/BizTechnologicalProcess.java

@@ -77,4 +77,7 @@ public class BizTechnologicalProcess extends BaseEntity
     @Excel(name = "字典键值")
     @TableField(exist = false)
     private Long Value;
+
+    @ApiModelProperty("历史版本")
+    private Integer isHistory;
 }

src/main/resources/mybatis/business/inspection/BizProductInspectionInstructionMapper.xml

@@ -15,9 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             deleted = 0
             <if test="type != null "> AND type = #{type}</if>
             <if test="technologyVersion != null  and technologyVersion != ''"> AND technology_version = #{technologyVersion}</if>
+            <if test="productId != null "> AND product_id = #{productId}</if>
+            <if test="processId != null "> AND process_id = #{processId}</if>
             <if test="standard != null  and standard != ''"> AND standard = #{standard}</if>
             <if test="equipment != null  and equipment != ''"> AND equipment = #{equipment}</if>
-            <if test="technologicalProcessDetailId != null"> AND technological_process_detail_id = #{technologicalProcessDetailId}</if>
+<!--            <if test="technologicalProcessDetailId != null"> AND technological_process_detail_id = #{technologicalProcessDetailId}</if>-->
         </trim>
     </select>