入库问题修改

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

 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,7 +106,8 @@
    <!--更新化验信息-->
    <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutData">
        UPDATE D_INOUT_RECORD
        SET TYPE_ = #{data.type},
        <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>
@@ -115,6 +119,7 @@
        <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,
@@ -187,7 +188,9 @@
        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>
@@ -202,10 +205,10 @@
    <select id="getMaxId" parameterType="java.lang.String"
            resultType="java.util.Map">
        select MAX(ID_) AS maxId
        from
        D_INOUT_RECORD
        from D_INOUT_RECORD
        where company_Id_
        =#{companyId} and id_ like #{likeKey}
            = #{companyId}
          and id_ like #{likeKey}
    </select>

    <update id="updateData" parameterType="com.ld.igds.inout.dto.InoutData">
@@ -259,17 +262,20 @@
    </update>

    <update id="updateDataByHandle" parameterType="com.ld.igds.inout.dto.InoutData">
        update D_INOUT_RECORD set
        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_INFO_ = #{data.deOtherInfo},</if>
        <if test="data.dePackage != null">DE_PACKAGE_ = #{data.package},</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>
        UPDATE_TIME_  = #{data.updateTime}
            <if test="data.updateTime != null">UPDATE_TIME_ = #{data.updateTime},</if>
        </trim>
        where
        company_id_ =#{data.companyId}
        and id_=#{data.id}
@@ -278,9 +284,7 @@

    <!-- 新增数据 -->
    <insert id="insertData" parameterType="com.ld.igds.inout.dto.InoutData">
        insert into
        D_INOUT_RECORD(
        ID_,
        insert into D_INOUT_RECORD(ID_,
        COMPANY_ID_,
        DEPT_ID_,
        NOTICE_ID_,
@@ -340,11 +344,8 @@
        bzw,
        dbz,
        bzbjs,
        UPDATE_TIME_
        )
        values
        (
        #{data.id},
                                   UPDATE_TIME_)
        values (#{data.id},
        #{data.companyId},
        #{data.deptId},
        #{data.noticeId},
@@ -404,8 +405,7 @@
        #{data.bzw},
        #{data.dbz},
        #{data.bzbjs},
        #{data.updateTime}
        )
                #{data.updateTime})
    </insert>

    <select id="pageRecordData" resultType="com.ld.igds.inout.dto.InoutData"

 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("空车称重")
    }
}


 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,