From da8559d4b6abaefabf394d1d2174b3bf4a545a89 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 21 五月 2025 11:10:54 +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/mapper/ApsMaterialProductGroupManagementMapper.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialProductGroupManagementMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialProductGroupManagementMapper.java
index 44a8536..3a71a0f 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialProductGroupManagementMapper.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/ApsMaterialProductGroupManagementMapper.java
@@ -2,8 +2,11 @@
import com.aps.core.domain.ApsMaterialProductGroupManagement;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Select;
+import org.jetbrains.annotations.NotNull;
import java.util.List;
+import java.util.Set;
/**
* 鐗╂枡浜у搧缁勬暟鎹鐞哅apper鎺ュ彛
@@ -62,4 +65,23 @@
public int deleteApsMaterialProductGroupManagementByIds(Long[] ids);
void deleteAll();
+
+
+ @Select("""
+ <script>
+ select distinct factory || '##' || material_code from aps_material_product_group_management
+ where 1 = 0
+ <if test="!facs.isEmpty()">or factory in
+ <foreach collection="facs" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ <if test="!facs.isEmpty()">or material_code in
+ <foreach collection="codes" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+ </script>
+ """)
+ Set<String> selectByFacOrMaterial(@NotNull Set<String> facs, @NotNull Set<String> codes);
}
--
Gitblit v1.9.3