From 6c17e1f3da486ffd16b7237d9bc35a9bcbef5348 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 29 三月 2024 16:35:41 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml | 66 +++++++++++++++++++++++++--------
1 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml b/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
index 55fb770..6ba8965 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/BasicDataProduce.xml
@@ -13,25 +13,12 @@
<result column="d_basic_type" property="basicData.basicType"/>
<result column="d_basic_name" property="basicData.basicName"/>
<result column="d_basic_category" property="basicData.basicCategory"/>
-
+ <association property="basicData" javaType="com.example.erp.entity.sd.BasicData">
+ <result column="basic_name" property="basicName"/>
+ </association>
</resultMap>
- <select id="SelectWorkBasicDeviceMp">
- select
- *
- from
- basic_data_produce as a
- where a.basic_category=#{process} and a.basic_type='璁惧'
- </select>
-
- <select id="SelectWorkBasicTeamsMp">
- select
- *
- from
- basic_data_produce as a
- where a.basic_category=#{process} and a.basic_type='鐝粍'
- </select>
<select id="SelectWorkBasicTeams" resultMap="selectBasicDataProduce">
select bdp.basic_name ,bd.basic_name as d_basic_name
@@ -40,4 +27,51 @@
where bd.basic_name = #{process}
and bdp.basic_type = "teamsgroups"
</select>
+
+<!-- 鏌ヨ宸ュ簭-->
+ <select id="selectProcessMp">
+ select * from sd.basic_data where basic_type='product' and basic_category='process'
+
+ </select>
+
+ <select id="selectBasicMp">
+ select bdp.id, bdp.basic_type, bdp.basic_name, bd.basic_name as d_basic_name
+ from pp.basic_data_produce bdp
+ left join sd.basic_data bd on bdp.basic_category = bd.id
+ order by bdp.id desc
+ </select>
+
+ <select id="openSelectIdMp">
+ select bdp.id, bdp.basic_type, bdp.basic_name, bd.basic_name as d_basic_name
+ from pp.basic_data_produce bdp
+ left join sd.basic_data bd on bdp.basic_category = bd.id
+ where bdp.id = #{id}
+ </select>
+
+ <delete id="deleteBasicMp">
+ delete from pp.basic_data_produce where id = #{id}
+ </delete>
+
+ <update id="updateBasicMp">
+ update pp.basic_data_produce set basic_type = #{type},basic_name = #{name},basic_category = #{basicId} where id = #{id}
+ </update>
+
+ <select id="getBasicData">
+ select id from sd.basic_data where basic_category = 'process' and basic_name = #{process}
+ </select>
+
+ <insert id="addTeamGroupMp">
+ insert into pp.basic_data_produce(basic_type,basic_name,basic_category,create_time)
+ values('teamsgroups',#{basicName},#{basicId},now())
+ </insert>
+
+ <insert id="saveBreakageTypeMp">
+ insert into pp.basic_data_produce(basic_type,basic_name,create_time)
+ values('breakagetype',#{basicName},now())
+ </insert>
+
+ <insert id="saveBreakageReasonMp">
+ insert into pp.basic_data_produce(basic_type,basic_name,create_time)
+ values('breakagereason',#{basicName},now())
+ </insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0