From a5c145b5b9afb665d3130bbcf8659ee1a4b15ebf Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 16 五月 2025 13:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 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 c52a435..6590c9e 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,5 +1,6 @@
 package com.aps.core.mapper;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.aps.core.domain.ApsPlatePlan;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -72,4 +73,36 @@
      * @return
      */
     public List<ApsPlatePlan> selectPlateRedundantOrderList(ApsPlatePlan apsPlatePlan);
+
+    List<ApsPlatePlan> selectPlatePlanByPlantMajor(String plant,String professionalAffiliation);
+
+    /**
+     * 鑾峰彇涓�鏉℃湭鍖归厤鐨勫瓙璁″垝
+     * */
+    ApsPlatePlan selectUnMatchPlateSubPlan(String plant,String itemNumber);
+
+    /**
+     * 鏇存柊瀛愯鍒掓湭鍖归厤鏁伴噺
+     * */
+    int updatePlanUnMatchQtyByVersion(ApsPlatePlan plan);
+
+    /**
+     * 鍒濆鍖� 瀛愪欢宸ュ崟鐨� 鏈尮閰嶆暟閲�
+     * */
+    int initUnMatchQty();
+    /**
+     * 鑾峰彇鏈尮閰嶇殑瀛愯鍒�
+     * */
+    List<ApsPlatePlan> selectUnMatchPlateSubPlanList(String plant,String itemNumber);
+
+    /**
+     * 鏇存柊瀛愪欢宸ュ崟鏈尮閰嶆暟閲忓拰鐗堟湰
+     * */
+    int updatePlanUnMatchQtyAndVersion(ApsPlatePlan plan);
+
+    /**
+     * 鏌ヨ閽i噾瀛愬崟鏁版嵁
+     * @return
+     */
+    List<JSONObject> selectApsSubPlatePlan();
 }

--
Gitblit v1.9.3