出入库流程优化-入库详单优化

jiazx0107@163.com

2023-06-24 6f45f4a29ce38525f3f9e3931bcedfc77bde765e

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

@@ -83,7 +83,6 @@
            <if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
            <if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
            AND PROGRESS_ != 'RECORD'
            AND RECORD_STATUS_ != 'ERROR'
            AND RECORD_STATUS_ != 'DEL'
        </where>
    </select>
@@ -110,7 +109,6 @@
                COMPLETE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
            </if>
            AND PROGRESS_ = 'RECORD'
            AND RECORD_STATUS_ != 'ERROR'
            AND RECORD_STATUS_ != 'DEL'
            ORDER BY COMPLETE_TIME_
        </where>
@@ -143,13 +141,19 @@
        <where>
            <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.depotId != null and param.depotId != '' ">AND DEPOT_ID_ = #{param.depotId}</if>
            <if test="param.type != null and param.type != '' ">AND TYPE_ = #{param.type}</if>
            <if test="param.plateNum != null and param.plateNum != '' ">AND PLATE_NUM_ = #{param.plateNum}</if>
            <if test="param.intelCard != null and param.intelCard != '' ">AND INTEL_CARD_ = #{param.intelCard}</if>
            <if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
            <if test="param.userId != null and param.userId != '' ">AND USER_ID_ = #{param.userId}</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
                COMPLETE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
            </if>
            <if test="param.curStorage > 0">AND CUR_STORAGE_ > 0</if>
        </where>
        AND PROGRESS_ = 'RECORD'
        AND RECORD_STATUS_ != 'ERROR'
        AND RECORD_STATUS_ != 'DEL'
        ORDER BY COMPLETE_TIME_ DESC
        LIMIT 1
@@ -164,7 +168,7 @@
            <if test="param.intelCard != null and param.plateNum != null">
                AND ( INTEL_CARD_ = #{param.intelCard} OR PLATE_NUM_ = #{param.plateNum} )
            </if>
            and PROGRESS_ &lt;&gt; 'RECORD' and RECORD_STATUS_ != 'DEL' and RECORD_STATUS_ != 'ERROR'
            and PROGRESS_ &lt;&gt; 'RECORD' and RECORD_STATUS_ != 'DEL'
        </where>
    </select>

@@ -182,16 +186,16 @@
    <update id="inoutStop" parameterType="com.ld.igds.inout.dto.InoutParam">
        update D_INOUT_RECORD
        <set>
            RECORD_STATUS_ ='ERROR',
            PROGRESS_ = 'RECORD',
            <if test="param.recordStatus != null and param.recordStatus != '' ">RECORD_STATUS_ = #{param.recordStatus},</if>
            <if test="param.checkStatus != null and param.checkStatus != '' ">CHECK_STATUS_ = #{param.checkStatus},</if>
            <if test="param.msg != null and param.msg != '' ">REMARKS_ = concat(REMARKS_,#{param.msg})</if>
        </set>
        <where>
            <if test="param.companyId != null and param.companyId != '' ">COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
        </where>

        <where>
            COMPANY_ID_ = #{param.companyId},
           AND ID_ = #{param.id}
        </where>
    </update>


@@ -463,25 +467,12 @@
        update D_INOUT_RECORD
        set PROGRESS_ = #{param.progress},
        COMPLETE_TIME_ =#{param.completeTime},
        <if test="param.fullWeight != null and param.fullWeight > 0">FULL_WEIGHT_ = #{param.fullWeight},</if>
        <if test="param.fullWeightUser != null">FULL_WEIGHT_USER_ = #{param.fullWeightUser},</if>
        <if test="param.fullWeightTime != null">FULL_WEIGHT_TIME_ = #{param.fullWeightTime},</if>
        <if test="param.emptyWeight != null and param.fullWeight > 0">EMPTY_WEIGHT_ = #{param.emptyWeight},</if>
        <if test="param.emptyWeightTime != null">EMPTY_WEIGHT_TIME_ = #{param.emptyWeightTime},</if>
        <if test="param.emptyWeightUser != null">EMPTY_WEIGHT_USER_ = #{param.emptyWeightUser},</if>
        <if test="param.netWeight != null and param.fullWeight > 0">NET_WEIGHT_ = #{param.netWeight},</if>
        <if test="param.settleWeight != null and param.settleWeight > 0">SETTLE_WEIGHT_ = #{param.settleWeight},</if>
        <if test="param.recordWeight != null and param.recordWeight > 0">RECORD_WEIGHT_ = #{param.recordWeight},</if>
        <if test="param.de != null and param.de > 0">DE_SUM_ = #{param.de},</if>
        <if test="param.depotId != null and param.depotId != ''">DEPOT_ID_ = #{param.depotId},</if>
        <if test="param.price != null and param.price > 0">PRICE_ = #{param.price},</if>
        <if test="param.settleMoney != null and param.settleMoney > 0">SETTLE_MONEY_ = #{param.settleMoney},</if>
        COMPLETE_USER_ = #{param.userId}
        COMPLETE_USER_ = #{param.userId},
        UPDATE_TIME_ = #{param.updateTime}
        where ID_ = #{param.id}
        and TYPE_ = #{param.type}
        and COMPANY_ID_ = #{param.companyId}
        and RECORD_STATUS_ != 'DEL'
        and RECORD_STATUS_ != 'ERROR'
    </update>

    <!-- 查询流程未完成的流水信息 -->
@@ -510,7 +501,6 @@
        AND RECORD_STATUS_ != 'DEL'
        AND PROGRESS_ != 'RECORD'
        AND PROGRESS_ != 'PAY'
        AND RECORD_STATUS_ != 'ERROR'
    </select>


@@ -522,7 +512,6 @@
        where
        PROGRESS_ = 'RECORD'
        AND RECORD_STATUS_ != 'DEL'
        AND RECORD_STATUS_ != 'ERROR'
        <if test="param.type != null and param.type != ''">AND TYPE_ = #{param.type}</if>
        <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>
@@ -547,7 +536,6 @@
        AND TYPE_ = #{param.type}
        AND (PLATE_NUM_ = #{param.plateNum} or INTEL_CARD_ = #{param.intelCard})
        AND PROGRESS_ != 'RECORD'
        AND RECORD_STATUS_ != 'ERROR'
        AND RECORD_STATUS_ != 'DEL'
        <if test="param.start != null">
            AND REGISTER_TIME_  <![CDATA[ > ]]> #{param.start,jdbcType=TIMESTAMP}