From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/ProductOrderService.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/ProductOrderService.java b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
index 5a714a6..1a2edcf 100644
--- a/src/main/java/com/ruoyi/production/service/ProductOrderService.java
+++ b/src/main/java/com/ruoyi/production/service/ProductOrderService.java
@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.production.dto.ProductBomDto;
import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.dto.ProductOrderSourceDto;
import com.ruoyi.production.dto.ProductStructureDto;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProductOrder;
@@ -14,9 +14,14 @@
public interface ProductOrderService extends IService<ProductOrder> {
- IPage<ProductOrderDto> pageProductOrder(Page page, ProductOrderDto productOrder);
+ IPage<ProductOrderDto> pageProductOrder(Page<ProductOrder> page, ProductOrderDto productOrder);
int bindingRoute(ProductOrder productOrder);
+
+ /**
+ * 鎾ゅ洖鐢熶骇璁″垝
+ */
+ Boolean revoke(List<Long> ids);
List<ProcessRoute> listProcessRoute(Long productModelId);
@@ -24,5 +29,9 @@
Boolean addProductOrder(ProductOrder productOrder);
- Boolean delete(Long[] id);
+ Long insertProductOrder(ProductOrder productOrder);
+
+ Boolean delete(Long id);
+
+ List<ProductOrderSourceDto> productOrderSource(Long orderId);
}
--
Gitblit v1.9.3