From bb0b80bd7ca7c1f979ab0125ae01f3faa1d14f4b Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:37:57 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_business' into fix/hsy/20260811
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceService.java
index 76188cf..fe17810 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceService.java
@@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.mes.service.wm.productproduce;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.feedback.vo.MesProFeedbackApproveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO;
@@ -30,9 +31,11 @@
*
* @param feedback 鎶ュ伐璁板綍
* @param checkFlag 鏄惁闇�瑕佹楠岋紙true=寰呮楠岋紝false=鎸夊悎鏍�/涓嶅悎鏍兼媶鍒嗚锛�
+ * @param approveReqVO 瀹℃壒璇锋眰锛堝惈鍙�夋壒娆″睘鎬э紝鍙负 null锛�
* @return 鐢熸垚鐨勪骇鍝佷骇鍑哄崟
*/
- MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag);
+ MesWmProductProduceDO generateProductProduce(MesProFeedbackDO feedback, boolean checkFlag,
+ MesProFeedbackApproveReqVO approveReqVO);
/**
* IPQC 妫�楠屽畬鎴愬洖璋冿細灏嗗緟妫�浜у嚭鎷嗗垎涓哄悎鏍�/涓嶅悎鏍艰銆佺敓鎴愭槑缁嗐�佸畬鎴愬叆搴�
--
Gitblit v1.9.3