From c357f8844e03627d0c3bea4bf2058e7c69ff3518 Mon Sep 17 00:00:00 2001 From: hongjli <3117313295@qq.com> Date: 星期三, 14 五月 2025 14:18:36 +0800 Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj --- aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsPlatePlanMapper.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 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..a456135 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; /** * 閽i噾璁″垝绠$悊Mapper鎺ュ彛 @@ -65,15 +65,27 @@ int removeAllPlatePlans(); + /** + * 閽i噾鍐椾綑宸ュ崟鎶ヨ〃 + * @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(); } -- Gitblit v1.9.3