From 5efd01db698683e95a63053da43aaa08fa35a185 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期五, 01 十二月 2023 11:20:28 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
index deb220b..93b3eff 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
@@ -4,8 +4,14 @@
<insert id="insertAndUpdate">
- insert ignore into t_su_material_warehouse_record
+ insert into t_su_material_warehouse_record
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="nameOfOrigin != null">
+ name_of_origin,
+ </if>
<if test="tableNum != null">
table_num,
</if>
@@ -47,6 +53,12 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=VARCHAR},
+ </if>
+ <if test="nameOfOrigin != null">
+ #{nameOfOrigin,jdbcType=VARCHAR},
+ </if>
<if test="tableNum != null">
#{tableNum,jdbcType=INTEGER},
</if>
@@ -54,7 +66,7 @@
#{materialName,jdbcType=VARCHAR},
</if>
<if test="incomingQuantity != null">
- #{incomingQuantity,jdbcType=INTEGER},
+ #{incomingQuantity,jdbcType=DOUBLE},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
@@ -89,6 +101,9 @@
</trim>
on duplicate key update
<trim suffixOverrides=",">
+ <if test="nameOfOrigin != null">
+ name_of_origin = #{nameOfOrigin,jdbcType=VARCHAR},
+ </if>
<if test="tableNum != null">
table_num = #{tableNum,jdbcType=INTEGER},
</if>
@@ -96,7 +111,7 @@
material_name = #{materialName,jdbcType=VARCHAR},
</if>
<if test="incomingQuantity != null">
- incoming_quantity = #{incomingQuantity,jdbcType=INTEGER},
+ incoming_quantity = #{incomingQuantity,jdbcType=DOUBLE},
</if>
<if test="status != null">
`status` = #{status,jdbcType=INTEGER},
@@ -117,7 +132,7 @@
update_user= #{updateUser,jdbcType=VARCHAR},
</if>
<if test="updateTime != null">
- update_time #{updateTime,jdbcType=TIMESTAMP},
+ update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="companyId != null">
company_id = #{companyId,jdbcType=VARCHAR},
@@ -132,14 +147,15 @@
</insert>
<delete id="delete">
- update t_su_material_warehouse set isUse = 0 where id = #{id,jdbcType=VARCHAR}
+ update t_su_material_warehouse_record set is_use = 0 where id = #{id,jdbcType=VARCHAR}
</delete>
<select id="selectPageList" resultType="com.thhy.materials.modules.biz.suMaterialWarehouse.entity.SuMaterialWarehouseEntity">
SELECT
t.id AS id,
+ t.name_of_origin AS nameOfOrigin,
t.table_num AS tableNum,
- sd.dict_name AS materialName,
+ t.material_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
t.status AS status,
@@ -155,15 +171,25 @@
LEFT JOIN sys_users su1 on su1.user_id = t.update_user
LEFT JOIN sys_dict sd on sd.dict_id = t.material_name
where t.is_use = 1 and t.company_id = #{companyId}
- order by
+ <if test="tableNum != null and tableNum !=''">
+ and t.table_num = #{tableNum}
+ </if>
+ <if test="type != null and type !=''">
+ and t.type = #{type}
+ </if>
+ <if test="startTime != null and endTime != null">
+ and t.create_time between #{startTime} and #{endTime}
+ </if>
+ order by t.create_time desc
</select>
<select id="selectInfo" resultType="com.thhy.materials.modules.biz.suMaterialWarehouse.entity.SuMaterialWarehouseEntity">
SELECT
t.id AS id,
+ t.name_of_origin AS nameOfOrigin,
t.table_num AS tableNum,
- sd.dict_name AS materialName,
+ t.material_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
t.status AS status,
@@ -186,7 +212,8 @@
t.id AS id,
t.table_num AS tableNum,
- sd.dict_name AS materialName,
+ t.name_of_origin AS nameOfOrigin,
+ t.material_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
t.status AS status,
--
Gitblit v1.9.3