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()); + } + /** * 获取抽样方案详情 */