From 6a9372d8683ccff59efdecde0792938e774b7e3a Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 30 十月 2023 16:07:00 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentRecordMapper.xml | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentRecordMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentRecordMapper.xml
index a2b468e..afed924 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentRecordMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SysEmbedmentRecordMapper.xml
@@ -53,9 +53,6 @@
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
- <if test="isUse != null">
- is_use = #{isUse,jdbcType=INTEGER},
- </if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=VARCHAR},
</if>
@@ -99,9 +96,6 @@
<if test="createTime != null">
create_time,
</if>
- <if test="isUse != null">
- is_use,
- </if>
<if test="companyId != null">
company_id,
</if>
@@ -140,9 +134,6 @@
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
- <if test="isUse != null">
- #{isUse,jdbcType=INTEGER},
- </if>
<if test="companyId != null">
#{companyId,jdbcType=VARCHAR},
</if>
@@ -151,6 +142,7 @@
<select id="embedmentRecordList" resultType="com.thhy.materials.modules.biz.embedment.entity.SysEmbedmentRecordEntity">
select
+ CONCAT(seg.embedment_name,"-",seg.embedment_model) embedmentNameAndModel,
ser.id,
ser.embedment_id as embedmentId,
ser.stock_type as stockType,
@@ -179,8 +171,8 @@
<if test="companyId!=null and companyId!='' ">
and ser.company_id=#{companyId}
</if>
- <if test="supplierId!=null and supplierId!='' ">
- and ser.supplier_id=#{supplierId}
+ <if test="embedmentModel!=null and embedmentModel!='' ">
+ and seg.embedment_model=#{embedmentModel}
</if>
<if test="getDepart!=null and getDepart!='' ">
and sd.depart_name like concat('%',#{getDepart},'%')
@@ -188,7 +180,7 @@
<if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
and ser.create_time between #{strTime} and #{endTime}
</if>
- order by sar.create_time desc
+ order by ser.create_time desc
</select>
<select id="embedmentRecordOutList" resultType="com.thhy.materials.modules.biz.embedment.entity.SysEmbedmentRecordEntity">
select
@@ -229,7 +221,7 @@
<if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
and ser.create_time between #{strTime} and #{endTime}
</if>
- order by sar.create_time desc
+ order by ser.create_time desc
</select>
<select id="embedmentRecordInfo" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.embedment.entity.SysEmbedmentRecordEntity">
select
@@ -254,22 +246,6 @@
where ser.is_use=1 and ser.id=#{id}
</select>
- <select id="assistIdSelect" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.materials.entity.SysAssistRecord">
- select
- sar.id,
- sar.assist_id as assistId,
- sar.stock_type as stockType,
- sar.change_stock as changeStock,
- sar.supplier_id as supplierId,
- sar.single_price as singlePrice,
- sar.amount as amount,
- sar.remark as remark,
- sar.get_depart as getDepart,
- sar.create_user as createUser,
- sar.create_time as createTime,
- sar.is_use as isUse
- from sys_assist_record sar where sar.id=#{id}
- </select>
<update id="embedmentRecordDel" >
update sys_embedment_record set
is_use=2
--
Gitblit v1.9.3