称重页面调整-增加化验信息

czt

2023-06-12 d9e1a4fe6e51958c4571efe2ced4d4172ed385db

称重页面调整-增加化验信息

 igds-core/src/main/resources/mapper/CheckStandardMapper.xml

@@ -61,6 +61,11 @@
            <if test="data.upperLimit != null and data.upperLimit != '' ">UPPER_LIMIT_ = #{data.upperLimit},</if>
            <if test="data.unit != null and data.unit != '' ">UNIT_ = #{data.unit},</if>
            <if test="data.value != null and data.value != '' ">VALUE_ = #{data.value},</if>
            <if test="data.addNum != null">ADD_NUM_ = #{data.addNum},</if>
            <if test="data.deNum != null">DE_NUM_ = #{data.deNum},</if>
            <if test="data.addPrice != null">ADD_PRICE_ = #{data.addPrice},</if>
            <if test="data.dePrice != null">DE_PRICE_ = #{data.dePrice},</if>
            <if test="data.result != null and data.result != '' ">RESULT_ = #{data.result},</if>
            <if test="data.remarks != null and data.remarks != '' ">REMARKS_ = #{data.remarks},</if>
            <if test="data.operaSymbol != null and data.operaSymbol != '' ">OPERA_SYMBOL_ = #{data.operaSymbol}</if>
        </set>

 igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java

@@ -18,6 +18,7 @@
import com.ld.igds.models.Depot;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.InoutConf;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
@@ -866,4 +867,15 @@

        return inoutManager.updateCheckData(data);
    }

    /**
     * 根据粮食等级及粮食品种获取粮食定价
     * @param param
     * @return
     */
    @RequestMapping("/get-price")
    public PageResponse<InoutPrice> getPrice(@RequestBody InoutCheckParam param) {

        return inoutManager.getPrice(param);
    }
}

 igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckParam.java

@@ -5,7 +5,7 @@
import lombok.EqualsAndHashCode;

/**
 * 出入库-扦样参数
 * 出入库-扦样化验参数
 * 
 * @author czt
 * @date 2023-05-30 18:10
@@ -32,4 +32,5 @@
    private String checkStatus; //扦样状态
    private String depotId;
    private String foodVariety;
    private String foodLevel;
}

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

@@ -16,6 +16,7 @@
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutConf;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.models.InoutSysConf;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
@@ -450,12 +451,18 @@
            data.setProgress(nextProgress);
        }

        if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
            data.setCheckUser(ContextUtil.getLoginUserCName());
            data.setProgress(nextProgress);
            return data;
        }

        if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(curProgress)) {
            data.setEmptyWeightTime(new Date());
            data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
            data.setProgress(nextProgress);

        }

        if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(curProgress)) {
            data.setFullWeightTime(new Date());
            data.setFullWeightUser(ContextUtil.getLoginUserCName());
@@ -469,14 +476,12 @@
            data.setProgress(nextProgress);
        }


        //如果下一个数据状态=流程结束，直接补充完整信息
        if (InoutConstant.PROGRESS_RECORD.equals(nextProgress)) {
            data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
            data.setCompleteUser(ContextUtil.getLoginUserCName());
            data.setProgress(nextProgress);
        }


        return data;
    }
@@ -498,6 +503,14 @@

            return data;
        }

        if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
            data.setCheckUser(ContextUtil.getLoginUserCName());
            data.setProgress(getNextProgress(data.getProgress(),
                    data.getType(), sysConf));
            return data;
        }

        if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(data.getProgress())) {
            data.setEmptyWeightTime(new Date());
            data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
@@ -1217,7 +1230,7 @@

            //更新化验项信息
            CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
            if (null == checkResult || null != checkResult.getMsg()) {
            if (StringUtils.isNotEmpty(checkResult.getMsg())) {
                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                        "后台执行异常：" + checkResult.getMsg(), data);
            }
@@ -1233,17 +1246,25 @@
                data.setCheckTime(new Date());
            }
            curData.setCheckStatus(data.getCheckStatus());

            //获取系统参数配置
            InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId());
            if (null == inoutSysConf) {
                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
                        "提示：当前库区未配置出入库流程信息，请联系管理员", data);
            }
            //更新下一流程状态
            if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) {
                curData = updateBasicInfo(curData, null);
                curData = updateBasicInfo(curData, inoutSysConf);
                // 若化验结果不合格，判断配置后续流程
                if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) {
                    curData = checkNoPass(curData);
                }
            }

            data.setCheckStatus(curData.getCheckStatus());
            //化验人、化验时间
            data.setCheckStatus(curData.getCheckStatus());
            data.setProgress(curData.getProgress());
            if (StringUtils.isEmpty(data.getCheckUser())) {
                data.setCheckUser(ContextUtil.getLoginUserCName());
            }
@@ -1262,4 +1283,25 @@
                    "后台异常：" + e.getMessage(), null);
        }
    }

    /**
     * 获取单价信息
     *
     * @param param
     * @return
     */
    public PageResponse<InoutPrice> getPrice(InoutCheckParam param) {
        try {

            List<InoutPrice> price = inoutService.getPrice(param);
            if(null == price || price.isEmpty()){
                return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "未获取到粮食定价配置信息");
            }
            return new PageResponse<>(RespCodeEnum.CODE_0000, price.get(0));

        } catch (Exception e) {
            return new PageResponse<>(
                    RespCodeEnum.CODE_1111.getCode(), "后台异常：" + e.getMessage(), null);
        }
    }
}

 igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.ld.igds.inout.dto.InoutCheckData;
