入库问题修改

YYC

2023-06-26 4176859f91d1a26d8f009a66061f0529a548dff0

 igds-inout/src/main/resources/mapper/InoutCheckMapper.xml

@@ -87,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'
@@ -103,18 +106,20 @@
    <!--更新化验信息-->
    <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>
        <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 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}
@@ -139,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>