From e54c4eb160c09711dc262c50ef5a0b3d0c4709f5 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 16 十一月 2023 09:17:29 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
index a7351d2..8d33ac6 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
@@ -193,6 +193,15 @@
<if test="reportNumber != null">
report_number,
</if>
+ <if test="stata != null">
+ stata,
+ </if>
+ <if test="siloId != null">
+ silo_id,
+ </if>
+ <if test="percentage != null">
+ percentage,
+ </if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="mixingId != null">
@@ -222,6 +231,15 @@
<if test="reportNumber != null">
#{reportNumber,jdbcType=VARCHAR},
</if>
+ <if test="stata != null">
+ #{stata},
+ </if>
+ <if test="siloId != null">
+ #{siloId,jdbcType=VARCHAR},
+ </if>
+ <if test="percentage != null">
+ #{percentage,jdbcType=VARCHAR},
+ </if>
</trim>
</insert>
<select id="mixingList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
@@ -234,8 +252,35 @@
in_num as inNum,
in_date as inDate,
inspect_state as inspectState,
- report_number as reportNumber
- from t_mixing
- order by in_date desc
+ report_number as reportNumber,
+ stata as stata,
+ silo_id as siloId,
+ percentage as percentage
+ from t_mixing where silo_id=#{siloId}
+ order by in_date desc limit 0,1
+ </select>
+ <select id="mixingLists" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
+ select
+ mixing_id as mixingId,
+ material as material,
+ spec as spec,
+ producer as producer,
+ stove as stove,
+ in_num as inNum,
+ in_date as inDate,
+ inspect_state as inspectState,
+ report_number as reportNumber,
+ stata as stata,
+ silo_id as siloId,
+ percentage as percentage
+ from t_mixing where silo_id=#{siloId}
+ order by in_date desc limit 0,1
+ </select>
+ <select id="siloList" resultType="com.thhy.materials.modules.biz.concret.entity.TSilo">
+ select
+ silo_id as siloId,
+ silo_name as siloName,
+ types as types
+ from t_silo where types=#{types}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3