import com.ld.igds.inout.dto.InoutCheckParam;
import com.ld.igds.models.InoutPrice;
import org.apache.ibatis.annotations.Param;
import java.util.List;

@@ -49,4 +50,11 @@
     * @return
     */
    int updateCheckData(@Param("data") InoutCheckData data);

    /**
     * 获取粮食定价
     * @param param
     * @return
     */
    List<InoutPrice> getPrice(@Param("param") InoutCheckParam param);
}

 igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java

@@ -3,6 +3,7 @@
import com.ld.igds.check.dto.CheckItemData;
import com.ld.igds.data.Page;
import com.ld.igds.inout.dto.*;
import com.ld.igds.models.InoutPrice;

import java.util.Date;
import java.util.List;
@@ -274,5 +275,11 @@
     */
    String updateCheckData(InoutCheckData data);

    /**
     * 获取粮食定价
     * @param param
     * @return
     */
    List<InoutPrice> getPrice(InoutCheckParam param);

}

 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java

@@ -18,6 +18,7 @@
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.io.constant.OrderRespEnum;
import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import com.ld.igds.util.RedisUtil;
@@ -786,4 +787,14 @@
        return null;
    }

    @Override
    public List<InoutPrice> getPrice(InoutCheckParam param) {
        if(null == param.getStart()){
            param.setStart(new Date());
        }
        if(null == param.getEnd()){
            param.setEnd(new Date());
        }
        return inoutCheckMapper.getPrice(param);
    }
}

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

@@ -1322,7 +1322,7 @@
      <Property name="minWidth">500</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsFoodOrigin">
          <Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
          <Property name="dataProvider"></Property>
          <Property name="dataType">[dtFoodOrigin]</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">30</Property>

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

@@ -41,13 +41,15 @@
      </PropertyDef>
      <PropertyDef name="startTime">
        <Property></Property>
        <Property name="label">有效开始时间</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">有效开始日期</Property>
        <Property name="dataType">Date</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="endTime">
        <Property></Property>
        <Property name="label">有效截至时间</Property>
        <Property name="dataType">DateTime</Property>
        <Property name="label">有效截至日期</Property>
        <Property name="dataType">Date</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="updateUser">
        <Property></Property>

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

@@ -105,6 +105,7 @@
        <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>
@@ -118,4 +119,30 @@
        AND ID_ =#{data.id}
    </update>

    <!--获取粮食定价信息-->
    <select id="getPrice" resultType="com.ld.igds.models.InoutPrice"
            parameterType="com.ld.igds.inout.dto.InoutCheckParam">
        select
        ID_ as id,
        COMPANY_ID_ as companyId,
        FOOD_VARIETY_ as foodVariety,
        FOOD_LEVEL_ as foodLevel,
        PRICE_ as price,
        START_TIME_ as startTime,
        END_TIME_ as endTime,
        UPDATE_USER_ as updateUser,
        UPDATE_TIME_ as updateTime,
        REMARKS_ as remarks
        from
        D_INOUT_PRICE
        <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.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>
        ORDER BY UPDATE_TIME_
    </select>

</mapper>

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

@@ -47,9 +47,14 @@
            }
        });

        //监听粮食品种
        //监听粮食品种，获取化验项
        layui.form.on('select(select_foodVariety)', function (data) {
            updateFoodVariety(data.value);
        });

        //监听粮食等级，获取粮食定价
        layui.form.on('select(select_foodLevel)', function (data) {
            getPriceByFoodLevel(data.value);
        });

        //监听化验结果单填写数据,并给出提示结果
@@ -110,23 +115,23 @@
    if (symbol && limit) {
        if (">=" == symbol) {
            if (newValue < limit) {
                data.result = "不合格";
                data.result = "0";
            } else {
                data.result = "合格";
                data.result = "1";
            }
        }
        if ("<=" == symbol) {
            if (newValue > limit) {
                data.result = "不合格";
                data.result = "0";
            } else {
                data.result = "合格";
                data.result = "1";
            }
        }
        if ("==" == symbol) {
            if (newValue != limit) {
                data.result = "不合格";
                data.result = "0";
            } else {
                data.result = "合格";
                data.result = "1";
            }
        }
    }
