From b9e4e2edbb3767ee347a91d2238544ae736b53c0 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 22 七月 2025 10:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml b/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml
index 7bdf911..1afd6dd 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/BasicWarehouseType.xml
@@ -5,11 +5,43 @@
 <mapper namespace="com.example.erp.mapper.mm.BasicWarehouseTypeMapper">
 
     <select id="getBasicWarehouseTypeTakeOut" >
-        select * from mm.basic_warehouse_type where operate_type='棰嗗嚭';
+        select * from mm.basic_warehouse_type where type='棰嗗嚭';
     </select>
 
     <select id="getBasicWarehouseTypeRework" >
-        select * from mm.basic_warehouse_type where operate_type='杩斿伐';
+        select * from mm.basic_warehouse_type where type='杩斿伐';
+    </select>
+
+    <select id="getBasicWarehouseType" >
+        select * from mm.basic_warehouse_type where type regexp #{type} group by operate_type_name;
+    </select>
+
+    <select id="getBasicWarehouse" >
+        select operate_type from mm.basic_warehouse_type where type regexp #{type};
+    </select>
+
+    <select id="getBasicWarehouseTypeAll" >
+        select * from mm.basic_warehouse_type where type!='鍘熺墖' and type!='杈呮枡'  order by id desc;
+    </select>
+
+    <insert id="insertBasicWarehouse"  useGeneratedKeys="true"  >
+        insert into mm.basic_warehouse_type (operate_type_name, operate_type, type, create_time
+        )
+        values (
+                   #{operateTypeName} ,#{operateType},#{type},now()
+               )
+    </insert>
+
+    <delete id="deleteBasicWarehouse"  >
+        delete from mm.basic_warehouse_type where id=#{id}
+    </delete>
+
+    <update id="updateBasicWarehouse"  >
+        update mm.basic_warehouse_type set operate_type_name=#{operateTypeName},create_time=now() where id=#{id}
+    </update>
+
+    <select id="getBasicWarehouseUser" >
+        select user_name from erp_user_info.user u where u.address regexp #{type};
     </select>
 
 

--
Gitblit v1.8.0