From 6ea7f096e3f2e09b61974f8d6a259c94fd9e13eb Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期四, 15 五月 2025 13:44:21 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev --- aps-modules/aps-core/src/main/java/com/aps/core/service/IApsPlatePlanService.java | 5 ++++- 1 files changed, 4 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 bae0205..a923079 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 @@ -4,6 +4,7 @@ import com.aps.core.domain.ApsPlatePlanTemp; import com.aps.core.domain.ApsPlateStandardRequire; +import java.util.Hashtable; import java.util.List; /** @@ -81,5 +82,7 @@ */ public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan); - // ApsPlatePlan selectUnMatchPlateSubPlan(ApsPlateStandardRequire require); + ApsPlatePlan selectUnMatchPlateSubPlan(String plant, String itemNumber, Hashtable<String, List<ApsPlatePlan>> subPlans); + + // ApsPlatePlan selectUnMatchPlateSubPlan(ApsPlateStandardRequire require); } -- Gitblit v1.9.3