From 1a47d9eef4cfe9385ce66b791de84db54a5ba87c Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期日, 25 六月 2023 20:30:36 +0800 Subject: [PATCH] 出入库流程优化-入库详单优化 --- igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 deletions(-) diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml index c30a291..9a31375 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> @@ -69,6 +70,8 @@ REGISTER_USER_ as registerUser, DEPOT_ID_ as depotId, FOOD_VARIETY_ as foodVariety, + FOOD_LEVEL_ as foodLevel, + PRICE_ as price, PLATE_NUM_ as plateNum, SAMPLE_USER_ as sampleUser, SAMPLE_TIME_ as sampleTime, @@ -98,11 +101,13 @@ </select> <!--鏇存柊鍖栭獙淇℃伅--> - <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutCheckData"> - UPDATE D_INOUT_RECORD SET + <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutData"> + UPDATE D_INOUT_RECORD + SET 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> @@ -110,10 +115,35 @@ <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} WHERE COMPANY_ID_ =#{data.companyId} AND ID_ =#{data.id} </update> + <!--鑾峰彇绮瀹氫环淇℃伅--> + <select id="getPrice" resultType="com.ld.igds.models.InoutPrice" + parameterType="com.ld.igds.inout.dto.InoutCheckParam"> + select + ID_ as id, + COMPANY_ID_ as companyId, + FOOD_VARIETY_ as foodVariety, + FOOD_LEVEL_ as foodLevel, + PRICE_ as price, + START_TIME_ as startTime, + END_TIME_ as endTime, + UPDATE_USER_ as updateUser, + UPDATE_TIME_ as updateTime, + REMARKS_ as remarks + from + D_INOUT_PRICE + <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.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> + ORDER BY UPDATE_TIME_ + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.3