熏蒸备案页面修改2

YYC

2023-10-09 d20e6ee62885bfa4129d8b7ac457dd9298f5974a

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

@@ -6,7 +6,8 @@
<mapper namespace="com.ld.igds.inout.mapper.InoutRecordMapper">
    <!-- 基本返回信息 -->
    <sql id="BASE_COLUMN">
      ID_ as id,
        ID_
        as id,
      COMPANY_ID_ as companyId,
      DEPT_ID_ as deptId,
      NOTICE_ID_ as noticeId,
@@ -66,7 +67,7 @@
      bzw as bzw,
      dbz as dbz,
      bzbjs as bzbjs
   </sql>
    </sql>

    <!-- 根据条件查询，数据必须是流程中的数据 -->
    <select id="inoutProgressQuery" resultType="com.ld.igds.inout.dto.InoutData"
@@ -122,6 +123,7 @@
        from
        D_INOUT_RECORD
        <where>
            <if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
            <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</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>
@@ -155,7 +157,7 @@
            </if>
        </where>
        AND RECORD_STATUS_ != 'DEL'
        ORDER BY COMPLETE_TIME_ DESC
        ORDER BY UPDATE_TIME_ DESC
        LIMIT 1
    </select>

@@ -187,26 +189,28 @@
        update D_INOUT_RECORD
        <set>
            PROGRESS_ = 'RECORD',
            <if test="param.recordStatus != null and param.recordStatus != '' ">RECORD_STATUS_ = #{param.recordStatus},</if>
            <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>
            COMPANY_ID_ = #{param.companyId},
           AND ID_ = #{param.id}
            AND ID_ = #{param.id}
        </where>
    </update>


    <select id="getMaxId" parameterType="java.lang.String"
            resultType="java.util.Map">
      select MAX(ID_) AS maxId
      from
      D_INOUT_RECORD
      where company_Id_
      =#{companyId} and id_ like #{likeKey}
   </select>
        select MAX(ID_) AS maxId
        from D_INOUT_RECORD
        where company_Id_
            = #{companyId}
          and id_ like #{likeKey}
    </select>

    <update id="updateData" parameterType="com.ld.igds.inout.dto.InoutData">
        update D_INOUT_RECORD set
@@ -217,6 +221,7 @@
        <if test="data.checkStatus != null">CHECK_STATUS_ = #{data.checkStatus},</if>
        <if test="data.checkId != null">CHECK_ID_ = #{data.checkId},</if>
        <if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if>
        <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if>
        <if test="data.registerTime != null">REGISTER_TIME_ = #{data.registerTime},</if>
        <if test="data.registerUser != null">REGISTER_USER_ = #{data.registerUser},</if>
        <if test="data.userName != null">USER_NAME_ = #{data.userName},</if>
@@ -232,10 +237,12 @@
        <if test="data.customerName != null">CUSTOMER_NAME_ = #{data.customerName},</if>
        <if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
        <if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
        <if test="data.foodLocationId != null">FOOD_LOCATION_ID_ = #{data.foodLocationId},</if>
        <if test="data.foodLocation != null">FOOD_LOCATION_ = #{data.foodLocation},</if>
        <if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
        <if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>
        <if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>
        <if test="data.deOtherInfo != null">DE_OTHER_INTO_ = #{data.deOtherInfo},</if>
        <if test="data.fullWeight != null">FULL_WEIGHT_ = #{data.fullWeight},</if>
        <if test="data.fullWeightTime != null">FULL_WEIGHT_TIME_ = #{data.fullWeightTime},</if>
        <if test="data.fullWeightUser != null">FULL_WEIGHT_USER_ = #{data.fullWeightUser},</if>
@@ -243,6 +250,7 @@
        <if test="data.emptyWeightTime != null">EMPTY_WEIGHT_TIME_ = #{data.emptyWeightTime},</if>
        <if test="data.emptyWeightUser != null">EMPTY_WEIGHT_USER_ = #{data.emptyWeightUser},</if>
        <if test="data.netWeight != null">NET_WEIGHT_ = #{data.netWeight},</if>
        <if test="data.settleId != null">SETTLE_ID_ = #{data.settleId},</if>
        <if test="data.settleWeight != null">SETTLE_WEIGHT_ = #{data.settleWeight},</if>
        <if test="data.recordWeight != null">RECORD_WEIGHT_ = #{data.recordWeight},</if>
        <if test="data.handleUser != null">HANDLE_USER_ = #{data.handleUser},</if>