@@ -146,7 +151,7 @@
    form.render('select');
}

//根据选择仓库显示粮食品种
//根据品种获取化验项
function updateFoodVariety(foodVariety) {
    if (null == foodVariety || "" == foodVariety) return;
    form.val("form-detail", {
@@ -155,6 +160,34 @@
    form.render();

    flushCheckItem(foodVariety);
}

//根据选择仓库显示粮食品种
function getPriceByFoodLevel(foodLevel) {
    if (null == foodLevel || "" == foodLevel) return;
    form.val("form-detail", {
        foodLevel: foodLevel
    });
    form.render();
    var data = form.val("form-detail");

    $.ajax({
        type: "POST",
        url: "../../basic/inout/get-price",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(data),
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                $("#check-result-tip2").text("粮食定价：" + result.data.price + "元/公斤");
            }
        },
        error: function () {
            layer.msg("后台异常，请重试或者联系管理员！！");
        }
    });
}

// 查询
@@ -303,10 +336,6 @@
        curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());
    }
    curCheckData.checkUser = checkUser;
    if (curCheckData.checkStatus == "NONE") {
        //隐藏车牌部分信息
        curCheckData.plateNum = replaceStr(curCheckData.plateNum);
    }

    // 赋值
    form.val("form-detail", curCheckData);
@@ -336,6 +365,7 @@

    // 获取化验项信息
    flushCheckItem(curCheckData.foodVariety);
    getPriceByFoodLevel(curCheckData.foodLevel);
}

/**
@@ -344,7 +374,7 @@
function flushCheckItem(foodVariety) {
    curCheckItems = null;
    $("#check-result-tip").text("检验结果：#");
    $("#price-result-tip").text("粮食单价：#元/公斤");
    $("#price-result-tip2").text("粮食定价：#元/公斤");
    curCheckData.foodVariety = foodVariety;

    var index = layer.load();
@@ -383,23 +413,23 @@
    }
    var msg;
    $.each(curCheckItems, function (index, data) {
        if (!data.remarks) {
        if (!data.result) {
            return true;
        }
        if (data.remarks == "不合格") {
        if (data.result == "0") {
            msg = "不合格";
            return false;
        }
        if (data.remarks == "合格") {
        if (data.result == "1") {
            msg = "合格";
        }
    });
    if (msg) {
        $("#check-result-tip").text("检验结果：" + msg + "；粮食单价：#元/公斤");
        $("#check-result-tip").text("质检结果：" + msg);
    } else {
        $("#check-result-tip").text("检验结果：合格" + "；粮食单价：#元/公斤");
        $("#check-result-tip").text("质检结果：#");
    }
};
}

/**
 * 渲染表格
@@ -463,7 +493,17 @@
            title: '检验结果',
            align: 'center',
            width: '10%',
            edit: 'text'
            templet: function (item) {
                if (item.result == null) {
                    return "";
                }
                if (item.result == '0') {
                    return "不合格";
                }
                if (item.result == '1') {
                    return "合格";
                }
            }
        }, {
            field: 'remarks',
            title: '备注说明',
@@ -645,13 +685,13 @@
        "border-bottom": "2px solid #53adce",
        "background": "#eff4f6"
    });
};
}

// 表单清空
function resetForm() {
    $("#form-param")[0].reset();
    form.render();
};
}

/**
 * 弹出提醒框

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

@@ -7,6 +7,7 @@
var timerWeight;
var paramIntelCard;//设备识别结果
var paramIdCard;//设备识别结果
var curCheckItems = null;// 当前数据的检查项信息
var step = 1;

$(function () {
@@ -491,5 +492,134 @@

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

    // 获取化验项信息
    flushCheckItem();

    layer.open({
        type: 1,
        title: "质检详细",
        offset: ['120px', '100px'],
        area: ['1000px', '520px'],
        shade: 0,
        content: $('#checkDetail'),
        btnAlign: 'c',
        btn: ['取消'],
        yes: function () {
            layer.closeAll();
        },
        closeBtn: 0
    });
}

/**
 * 刷新化验结果项
 */
function flushCheckItem() {

    curCheckItems = null;
    $.ajax({
        type: "POST",
        url: "../../basic/inout/get-check-item",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify(recordData),
        success: function (result) {
            if (result.code != "0000") {
                layer.msg(result.msg);
            } else {
                curCheckItems = result.data;

                // 页面渲染检测项
                renderTableCheckItem();
            }
        },
        error: function () {
            layer.msg("后台异常，请重试或者联系管理员！！");
        }
    });
}

/**
 * 渲染表格
 */
