From fb747de6c40e2aa92d0dd81cca8b9fbc848aeff7 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期三, 19 八月 2026 12:39:59 +0800
Subject: [PATCH] Merge branch 'dev_business' into fix/hsy/20260811
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java
index 1aacd6e..b32b8b8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeLineServiceImpl.java
@@ -2,11 +2,10 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLinePageReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeDO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemconsume.vo.MesWmItemConsumeLineRespVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemconsume.MesWmItemConsumeLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.itemconsume.MesWmItemConsumeLineMapper;
import jakarta.annotation.Resource;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -15,7 +14,7 @@
/**
* MES 鐗╂枡娑堣�楄褰曡 Service 瀹炵幇绫�
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@Service
@Validated
@@ -24,24 +23,14 @@
@Resource
private MesWmItemConsumeLineMapper itemConsumeLineMapper;
- @Resource
- @Lazy
- private MesWmItemConsumeService itemConsumeService;
-
@Override
public void createItemConsumeLineBatch(List<MesWmItemConsumeLineDO> lines) {
itemConsumeLineMapper.insertBatch(lines);
}
@Override
- public PageResult<MesWmItemConsumeLineDO> getItemConsumeLinePage(MesWmItemConsumeLinePageReqVO pageReqVO) {
- // 1. 鍏堥�氳繃 feedbackId 鎵惧埌娑堣�楀ご锛堥�氳繃 Service 璋冪敤锛屼笉鐩存帴娉ㄥ叆 Mapper锛�
- MesWmItemConsumeDO consume = itemConsumeService.getByFeedbackId(pageReqVO.getFeedbackId());
- if (consume == null) {
- return PageResult.empty();
- }
- // 2. 鍒嗛〉鏌ヨ娑堣�楄
- return itemConsumeLineMapper.selectPage(pageReqVO, consume.getId());
+ public PageResult<MesWmItemConsumeLineRespVO> getItemConsumeLinePage(MesWmItemConsumeLinePageReqVO pageReqVO) {
+ return itemConsumeLineMapper.selectPageByFeedbackId(pageReqVO);
}
@Override
--
Gitblit v1.9.3