From c6eb0d852595f235b21520dab1d8600ed1b80776 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 04 九月 2026 14:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java | 43 +++++++++++++++++++++++++++++++++++++------
1 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java
index 25289d2..cdd5397 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/template/MesQcTemplateItemController.java
@@ -1,17 +1,21 @@
package cn.iocoder.yudao.module.mes.controller.admin.qc.template;
+import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item.MesQcTemplateItemOptionRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item.MesQcTemplateItemPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item.MesQcTemplateItemRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.template.vo.item.MesQcTemplateItemSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.mdm.MesMdmItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
+import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,7 +42,9 @@
@Resource
private MesQcTemplateItemService templateItemService;
@Resource
- private MesMdItemService mdItemService;
+ private MesQcTemplateService templateService;
+ @Resource
+ private MesMdmItemService mdmItemService;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@@ -84,18 +90,43 @@
return success(new PageResult<>(buildItemRespVOList(pageResult.getList()), pageResult.getTotal()));
}
+ @GetMapping("/list-by-item-and-type")
+ @Operation(summary = "鏍规嵁鐗╂枡鎴栧伐鍗�/浠诲姟鍜屾娴嬬绫昏幏鍙栧彲鐢ㄨ川妫�鏂规")
+ @PreAuthorize("@ss.hasPermission('mes:qc-template:query')")
+ public CommonResult<List<MesQcTemplateItemOptionRespVO>> getTemplateItemOptionList(
+ @RequestParam(value = "qcType", required = false) Integer qcType,
+ @RequestParam(value = "itemId", required = false) Long itemId,
+ @RequestParam(value = "workOrderId", required = false) Long workOrderId,
+ @RequestParam(value = "taskId", required = false) Long taskId) {
+ List<MesQcTemplateItemDO> list = templateItemService.getTemplateItemList(
+ itemId, qcType, workOrderId, taskId);
+ if (CollUtil.isEmpty(list)) {
+ return success(Collections.emptyList());
+ }
+ Map<Long, MesQcTemplateDO> templateMap = templateService.getTemplateMap(
+ convertSet(list, MesQcTemplateItemDO::getTemplateId));
+ List<MesQcTemplateItemOptionRespVO> result = BeanUtils.toBean(list,
+ MesQcTemplateItemOptionRespVO.class, vo -> {
+ MesQcTemplateDO template = templateMap.get(vo.getTemplateId());
+ if (template != null) {
+ vo.setTemplateCode(template.getCode()).setTemplateName(template.getName());
+ }
+ });
+ return success(result);
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesQcTemplateItemRespVO> buildItemRespVOList(List<MesQcTemplateItemDO> list) {
if (list.isEmpty()) {
return Collections.emptyList();
}
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = mdItemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛坕temId 瀛樼殑鏄� mdm_item_id锛屽叧鑱� mdm_item 琛級
+ Map<Long, MesMdmItemDO> itemMap = mdmItemService.getItemMap(
convertSet(list, MesQcTemplateItemDO::getItemId));
// 鎵归噺鏌ヨ璁￠噺鍗曚綅
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MesMdmItemDO::getUnitMeasureId));
// 鎷艰 VO
return BeanUtils.toBean(list, MesQcTemplateItemRespVO.class, vo -> {
findAndThen(itemMap, vo.getItemId(), item -> {
--
Gitblit v1.9.3