入库--粮食性质

YYC

2023-11-04 3d8dfc3dd31f73dd7ba33d020193f9ab0764fa56

入库--粮食性质

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

@@ -197,6 +197,10 @@
                Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
        view.addObject("listFoodVariety", listFoodVariety);

        // 粮食性质下拉框
        List<DicTrigger> listFoodType = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
        view.addObject("listFoodType", listFoodType);

        // 粮食等级下拉框
        List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
                Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
@@ -288,7 +292,7 @@
        view.addObject("cardDto", conf);

        //称重页面初始化
        inoutManager.initInoutWeight(listInoutConf,sort);
        inoutManager.initInoutWeight(listInoutConf, sort);

        view.setViewName("admin/inout/in-weight");
        return view;
@@ -696,6 +700,7 @@

    /**
     * 根据质检单号获取出入库信息
     *
     * @param param
     * @return
     */
@@ -715,7 +720,7 @@
     */
    @RequestMapping("/submit-checkItem")
    @Transactional
    public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data)throws Exception {
    public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data) throws Exception {
        return inoutManager.submitCheckData(data);
    }


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

@@ -46,6 +46,8 @@
    private String depotId;
    //粮食品种
    private String foodVariety;
    //粮食品种
    private String foodType;
    //质检单号
    private String checkId;
    //单价

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

@@ -901,6 +901,7 @@
        curData.setCheckItems(data.getCheckItems());
        curData.setCheckTime(data.getCheckTime());
        curData.setDepotId(data.getDepotId());
        curData.setFoodType(data.getFoodType());

        if (StringUtils.isEmpty(data.getCheckUser())) {
            curData.setCheckUser(ContextUtil.getLoginUserCName());

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

@@ -24,6 +24,15 @@
        <Property name="label">粮食定价</Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="foodType">
        <Property name="label">粮食性质</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
        </Property>
      </PropertyDef>
      <Reference name="checkItems">
        <Property name="parameter">
          <Entity>
@@ -609,6 +618,11 @@
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">foodType</Property>
              <Property name="property">foodType</Property>
              <Editor/>
            </AutoFormElement>
            <AutoFormElement>
              <Property name="name">sampleUser</Property>
              <Property name="property">sampleUser</Property>
              <Editor/>

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

@@ -80,6 +80,7 @@
        CHECK_STATUS_ AS checkStatus,
        REMARKS_ AS remarks,
        FOOD_YEAR_ AS foodYear,
        FOOD_TYPE_ AS foodType,
        IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
        from
        D_INOUT_RECORD
@@ -115,6 +116,7 @@
            <if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
            <if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
            <if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
            <if test="data.foodType != null">FOOD_Type_ = #{data.foodType},</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>

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

@@ -491,6 +491,11 @@

//保存提交
function submit() {
    console.log(curCheckData)
    if (!curCheckData.sampleUser) {
        layer.alert("请先扦样！！");
        return;
    }
    if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
        layer.alert("请确认化验结果！！");
        return;
@@ -501,6 +506,10 @@
    }
    if (!curCheckData.foodLevel) {
        layer.alert("请确认粮食等级！！");
        return;
    }
    if (!curCheckData.foodType) {
        layer.alert("请确认粮食性质！！");
        return;
    }
    if (!curCheckData.price) {
@@ -618,7 +627,7 @@
        }, {
            field: 'registerTime',
            title: '登记时间',
            width: '15%',
            width: '13%',
            style: 'font-weight: bold'
        }, {
            field: 'sampleStatus',
@@ -643,12 +652,26 @@
        }, {
            field: 'sampleTime',
            title: '扦样时间',
            width: '15%',
            width: '13%',
            style: 'font-weight: bold'
        }, {
            field: 'foodType',
            title: '粮食性质',
            width: '9%',
            templet: function (item) {
                var result = item.foodType;
                $.each(listFoodType, function (index, data) {
                    if (item.foodType == data.code) {
                        result = data.name;
                        return true;
                    }
                });
                return result == null ? "" : result;
            }
        }, {
            field: 'foodVariety',
            title: '粮食品种',
            width: '11%',
            width: '9%',
            templet: function (item) {
                var result = item.foodVariety;
                $.each(listFoodVariety, function (index, data) {
@@ -662,7 +685,7 @@
        }, {
            field: 'depotId',
            title: '装卸仓库',
            width: '11%',
            width: '10%',
            templet: function (item) {
                var result = item.depotId;
                $.each(listDepot, function (index, data) {

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

@@ -350,6 +350,8 @@
    var companyId = [[${loginUser.companyId}]];
    //品种
    var listFoodVariety = [[${listFoodVariety}]];
    //性质
    var listFoodType = [[${listFoodType}]];
    var startTime = [[${startTime}]];
    var endTime = [[${endTime}]];
    var foodYear = [[${foodYear}]];
@@ -515,25 +517,19 @@
                </div>
            </div>
        </div>
        <!--        <div class="layui-col-xs4">-->
        <!--            <div class="layui-form-item">-->
        <!--                <label class="layui-form-label red">粮食年份</label>-->
        <!--                <div class="layui-input-block">-->
        <!--                    <input type="text" name="foodYear" placeholder="请输入"-->
        <!--                           class="layui-input rkbk-search-input bg-date" id="foodYear">-->

        <!--                </div>-->
        <!--            </div>-->
        <!--        </div>-->
        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label">备注说明</label>
                <label class="layui-form-label red">粮食性质</label>
                <div class="layui-input-block">
                    <input type="text" name="remarks" placeholder="请输入内容"
                           class="layui-input">
                    <select id="foodType" name="foodType" lay-filter="select_foodType">
                        <option value=""></option>
                        <option th:each="dic,dicSet:${listFoodType}"
                                th:value="${dic.code}" th:text="${dic.name}"></option>
                    </select>
                </div>
            </div>
        </div>

        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label red">化验结果</label>
@@ -546,6 +542,15 @@
                </div>
            </div>
        </div>
        <div class="layui-col-xs12">
            <div class="layui-form-item">
                <label class="layui-form-label">备注说明</label>
                <div class="layui-input-block">
                    <input type="text" name="remarks" placeholder="请输入内容"
                           class="layui-input">
                </div>
            </div>
        </div>
        <div class="layui-col-xs12" style="margin-bottom: 10px">
            <div style="padding-left: 50px; color: #2ab5ad;">
                <span style="font-weight: bold; margin-right: 10px;">备注说明：1.结果判定：系统根据各化验项结果判定，最后化验结果需手动选择确认；2.核算定价：根据化验项配置计算相关增扣价，最后单价需手动确认。</span>