From 8b6ffea7bcc3019a3114e8ba09e0a081dced2703 Mon Sep 17 00:00:00 2001 From: 邱宇豪 <qyh123230312> Date: 星期三, 29 十一月 2023 09:28:38 +0800 Subject: [PATCH] 20231129_qiuyh_调整进场数量字段类型 --- hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml index 2cf6e2c..93b3eff 100644 --- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml +++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml @@ -66,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}, @@ -102,7 +102,7 @@ on duplicate key update <trim suffixOverrides=","> <if test="nameOfOrigin != null"> - name_of_origin = #{nameOfOrigin,jdbcType=VARCHAR}, + name_of_origin = #{nameOfOrigin,jdbcType=VARCHAR}, </if> <if test="tableNum != null"> table_num = #{tableNum,jdbcType=INTEGER}, @@ -111,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}, @@ -132,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}, @@ -147,7 +147,7 @@ </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"> @@ -155,7 +155,7 @@ 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, @@ -171,6 +171,15 @@ 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} + <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> @@ -180,7 +189,7 @@ 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, @@ -204,7 +213,7 @@ t.id AS id, t.table_num AS tableNum, t.name_of_origin AS nameOfOrigin, - sd.dict_name AS materialName, + t.material_name AS materialName, t.incoming_quantity AS incomingQuantity, t.create_time AS createTime, t.status AS status, -- Gitblit v1.9.3