From d0c6c53ce449c422d7446c0406d0a711c76424f3 Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期四, 29 六月 2023 19:40:02 +0800 Subject: [PATCH] 优化出入库信息 --- igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml index c11d18a..b43c21f 100644 --- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml +++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml @@ -44,7 +44,8 @@ <!--鏇存柊鎵︽牱淇℃伅--> <update id="updateSampleData" parameterType="com.ld.igds.inout.dto.InoutCheckData"> - UPDATE D_INOUT_RECORD SET + UPDATE D_INOUT_RECORD + set UPDATE_TIME_ = #{data.updateTime} , <if test="data.sampleUser != null">SAMPLE_USER_ = #{data.sampleUser},</if> <if test="data.sampleTime != null">SAMPLE_TIME_ = #{data.sampleTime},</if> <if test="data.sampleType != null">SAMPLE_TYPE_ = #{data.sampleType},</if> @@ -86,12 +87,15 @@ <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if> <if test="param.deptId != null and param.deptId != '' ">AND DEPT_ID_ = #{param.deptId}</if> <if test="param.checkId != null and param.checkId != '' ">AND CHECK_ID_ like #{param.checkId}</if> - <if test="param.foodVariety != null and param.foodVariety != '' ">AND FOOD_VARIETY_ = #{param.foodVariety}</if> + <if test="param.foodVariety != null and param.foodVariety != '' ">AND FOOD_VARIETY_ = #{param.foodVariety} + </if> <if test="param.depotId != null and param.depotId != '' ">AND DEPOT_ID_ = #{param.depotId}</if> <if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if> <if test="param.start != null">AND REGISTER_TIME_ <![CDATA[ >= ]]>#{param.start,jdbcType=TIMESTAMP}</if> <if test="param.end != null">AND REGISTER_TIME_ <![CDATA[ <= ]]>#{param.end,jdbcType=TIMESTAMP}</if> - <if test="param.checkStatus != null and param.checkStatus != 'NONE' ">AND CHECK_STATUS_ != 'NONE' AND CHECK_STATUS_ IS NOT NULL</if> + <if test="param.checkStatus != null and param.checkStatus != 'NONE' ">AND CHECK_STATUS_ != 'NONE' AND + CHECK_STATUS_ IS NOT NULL + </if> <if test="param.checkStatus != null and param.checkStatus == 'NONE' ">AND CHECK_STATUS_ = 'NONE'</if> </where> AND RECORD_STATUS_ != 'DEL' @@ -100,20 +104,22 @@ </select> <!--鏇存柊鍖栭獙淇℃伅--> - <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutCheckData"> - UPDATE D_INOUT_RECORD SET - <if test="data.depotId != null">DEPOT_ID_ = #{data.depotId},</if> - <if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if> - <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if> - <if test="data.progress != null">PROGRESS_ = #{data.progress},</if> - <if test="data.checkStatus != null">CHECK_STATUS_ = #{data.checkStatus},</if> - <if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if> - <if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if> - <if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if> - <if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if> - <if test="data.price != null">PRICE_ = #{data.price},</if> - <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if> - TYPE_ = #{data.type} + <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutData"> + UPDATE D_INOUT_RECORD + <trim prefix="SET" suffixOverrides=","> + TYPE_ = #{data.type}, + <if test="data.depotId != null">DEPOT_ID_ = #{data.depotId},</if> + <if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if> + <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if> + <if test="data.progress != null">PROGRESS_ = #{data.progress},</if> + <if test="data.checkStatus != null">CHECK_STATUS_ = #{data.checkStatus},</if> + <if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if> + <if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if> + <if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if> + <if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if> + <if test="data.price != null">PRICE_ = #{data.price},</if> + <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if> + </trim> WHERE COMPANY_ID_ =#{data.companyId} AND ID_ =#{data.id} @@ -138,7 +144,9 @@ <where> <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if> <if test="param.foodLevel != null and param.foodLevel != '' ">AND FOOD_LEVEL_ = #{param.foodLevel}</if> - <if test="param.foodVariety != null and param.foodVariety != '' ">AND FOOD_VARIETY_ like #{param.foodVariety}</if> + <if test="param.foodVariety != null and param.foodVariety != '' ">AND FOOD_VARIETY_ like + #{param.foodVariety} + </if> <if test="param.end != null">AND END_TIME_ <![CDATA[ >= ]]>#{param.end,jdbcType=TIMESTAMP}</if> <if test="param.start != null">AND START_TIME_ <![CDATA[ <= ]]>#{param.start,jdbcType=TIMESTAMP}</if> </where> -- Gitblit v1.9.3