From 29a6e997b69d55b31d37810ff973a613924ddfa9 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期四, 16 十一月 2023 09:51:59 +0800
Subject: [PATCH] 20231116_qiuyh_料仓大屏
---
hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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..ffb5048 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
@@ -6,6 +6,12 @@
<insert id="insertAndUpdate">
insert ignore 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>
@@ -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>
@@ -138,6 +153,7 @@
<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.incoming_quantity AS incomingQuantity,
@@ -155,13 +171,14 @@
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
+ 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.incoming_quantity AS incomingQuantity,
@@ -186,6 +203,7 @@
t.id AS id,
t.table_num AS tableNum,
+ t.name_of_origin AS nameOfOrigin,
sd.dict_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
--
Gitblit v1.9.3