function renderTableCheckItem() {
    // 清空数据
    $("#tableCheckItem").empty();
    table.render({
        elem: '#tableCheckItem',
        data: curCheckItems,
        page: false,
        even: true,
        cols: [[{
            field: 'standardName',
            title: '检验项目',
            align: 'center',
            width: '13%'
        }, {
            field: 'value',
            title: '检验值',
            align: 'center',
            width: '9%'
        }, {
            field: 'operaSymbolValue',
            title: '标准值',
            align: 'center',
            width: '10%'
        }, {
            field: 'unit',
            title: '单位',
            align: 'center',
            width: '10%'
        }, {
            field: 'deNum',
            title: '扣重',
            align: 'center',
            width: '9%'
        }, {
            field: 'addNum',
            title: '增重',
            align: 'center',
            width: '9%'
        }, {
            field: 'dePrice',
            title: '扣价',
            align: 'center',
            width: '9%'
        }, {
            field: 'addPrice',
            title: '增价',
            align: 'center',
            width: '9%'
        }, {
            field: 'result',
            title: '检验结果',
            align: 'center',
            width: '10%',
            templet: function (item) {
                if (item.result == null) {
                    return "";
                }
                if (item.result == '0') {
                    return "不合格";
                }
                if (item.result == '1') {
                    return "合格";
                }
            }
        }, {
            field: 'remarks',
            title: '备注说明',
            align: 'center'
        }]]
    });

    $("thead tr").css({
        "border-bottom": "2px solid #53adce",
        "background": "#eff4f6"
    });
}

 igds-web/src/main/resources/templates/admin/inout/in-check.html

@@ -464,7 +464,7 @@
            <div class="layui-form-item">
                <label class="layui-form-label red">粮食等级</label>
                <div class="layui-input-block">
                    <select id="foodLevel" name="foodLevel" lay-filter="foodLevel">
                    <select id="foodLevel" name="foodLevel" lay-filter="select_foodLevel">
                        <option value=""></option>
                        <option th:each="dic,dicSet:${listFoodLevel}"
                                th:value="${dic.code}" th:text="${dic.name}"></option>
@@ -498,16 +498,19 @@
                <span style="font-weight: bold; margin-right: 10px;">备注说明：1.结果判定：系统根据各化验项结果判定，最后化验结果需手动选择确认；2.核算定价：根据化验项配置计算相关增扣价，最后单价需手动确认。</span>
            </div>
        </div>
        <div class="layui-col-xs12">
            <blockquote class="layui-elem-quote">
        <div class="layui-col-xs6">
            <blockquote class="layui-elem-quote" style="width: 95%;float: left;">
                <div>
                    <span style="font-weight: bold; margin-right: 10px;">系统判定：</span>
                    <span id="check-result-tip" style="margin-right: 25px;">化验结果#； 收粮单价：#元/公斤</span>
                    <span id="check-result-msg" style="margin-right: 25px;color: red;float: right;">
                         <button style="margin-top: -6px;" class="rkbk-quick-btn layui-btn btn-blue" onclick="checkReset()">
                            <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>核算定价
                        </button>
                    </span>
                    <span style="font-weight: bold; margin-right: 10px;">结果判定：</span>
                    <span id="check-result-tip" style="margin-right: 25px;">化验结果：</span>
                </div>
            </blockquote>
        </div>
        <div class="layui-col-xs6">
            <blockquote class="layui-elem-quote"  style="width: 95%;float: right;">
                <div>
                    <span style="font-weight: bold; margin-right: 10px;">定价判定：</span>
                    <span id="check-result-tip2" style="margin-right: 25px;">收粮单价：#元/公斤</span>
                </div>
            </blockquote>
        </div>

 igds-web/src/main/resources/templates/admin/inout/in-weight.html

@@ -126,7 +126,12 @@
            width: 130px;
            height: 28px;
        }

        .layui-table, .layui-table-view {
            margin: 0 0;
        }
        .layui-table-body {
            max-height: 350px;
        }
    </style>

</head>
@@ -726,6 +731,42 @@
           lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
</div>

<!-- 质检信息 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
    <!-- 化验结果信息 -->
    <table class="layui-table tableCheckItem" id="tableCheckItem"
           lay-filter="tableCheckItem">
        <colgroup>
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="10%">
            <col width="">
        </colgroup>
        <thead>
        <tr class="qyzj-table-tit">
            <th>检验项目</th>
            <th>检验值</th>
            <th>标准值</th>
            <th>单位</th>
            <th>扣重</th>
            <th>增重</th>
            <th>扣价</th>
            <th>增价</th>
            <th>检验结果</th>
            <th>备注</th>
        </tr>
        </thead>
        <tbody>
        </tbody>
    </table>

</div>

<!-- 弹出框的信息 -->
<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">