添加粮食年份

YYC

2023-07-08 8b874a8b39dc8c5244e7615498af9b5f8d2d9427

添加粮食年份

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

@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ld.igds.check.dto.CheckItemData;
import lombok.Data;

import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -49,6 +50,9 @@
    private String checkId;
    //单价
    private Double price;
    //粮食年份
    private String foodYear;


    /*-----扦样信息-----*/


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

@@ -841,6 +841,7 @@
            data.setCheckTime(new Date());
        }
        curData.setCheckStatus(data.getCheckStatus());
        curData.setFoodYear(data.getFoodYear());


        // 获取下一个流程状态
@@ -860,6 +861,7 @@
        curData.setPrice(data.getPrice());
        curData.setRemarks(data.getRemarks());
        curData.setCheckItems(data.getCheckItems());
        curData.setCheckTime(data.getCheckTime());

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

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

@@ -29,6 +29,13 @@
        });

        laydate.render({
            elem: '#foodYear',
            theme: '#7b8e9f',
            value: foodYear,
            type: 'year'
        });

        laydate.render({
            elem: '#checkTime',
            theme: '#7b8e9f',
            format: 'yyyy-MM-dd HH:mm:ss',

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

@@ -352,6 +352,7 @@
    var listFoodVariety = [[${listFoodVariety}]];
    var startTime = [[${startTime}]];
    var endTime = [[${endTime}]];
    var foodYear = [[${foodYear}]];
    //扦样机信息
    var checkDto = [[${checkDto}]];

@@ -505,7 +506,26 @@
                </div>
            </div>
        </div>
        <div class="layui-col-xs8">
        <div class="layui-col-xs4">
            <div class="layui-form-item">
                <label class="layui-form-label">粮食年份</label>
                <div class="layui-input-block">
                    <input type="text" name="foodYear" placeholder="请输入" autocomplete="off"
                           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 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>
                <div class="layui-input-block">