@@ -251,6 +259,8 @@
        <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
        <if test="data.foodType != null">FOOD_TYPE_ = #{data.foodType},</if>
        <if test="data.price != null">PRICE_ = #{data.price},</if>
        <if test="data.bzw != null">bzw = #{data.bzw},</if>
        <if test="data.dbz != null">dbz = #{data.dbz},</if>
        <if test="data.settleMoney != null">SETTLE_MONEY_ = #{data.settleMoney},</if>
        PROGRESS_ = #{data.progress}
        where
@@ -259,17 +269,20 @@
    </update>

    <update id="updateDataByHandle" parameterType="com.ld.igds.inout.dto.InoutData">
        update D_INOUT_RECORD set
        <if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>
        <if test="data.handleUser != null">HANDLE_USER_ = #{data.handleUser},</if>
        <if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>
        <if test="data.deOtherInfo != null">DE_OTHER_INFO_ = #{data.deOtherInfo},</if>
        <if test="data.dePackage != null">DE_PACKAGE_ = #{data.package},</if>
        <if test="data.bzw != null">bzw = #{data.bzw},</if>
        <if test="data.dbz != null">dbz = #{data.dbz},</if>
        <if test="data.bzbjs != null">bzbjs = #{data.bzbjs},</if>
        <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
        UPDATE_TIME_  = #{data.updateTime}
        update D_INOUT_RECORD
        <trim prefix="SET" suffixOverrides=",">
            <if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>
            <if test="data.handleUser != null">HANDLE_USER_ = #{data.handleUser},</if>
            <if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>
            <if test="data.deOtherInfo != null">DE_OTHER_INTO_ = #{data.deOtherInfo},</if>
            <if test="data.dePackage != null">DE_PACKAGE_ = #{data.dePackage},</if>
            <if test="data.bzw != null">bzw = #{data.bzw},</if>
            <if test="data.dbz != null">dbz = #{data.dbz},</if>
            <if test="data.bzbjs != null">bzbjs = #{data.bzbjs},</if>
            <if test="data.progress != null">PROGRESS_ = #{data.progress},</if>
            <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
            <if test="data.updateTime != null">UPDATE_TIME_ = #{data.updateTime},</if>
        </trim>
        where
        company_id_ =#{data.companyId}
        and id_=#{data.id}
