nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java

@@ -26,7 +26,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -1100,7 +1103,7 @@ public class IncomingInspectionTaskControllerService {
                 if (StrUtil.isNotBlank(data.getImageIds())) {
                     dataVO.setImages(
                             fileUploadRecordService.lambdaQuery()
-                                    .in(FileUploadRecord::getId, Arrays.stream(StrUtil.splitToLong(data.getImageIds(), ",")).boxed().toList())
+                                    .in(FileUploadRecord::getId, StrUtil.split(data.getImageIds(), ","))
                                     .list()
                                     .stream()
                                     .map(file -> new FileUploadVO()

nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java

@@ -63,11 +63,6 @@ public class QmsSamplingPlanControllerService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void add(@Valid QmsSamplingPlanAddQO request) {
-        VUtil.trueThrowBusinessError(samplingPlanService.lambdaQuery()
-                .eq(QmsSamplingPlan::getPlanName, request.getPlanName())
-                .exists()
-        ).throwMessage("方案名称已存在");
-
         String operator = UserUtil.getUserName();
         Long operatorId = UserUtil.getUserId();
         LocalDateTime now = LocalDateTime.now();
@@ -152,7 +147,7 @@ public class QmsSamplingPlanControllerService {
                 // 通过AQL优先值获取AQL优先值ID
                 Long aqlPriorityValueId = aqlPriorityValueIdMap.get(qo.getAqlPriorityValue());
                 VUtil.trueThrowBusinessError(aqlPriorityValueId == null).throwMessage("字码矩阵维护中的AQL优先值[" + qo.getAqlPriorityValue() + "]在AQL优先值列表中不存在");
-
+                
                 QmsCodeLetterMatrix entity = new QmsCodeLetterMatrix()
                         .setSamplingPlanId(planId)
                         .setInspectionType(qo.getInspectionType())
@@ -173,7 +168,7 @@ public class QmsSamplingPlanControllerService {
                 // 通过字码内容获取字码ID
                 Long codeLetterId = codeLetterIdMap.get(qo.getCodeLetter());
                 VUtil.trueThrowBusinessError(codeLetterId == null).throwMessage("抽样方案检验中的字码[" + qo.getCodeLetter() + "]在字码列表中不存在");
-
+                
                 QmsSamplingPlanInspection entity = new QmsSamplingPlanInspection()
                         .setSamplingPlanId(planId)
                         .setRangeStart(qo.getRangeStart())
@@ -192,19 +187,13 @@ public class QmsSamplingPlanControllerService {
     @Transactional(rollbackFor = Exception.class)
     public void edit(@Valid QmsSamplingPlanEditQO request) {
         Long planId = request.getId();
-
-        VUtil.trueThrowBusinessError(samplingPlanService.lambdaQuery()
-                .eq(QmsSamplingPlan::getPlanName, request.getPlanName())
-                .ne(QmsSamplingPlan::getId, planId)
-                .exists()
-        ).throwMessage("方案名称已存在");
-
+        
         // 0. 验证抽样方案是否存在
         QmsSamplingPlan existPlan = samplingPlanService.getById(planId);
         VUtil.trueThrowBusinessError(ObjectUtil.isNull(existPlan)).throwMessage("抽样方案不存在");
         // 已发布状态不能编辑
         VUtil.trueThrowBusinessError(existPlan.getPublishStatus() == 1).throwMessage("已发布的抽样方案不能编辑");
-
+        
         String operator = UserUtil.getUserName();
         Long operatorId = UserUtil.getUserId();
         LocalDateTime now = LocalDateTime.now();
@@ -294,7 +283,7 @@ public class QmsSamplingPlanControllerService {
                 // 通过AQL优先值获取AQL优先值ID
                 Long aqlPriorityValueId = aqlPriorityValueIdMap.get(qo.getAqlPriorityValue());
                 VUtil.trueThrowBusinessError(aqlPriorityValueId == null).throwMessage("字码矩阵维护中的AQL优先值[" + qo.getAqlPriorityValue() + "]在AQL优先值列表中不存在");
-
+                
                 QmsCodeLetterMatrix entity = new QmsCodeLetterMatrix()
                         .setSamplingPlanId(planId)
                         .setInspectionType(qo.getInspectionType())
@@ -318,7 +307,7 @@ public class QmsSamplingPlanControllerService {
                 // 通过字码内容获取字码ID
                 Long codeLetterId = codeLetterIdMap.get(qo.getCodeLetter());
                 VUtil.trueThrowBusinessError(codeLetterId == null).throwMessage("抽样方案检验中的字码[" + qo.getCodeLetter() + "]在字码列表中不存在");
-
+                
                 QmsSamplingPlanInspection entity = new QmsSamplingPlanInspection()
                         .setSamplingPlanId(planId)
                         .setRangeStart(qo.getRangeStart())
@@ -374,7 +363,7 @@ public class QmsSamplingPlanControllerService {
         VUtil.trueThrowBusinessError(ObjectUtil.isNull(existPlan)).throwMessage("抽样方案不存在");
         // 已发布状态不能删除
         VUtil.trueThrowBusinessError(existPlan.getPublishStatus() == 1).throwMessage("已发布的抽样方案不能删除");
-
+        
         // 1. 删除关联的子表数据
         aqlPriorityValueService.lambdaUpdate()
                 .eq(QmsAqlPriorityValue::getSamplingPlanId, id)
@@ -391,7 +380,7 @@ public class QmsSamplingPlanControllerService {
         samplingPlanInspectionService.lambdaUpdate()
                 .eq(QmsSamplingPlanInspection::getSamplingPlanId, id)
                 .remove();
-
+        
         // 2. 删除主表数据
         samplingPlanService.removeById(id);
     }
@@ -401,22 +390,21 @@ public class QmsSamplingPlanControllerService {
      */
     public PageData<QmsSamplingPlanVO> search(QmsSamplingPlanSearchQO request) {
         Page<QmsSamplingPlan> page = new Page<>(request.getPage(), request.getPageSize());
-
+        
         var query = samplingPlanService.lambdaQuery()
-                .eq(request.getPublishStatus() != null, QmsSamplingPlan::getPublishStatus, request.getPublishStatus())
-                .ge(request.getStartDate() != null, QmsSamplingPlan::getCreateTime, request.getStartDate())
-                .le(request.getEndDate() != null, QmsSamplingPlan::getCreateTime, request.getEndDate())
                 .like(StrUtil.isNotBlank(request.getPlanCode()), QmsSamplingPlan::getPlanCode, request.getPlanCode())
                 .like(StrUtil.isNotBlank(request.getPlanName()), QmsSamplingPlan::getPlanName, request.getPlanName())
+                .ge(request.getStartDate() != null, QmsSamplingPlan::getCreateTime, request.getStartDate())
+                .le(request.getEndDate() != null, QmsSamplingPlan::getCreateTime, request.getEndDate())
                 .orderByAsc(QmsSamplingPlan::getPublishStatus)
                 .orderByDesc(QmsSamplingPlan::getId);
-
+        
         IPage<QmsSamplingPlan> result = query.page(page);
-
+        
         List<QmsSamplingPlanVO> voList = result.getRecords().stream()
                 .map(plan -> BeanUtil.copyProperties(plan, QmsSamplingPlanVO.class))
                 .collect(Collectors.toList());
-
+        
         PageData<QmsSamplingPlanVO> pageData = new PageData<>();
         pageData.setPage((int) result.getCurrent());
         pageData.setPageSize((int) result.getSize());
@@ -447,9 +435,9 @@ public class QmsSamplingPlanControllerService {
         // 1. 查询主表
         QmsSamplingPlan plan = samplingPlanService.getById(id);
         VUtil.trueThrowBusinessError(ObjectUtil.isNull(plan)).throwMessage("抽样方案不存在");
-
+        
         QmsSamplingPlanDetailVO detail = BeanUtil.copyProperties(plan, QmsSamplingPlanDetailVO.class);
-
+        
         // 2. 查询AQL优先值预定义
         List<QmsAqlPriorityValue> aqlPriorityValues = aqlPriorityValueService.lambdaQuery()
                 .eq(QmsAqlPriorityValue::getSamplingPlanId, id)
@@ -459,7 +447,7 @@ public class QmsSamplingPlanControllerService {
                     .map(v -> BeanUtil.copyProperties(v, QmsSamplingPlanDetailVO.AqlPriorityValueVO.class))
                     .collect(Collectors.toList()));
         }
-
+        
         // 3. 查询抽样严格性转移规则
         List<QmsSamplingStrictnessTransferRule> transferRules = strictnessTransferRuleService.lambdaQuery()
                 .eq(QmsSamplingStrictnessTransferRule::getSamplingPlanId, id)
@@ -469,7 +457,7 @@ public class QmsSamplingPlanControllerService {
                     .map(r -> BeanUtil.copyProperties(r, QmsSamplingPlanDetailVO.StrictnessTransferRuleVO.class))
                     .collect(Collectors.toList()));
         }
-
+        
         // 4. 查询字码
         List<QmsCodeLetter> codeLetters = codeLetterService.lambdaQuery()
                 .eq(QmsCodeLetter::getSamplingPlanId, id)
@@ -481,11 +469,11 @@ public class QmsSamplingPlanControllerService {
                     .map(c -> BeanUtil.copyProperties(c, QmsSamplingPlanDetailVO.CodeLetterVO.class))
                     .collect(Collectors.toList()));
         }
-
+        
         // 5. 查询AQL优先值Map
         Map<Long, java.math.BigDecimal> aqlPriorityValueMap = aqlPriorityValues.stream()
                 .collect(Collectors.toMap(QmsAqlPriorityValue::getId, QmsAqlPriorityValue::getPriorityValue));
-
+        
         // 6. 查询字码矩阵维护
         List<QmsCodeLetterMatrix> codeLetterMatrices = codeLetterMatrixService.lambdaQuery()
                 .eq(QmsCodeLetterMatrix::getSamplingPlanId, id)
@@ -500,7 +488,7 @@ public class QmsSamplingPlanControllerService {
                     })
                     .collect(Collectors.toList()));
         }
-
+        
         // 7. 查询抽样方案检验
         List<QmsSamplingPlanInspection> inspections = samplingPlanInspectionService.lambdaQuery()
                 .eq(QmsSamplingPlanInspection::getSamplingPlanId, id)
@@ -514,7 +502,7 @@ public class QmsSamplingPlanControllerService {
                     })
                     .collect(Collectors.toList()));
         }
-
+        
         return detail;
     }
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO.java

@@ -1,7 +1,6 @@
 package com.nflg.wms.common.pojo.qo;
 
 import com.nflg.wms.common.pojo.vo.FileUploadVO;
-import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -27,6 +26,5 @@ public class QmsIncomingInspectionTaskTodoCheckSubmitItemDataQO {
     /**
      * 图片列表
      */
-    @Valid
     private List<FileUploadVO> images;
 }

nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsSamplingPlanSearchQO.java

@@ -19,9 +19,4 @@ public class QmsSamplingPlanSearchQO extends SearchBaseQO {
      * 方案名称
      */
     private String planName;
-
-    /**
-     * 发布状态：0-未发布，1-已发布，2-已撤回
-     */
-    private Short publishStatus;
 }