From 088a46dc697ef5b719f1ab62c9988f96a21e5e0c Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 11:17:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java
index 70f6532..b7c74f7 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java
@@ -1,7 +1,9 @@
package com.aps.core.service;
+import com.aps.core.domain.ApsPlatePlan;
+import com.aps.core.domain.ApsPlatePlanTemp;
+
import java.util.List;
-import com.aps.core.domain.ApsPlatePlan;
/**
* 閽ｉ噾璁″垝绠＄悊Service鎺ュ彛
@@ -58,4 +60,23 @@
* @return 缁撴灉
*/
public int deleteApsPlatePlanById(String id);
+ /***
+ * 纭璁″垝涓婁紶
+ * */
+ public int confirmPlan(ApsPlatePlanTemp tempPlan);
+
+ /**
+ * 瀵煎叆璁″垝鏁版嵁鍒颁复鏃惰〃
+ * @param tempList
+ * @return
+ * @throws Exception
+ */
+ String importData(List<ApsPlatePlanTemp> tempList) throws Exception;
+
+ /**
+ * 閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃
+ * @param apsPlatePlan
+ * @return
+ */
+ public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan);
}
--
Gitblit v1.9.3