From f16ec51787ed0cb094b71ff8146c740d944f729d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 11:40:54 +0800
Subject: [PATCH] Merge branch 'dev_platePlanv2' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
index 5f1df59..ded9061 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java
@@ -1,8 +1,8 @@
package com.aps.core.mapper;
-import java.util.List;
-import com.aps.core.domain.ApsPlatePlan;
+import com.aps.core.domain.ApsPlatePlan;
import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
/**
* 閽ｉ噾璁″垝绠＄悊Mapper鎺ュ彛
@@ -65,15 +65,36 @@
int removeAllPlatePlans();
+ /**
+ * 閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃
+ * @param apsPlatePlan
+ * @return
+ */
+ public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan);
+
List<ApsPlatePlan> selectPlatePlanByPlantMajor(String plant,String professionalAffiliation);
/**
- * 鑾峰彇鏈尮閰嶇殑瀛愯鍒�
+ * 鑾峰彇涓�鏉℃湭鍖归厤鐨勫瓙璁″垝
* */
- ApsPlatePlan selectUnMatchPlateSubPlan(String plant);
+ ApsPlatePlan selectUnMatchPlateSubPlan(String plant,String itemNumber);
/**
* 鏇存柊瀛愯鍒掓湭鍖归厤鏁伴噺
* */
int updatePlanUnMatchQtyByVersion(ApsPlatePlan plan);
+
+ /**
+ * 鍒濆鍖� 瀛愪欢宸ュ崟鐨� 鏈尮閰嶆暟閲�
+ * */
+ int initUnMatchQty();
+ /**
+ * 鑾峰彇鏈尮閰嶇殑瀛愯鍒�
+ * */
+ List<ApsPlatePlan> selectUnMatchPlateSubPlanList(String plant,String itemNumber);
+
+ /**
+ * 鏇存柊瀛愪欢宸ュ崟鏈尮閰嶆暟閲忓拰鐗堟湰
+ * */
+ int updatePlanUnMatchQtyAndVersion(ApsPlatePlan plan);
}
--
Gitblit v1.9.3