@@ -278,135 +291,129 @@

    <!-- 新增数据 -->
    <insert id="insertData" parameterType="com.ld.igds.inout.dto.InoutData">
      insert into
      D_INOUT_RECORD(
      ID_,
      COMPANY_ID_,
      DEPT_ID_,
      NOTICE_ID_,
      DEPOT_ID_,
      TYPE_,
      PROGRESS_,
      RECORD_STATUS_,
      CUSTOMER_NAME_,
      INTEL_CARD_,
      REGISTER_TIME_,
      REGISTER_USER_,
      USER_NAME_,
      USER_CONTACT_,
      USER_ID_,
      USER_BIRTHDAY_,
      USER_SEX_,
      USER_NATION_,
      USER_ADDRESS_,
      PLATE_NUM_,
      TRANS_TYPE_,
      FOOD_VARIETY_,
      FOOD_TYPE_,
      FOOD_LEVEL_,
      FOOD_LOCATION_ID_,
      FOOD_LOCATION_,
      FOOD_YEAR_,
      CHECK_STATUS_,
      CHECK_USER_,
      CHECK_TIME_,
      SAMPLE_USER_,
      SAMPLE_TIME_,
      SAMPLE_TYPE_,
      CHECK_ID_,
      DE_CHECK_,
      ADD_CHECK_,
      jjlx,
      FULL_WEIGHT_,
      FULL_WEIGHT_TIME_,
      FULL_WEIGHT_USER_,
      EMPTY_WEIGHT_,
      EMPTY_WEIGHT_TIME_,
      EMPTY_WEIGHT_USER_,
      NET_WEIGHT_,
      DE_HANDLE_,
      DE_PACKAGE_,
      DE_OTHER_,
      DE_OTHER_INTO_,
      SETTLE_WEIGHT_,
      RECORD_WEIGHT_,
      PRICE_,
      SETTLE_MONEY_,
      SETTLE_ID_,
      HANDLE_USER_,
      COMPLETE_TIME_,
      COMPLETE_USER_,
      REMARKS_,
      bzw,
      dbz,
      bzbjs,
      UPDATE_TIME_
      )
      values
      (
      #{data.id},
      #{data.companyId},
      #{data.deptId},
      #{data.noticeId},
      #{data.depotId},
      #{data.type},
      #{data.progress},
      #{data.recordStatus},
      #{data.customerName},
      #{data.intelCard},
      #{data.registerTime},
      #{data.registerUser},
      #{data.userName},
      #{data.userContact},
      #{data.userId},
      #{data.userBirthday},
      #{data.userSex},
      #{data.userNation},
      #{data.userAddress},
      #{data.plateNum},
      #{data.transType},
      #{data.foodVariety},
      #{data.foodType},
      #{data.foodLevel},
      #{data.foodLocationId},
      #{data.foodLocation},
      #{data.foodYear},
      #{data.checkStatus},
      #{data.checkUser},
      #{data.checkTime},
      #{data.sampleUser},
      #{data.sampleTime},
      #{data.sampleType},
      #{data.checkId},
      #{data.deCheck},
      #{data.addCheck},
      #{data.jjlx},
      #{data.fullWeight},
      #{data.fullWeightTime},
      #{data.fullWeightUser},
      #{data.emptyWeight},
      #{data.emptyWeightTime},
      #{data.emptyWeightUser},
      #{data.netWeight},
      #{data.deHandle},
      #{data.dePackage},
      #{data.deOther},
      #{data.deOtherInfo},
      #{data.settleWeight},
      #{data.recordWeight},
      #{data.price},
      #{data.settleMoney},
      #{data.settleId},
      #{data.handleUser},
      #{data.completeTime},
      #{data.completeUser},
      #{data.remarks},
      #{data.bzw},
      #{data.dbz},
      #{data.bzbjs},
      #{data.updateTime}
      )
   </insert>
        insert into D_INOUT_RECORD(ID_,
                                   COMPANY_ID_,
                                   DEPT_ID_,
                                   NOTICE_ID_,
                                   DEPOT_ID_,
                                   TYPE_,
                                   PROGRESS_,
                                   RECORD_STATUS_,
                                   CUSTOMER_NAME_,
                                   INTEL_CARD_,
                                   REGISTER_TIME_,
                                   REGISTER_USER_,
                                   USER_NAME_,
                                   USER_CONTACT_,
                                   USER_ID_,
                                   USER_BIRTHDAY_,
                                   USER_SEX_,
                                   USER_NATION_,
                                   USER_ADDRESS_,
                                   PLATE_NUM_,
                                   TRANS_TYPE_,
                                   FOOD_VARIETY_,
                                   FOOD_TYPE_,
                                   FOOD_LEVEL_,
                                   FOOD_LOCATION_ID_,
                                   FOOD_LOCATION_,
                                   FOOD_YEAR_,
                                   CHECK_STATUS_,
                                   CHECK_USER_,
                                   CHECK_TIME_,
                                   SAMPLE_USER_,
                                   SAMPLE_TIME_,
                                   SAMPLE_TYPE_,
                                   CHECK_ID_,
                                   DE_CHECK_,
                                   ADD_CHECK_,
                                   jjlx,
                                   FULL_WEIGHT_,
                                   FULL_WEIGHT_TIME_,
                                   FULL_WEIGHT_USER_,
                                   EMPTY_WEIGHT_,
                                   EMPTY_WEIGHT_TIME_,
                                   EMPTY_WEIGHT_USER_,
                                   NET_WEIGHT_,
                                   DE_HANDLE_,
                                   DE_PACKAGE_,
                                   DE_OTHER_,
                                   DE_OTHER_INTO_,
                                   SETTLE_WEIGHT_,
                                   RECORD_WEIGHT_,
                                   PRICE_,
                                   SETTLE_MONEY_,
                                   SETTLE_ID_,
                                   HANDLE_USER_,
                                   COMPLETE_TIME_,
                                   COMPLETE_USER_,
                                   REMARKS_,
                                   bzw,
                                   dbz,
                                   bzbjs,
                                   UPDATE_TIME_)
        values (#{data.id},
                #{data.companyId},
                #{data.deptId},
                #{data.noticeId},
                #{data.depotId},
                #{data.type},
                #{data.progress},
                #{data.recordStatus},
                #{data.customerName},
                #{data.intelCard},
                #{data.registerTime},
                #{data.registerUser},
                #{data.userName},
                #{data.userContact},
                #{data.userId},
                #{data.userBirthday},
                #{data.userSex},
                #{data.userNation},
                #{data.userAddress},
                #{data.plateNum},
                #{data.transType},
                #{data.foodVariety},
                #{data.foodType},
                #{data.foodLevel},
                #{data.foodLocationId},
                #{data.foodLocation},
                #{data.foodYear},
                #{data.checkStatus},
                #{data.checkUser},
                #{data.checkTime},
                #{data.sampleUser},
                #{data.sampleTime},
                #{data.sampleType},
                #{data.checkId},
                #{data.deCheck},
                #{data.addCheck},
                #{data.jjlx},
                #{data.fullWeight},
                #{data.fullWeightTime},
                #{data.fullWeightUser},
                #{data.emptyWeight},
                #{data.emptyWeightTime},
                #{data.emptyWeightUser},
                #{data.netWeight},
                #{data.deHandle},
                #{data.dePackage},
                #{data.deOther},
                #{data.deOtherInfo},
                #{data.settleWeight},
                #{data.recordWeight},
                #{data.price},
                #{data.settleMoney},
                #{data.settleId},
                #{data.handleUser},
                #{data.completeTime},
                #{data.completeUser},
                #{data.remarks},
                #{data.bzw},
                #{data.dbz},
                #{data.bzbjs},
                #{data.updateTime})
    </insert>

    <select id="pageRecordData" resultType="com.ld.igds.inout.dto.InoutData"
            parameterType="com.ld.igds.inout.dto.InoutParam">
@@ -474,14 +481,14 @@
    <!-- 完成出入库-->
    <update id="toComplete" parameterType="com.ld.igds.inout.dto.InoutParam">
        update D_INOUT_RECORD
        set PROGRESS_ = #{param.progress},
        COMPLETE_TIME_ =#{param.completeTime},
        COMPLETE_USER_ = #{param.userId},
        UPDATE_TIME_ = #{param.updateTime}
        set PROGRESS_      = #{param.progress},
            COMPLETE_TIME_ =#{param.completeTime},
            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 TYPE_ = #{param.type}
          and COMPANY_ID_ = #{param.companyId}
          and RECORD_STATUS_ != 'DEL'
    </update>

    <!-- 查询流程未完成的流水信息 -->
@@ -551,4 +558,79 @@
        </if>
    </select>

    <!-- 根据条件查询，要求时间条件必须，必须是正常数据 -->
    <select id="listLossOver" resultType="com.ld.igds.models.InoutLossOver"
            parameterType="com.ld.igds.inout.dto.InoutParam">
        select
        ID_ as id,
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        DEPOT_ID_ as depotId,
        TYPE_ as type,
        SUBMIT_TIME_ as submitTime,
        rkjz as rkjz,
        rksj as rksj,
        rksf as rksf,
        rkzz as rkzz,
        cksj as cksj,
        ckjz as ckjz,
        cksf as cksf,
        ckzz as ckzz,
        AMOUNT_ as amount,
        sysfzc as sysfzc,
        syyy as syyy,
        ccshr as ccshr,
        AUDIT_CCSH_ as auditCcsh,
        INFO_CCSH_ as InfoCcsh,
        zjshr as zjshr,
        AUDIT_ZJSH_ as auditZjsh,
        INFO_ZJSH_ as infoZjsh,
        AUDIT_TJSH_ as auditTjsh,
        INFO_TJSH_ as infoTjsh,
        kjshr as kjshr,
        AUDIT_KJSH_ as auditKjsh,
        INFO_KJSH_ as infoKjsh,
        ldshr as ldshr,
        AUDIT_LDSH_ as auditLdsh,
        INFO_LDSH_ as infoLdsh,
        REMARK_ as remark,
        UPDATE_TIME_ as updateTime,
        UPDATE_USER_ as updateUser
        from
        D_INOUT_LOSS_OVER
        <where>
            <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.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.end != null">AND
                UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
            </if>
            <if test="param.start != null">AND
                UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
            </if>
            ORDER BY UPDATE_TIME_
        </where>
    </select>

    <!-- 获取开始周期-截至周期内，出入库入库重量汇总合计 -->
    <select id="sumLossOverWeight" resultType="com.ld.igds.data.CommonData"
            parameterType="com.ld.igds.inout.dto.InoutParam">
        select SUM(AMOUNT_) as numValue1
        from D_INOUT_LOSS_OVER
        <where>
            <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.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.end != null">AND
                UPDATE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
            </if>
            <if test="param.start != null">AND
                UPDATE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
            </if>
            ORDER BY UPDATE_TIME_
        </where>
    </select>

</mapper>