From 540d610561e2047bba5b799fdf6acae4823025c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 20 Apr 2026 10:04:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(samplingPlan):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8A=BD=E6=A0=B7=E6=96=B9=E6=A1=88AQL=E4=BC=98=E5=85=88?= =?UTF-8?q?=E5=80=BC=E9=A2=84=E5=AE=9A=E4=B9=89=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在QmsSamplingPlanController中新增aql-priority-values接口用于获取AQL优先值列表 - 在QmsSamplingPlanControllerService中新增listAqlPriorityValues方法通过抽样方案ID获取AQL优先值数据 - 对抽样方案不存在情况进行了异常处理校验 - 实现实体类字段复制并返回前端展示用VO对象列表 --- .../controller/QmsSamplingPlanController.java | 11 +++++++++++ .../QmsSamplingPlanControllerService.java | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSamplingPlanController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSamplingPlanController.java index ed1efc15..580eae59 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSamplingPlanController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsSamplingPlanController.java @@ -9,6 +9,7 @@ import com.nflg.wms.common.pojo.qo.QmsSamplingPlanAddQO; import com.nflg.wms.common.pojo.qo.QmsSamplingPlanEditQO; import com.nflg.wms.common.pojo.qo.QmsSamplingPlanSearchQO; import com.nflg.wms.common.pojo.vo.QmsSamplingPlanDetailVO; +import com.nflg.wms.common.pojo.vo.QmsSamplingPlanDetailVO.AqlPriorityValueVO; import com.nflg.wms.common.pojo.vo.QmsSamplingPlanVO; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; @@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 抽样方案 */ @@ -79,4 +82,12 @@ public class QmsSamplingPlanController extends BaseController { public ApiResult detail(@Valid @RequestBody FilterIdQO request) { return ApiResult.success(samplingPlanControllerService.getDetail(request.getId())); } + + /** + * 获取抽样方案AQL优先值预定义列表 + */ + @PostMapping("aql-priority-values") + public ApiResult> listAqlPriorityValues(@Valid @RequestBody FilterIdQO request) { + return ApiResult.success(samplingPlanControllerService.listAqlPriorityValues(request.getId())); + } } diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java index d42cd774..d88e2374 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsSamplingPlanControllerService.java @@ -12,6 +12,7 @@ import com.nflg.wms.common.pojo.qo.QmsSamplingPlanAddQO; import com.nflg.wms.common.pojo.qo.QmsSamplingPlanEditQO; import com.nflg.wms.common.pojo.qo.QmsSamplingPlanSearchQO; import com.nflg.wms.common.pojo.vo.QmsSamplingPlanDetailVO; +import com.nflg.wms.common.pojo.vo.QmsSamplingPlanDetailVO.AqlPriorityValueVO; import com.nflg.wms.common.pojo.vo.QmsSamplingPlanVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; @@ -411,6 +412,21 @@ public class QmsSamplingPlanControllerService { return pageData; } + /** + * 通过抽样方案ID查询AQL优先值预定义列表 + */ + public List listAqlPriorityValues(Long samplingPlanId) { + QmsSamplingPlan plan = samplingPlanService.getById(samplingPlanId); + VUtil.trueThrowBusinessError(ObjectUtil.isNull(plan)).throwMessage("抽样方案不存在"); + + List list = aqlPriorityValueService.lambdaQuery() + .eq(QmsAqlPriorityValue::getSamplingPlanId, samplingPlanId) + .list(); + return list.stream() + .map(v -> BeanUtil.copyProperties(v, AqlPriorityValueVO.class)) + .collect(Collectors.toList()); + } + /** * 获取抽样方案详情 */