入库问题修改

YYC

2023-06-26 4176859f91d1a26d8f009a66061f0529a548dff0

入库问题修改

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java

@@ -685,8 +685,7 @@
        }

        // 获取系统参数配置
        InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(
                data.getCompanyId(), data.getDeptId());
        InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
        if (null == inoutSysConf) {
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                    "提示：当前系统中流程配置异常，请联系管理员", data);
@@ -694,24 +693,20 @@

        // 获取下一个流程状态
        String curProgress = data.getProgress();
        String nextProgress = getNextProgress(curProgress, data.getType(),
                inoutSysConf);
        String nextProgress = getNextProgress(curProgress, data.getType(), inoutSysConf);
        data = updateBasicInfo(data, curProgress, nextProgress);

        // 执行数据更新
        String msg = inoutService.updateDataByHandle(data);

        if (null != msg) {
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg,
                    data);
            return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
        }

        // 执行附件信息
        fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(),
                data.getId(), curProgress);
        fileService.saveInoutFiles(data.getFiles(), data.getCompanyId(), data.getId(), curProgress);

        return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功",
                data);
        return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功", data);
    }

    /**

 igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml

@@ -77,7 +77,7 @@
      <PropertyDef name="number">
        <Property name="dataType">Double</Property>
        <Property name="label">倒仓数量</Property>
        <Property name="displayFormat">#.00KG</Property>
        <Property name="displayFormat">#.00 KG</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>

 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>

 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"
@@ -187,26 +188,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
@@ -259,17 +262,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 +284,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 +474,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>

    <!-- 查询流程未完成的流水信息 -->

 igds-web/src/main/resources/static/admin/inout/in-weight.js

@@ -145,10 +145,11 @@
            alertError("后台调用截图失败，请重新尝试");
        }
    });

    console.log(recordData.progress, "空车称重")
    //如果是第二次称重，默认执行自动计算
    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {
        deAutoByIn("emptyWeight");
        console.log("空车称重")
    }
}

@@ -492,7 +493,7 @@

//显示质检信息
function showCheck() {
    if(!recordData){
    if (!recordData) {
        alertError("没有业务数据信息，执行被拒绝");
        return;
    }

 igds-web/src/main/resources/static/admin/inout/weight.js

@@ -21,7 +21,7 @@

    netWeight = netWeight.toFixed(0);
    recordWeight = recordWeight.toFixed(0);
    settleWeight = recordWeight.toFixed(0);
    settleWeight = settleWeight.toFixed(0);

    form.val("form-data", {
        netWeight: netWeight,
@@ -174,7 +174,7 @@
    var param = {
        type: type
    };
    

    console.log(url);

    table.render({