From 1eb432710b7a3a2e820be10b17c0138b377ee1b8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 20 八月 2026 16:50:12 +0800
Subject: [PATCH] 仓储物流-采购退货新增关联采购订单及带入物料功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderService.java | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderService.java
index 58822ef..08c4657 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderService.java
@@ -16,7 +16,7 @@
/**
* MES 鐢熶骇宸ュ崟 Service 鎺ュ彛
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
public interface MesProWorkOrderService {
@@ -75,12 +75,20 @@
PageResult<MesProWorkOrderDO> getWorkOrderPage(MesProWorkOrderPageReqVO pageReqVO);
/**
+ * 鑾峰緱鐢熶骇宸ュ崟鍒嗛〉锛堝甫璋冨害鐘舵�侊級
+ *
+ * @param pageReqVO 鍒嗛〉鏌ヨ
+ * @return 鐢熶骇宸ュ崟鍒嗛〉
+ */
+ PageResult<MesProWorkOrderDO> getWorkOrderSchedulePage(MesProWorkOrderPageReqVO pageReqVO);
+
+ /**
* 鑾峰緱宸ュ崟鍒楄〃
*
* @param ids 缂栧彿鏁扮粍
* @return 宸ュ崟鍒楄〃
*/
- List<MesProWorkOrderDO> getWorkOrderList(Collection<Long> ids);
+ List<MesProWorkOrderDO> getWorkOrderList(java.util.Collection<Long> ids);
/**
* 鑾峰緱宸ュ崟 Map
@@ -122,22 +130,6 @@
void cancelWorkOrder(Long id);
/**
- * 鎻愪氦宸ュ崟瀹℃壒
- *
- * @param id 缂栧彿
- * @param userId 鐢ㄦ埛缂栧彿
- */
- void submitWorkOrder(Long id, Long userId);
-
- /**
- * 鏇存柊宸ュ崟鐨勫鎵圭姸鎬�
- *
- * @param id 缂栧彿
- * @param bpmResult BPM 瀹℃壒缁撴灉
- */
- void updateWorkOrderAuditStatus(Long id, Integer bpmResult);
-
- /**
* 绱姞宸ュ崟鐨勫凡鐢熶骇鏁伴噺
*
* @param id 宸ュ崟缂栧彿
@@ -146,6 +138,30 @@
void updateProducedQuantity(Long id, BigDecimal incrQuantityProduced);
/**
+ * 绱姞宸ュ崟鐨勫凡鎺掍骇鏁伴噺
+ *
+ * @param id 宸ュ崟缂栧彿
+ * @param incrQuantityScheduled 鏈鎺掍骇鏁伴噺澧為噺
+ */
+ void updateScheduledQuantity(Long id, BigDecimal incrQuantityScheduled);
+
+ /**
+ * 鏍￠獙鎺掍骇鏁伴噺涓嶈秴杩囧伐鍗曟暟閲�
+ *
+ * @param id 宸ュ崟缂栧彿
+ * @param scheduleQuantity 鏈鎺掍骇鏁伴噺
+ */
+ void validateScheduleQuantity(Long id, BigDecimal scheduleQuantity);
+
+ /**
+ * 妫�鏌ュ苟鑷姩瀹屾垚宸ュ崟
+ *
+ * @param id 宸ュ崟缂栧彿
+ * @return true=宸茶嚜鍔ㄥ畬鎴�, false=鏈弧瓒虫潯浠�
+ */
+ boolean checkAndAutoFinishWorkOrder(Long id);
+
+ /**
* 鏍规嵁渚涘簲鍟� ID 缁熻宸ュ崟鏁伴噺
*
* @param vendorId 渚涘簲鍟� ID
@@ -153,4 +169,12 @@
*/
Long getWorkOrderCountByVendorId(Long vendorId);
+ /**
+ * 鑾峰緱宸ュ崟杩涘害璇︽儏锛堝惈宸ュ簭杩涘害鍜屼换鍔″垪琛級
+ *
+ * @param id 宸ュ崟缂栧彿
+ * @return 宸ュ崟杩涘害璇︽儏
+ */
+ cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.MesProWorkOrderProgressRespVO getWorkOrderProgress(Long id);
+
}
--
Gitblit v1.9.3