From 09e7523d24ac947d88d59ac54a25278c2283e5c2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 七月 2026 15:49:24 +0800
Subject: [PATCH] 待检验条件修改 现在不需要根据是否为关键工序进行判断了
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java
index edeb614..13df255 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/itemconsume/MesWmItemConsumeLineController.java
@@ -2,14 +2,8 @@
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.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeLineService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,11 +15,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Map;
-
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
@Tag(name = "绠＄悊鍚庡彴 - MES 鐗╂枡娑堣�楄褰曡")
@RestController
@@ -35,32 +25,15 @@
@Resource
private MesWmItemConsumeLineService itemConsumeLineService;
- @Resource
- private MesMdItemService itemService;
- @Resource
- private MesMdUnitMeasureService unitMeasureService;
@GetMapping("/page")
@Operation(summary = "鏍规嵁鎶ュ伐缂栧彿鍒嗛〉鑾峰彇娑堣�楄鍒楄〃")
@PreAuthorize("@ss.hasPermission('mes:pro-feedback:query')")
public CommonResult<PageResult<MesWmItemConsumeLineRespVO>> getItemConsumeLinePage(
@Valid MesWmItemConsumeLinePageReqVO pageReqVO) {
- // 1. 鍒嗛〉鏌ヨ娑堣�楄
- PageResult<MesWmItemConsumeLineDO> pageResult =
+ PageResult<MesWmItemConsumeLineRespVO> pageResult =
itemConsumeLineService.getItemConsumeLinePage(pageReqVO);
- PageResult<MesWmItemConsumeLineRespVO> voPage = BeanUtils.toBean(pageResult, MesWmItemConsumeLineRespVO.class);
- // 2. 鎷兼帴鐗╂枡淇℃伅
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
- convertSet(pageResult.getList(), MesWmItemConsumeLineDO::getItemId));
- Map<Long, MesMdUnitMeasureDO> unitMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
- for (MesWmItemConsumeLineRespVO vo : voPage.getList()) {
- findAndThen(itemMap, vo.getItemId(), item -> {
- vo.setItemCode(item.getCode()).setItemName(item.getName()).setSpecification(item.getSpecification());
- findAndThen(unitMap, item.getUnitMeasureId(), unit -> vo.setUnitName(unit.getName()));
- });
- }
- return success(voPage);
+ return success(pageResult);
}
}
--
Gitblit v1.9.3