#

mrzhssss

2022-10-26 6599114495a190322f93b65e4124c31d50953a12

#

 src/main/java/com/zy/asrs/entity/Mat.java

@@ -306,6 +306,16 @@
    @ExcelProperty(value = "备注")
    private String memo;

    @TableField("store_max")
    private Double storeMax;

    @TableField("store_min")
    private Double storeMin;

    @TableField("store_max_date")
    private Integer storeMaxDate;


    public Mat() {}

    public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -492,4 +502,28 @@
    }


    public String getStoreMax$(){
        if (Cools.isEmpty(this.storeMax)) {
            return "未设置";
        }else {
            return this.storeMax + "";
        }
    }

    public String getStoreMin$(){
        if (Cools.isEmpty(this.storeMin)) {
            return "未设置";
        }else {
            return this.storeMin + "";
        }
    }

    public String getStoreMaxDate$(){
        if (Cools.isEmpty(this.storeMaxDate)) {
            return "未设置";
        }else {
            return this.storeMaxDate + "天";
        }
    }

}

 src/main/resources/mapper/MatMapper.xml

@@ -42,8 +42,10 @@
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="memo" property="memo" />

        <result column="stock" property="stock" />
        <result column="store_max" property="storeMax" />
        <result column="store_min" property="storeMin" />
        <result column="store_max_date" property="storeMaxDate" />
    </resultMap>

    <select id="listByPage" resultMap="BaseResultMap">

 src/main/webapp/static/js/common.js

@@ -219,6 +219,9 @@
    ,{field: 'updateBy$', align: 'center',title: '修改人员', hide: true}
    ,{field: 'updateTime$', align: 'center',title: '修改时间', hide: true}
    ,{field: 'memo', align: 'center',title: '备注', hide: true}
    ,{field: 'storeMax$', align: 'center',title: '库存上限'}
    ,{field: 'storeMin$', align: 'center',title: '库存下限'}
    ,{field: 'storeMaxDate$', align: 'center',title: '最大滞留时间'}
]

var detlCols = [

 src/main/webapp/views/mat/mat.html

@@ -197,13 +197,19 @@
                        <input name="maktx" placeholder="请输入商品名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">备注</label>
                    <label class="layui-form-label">库存上限</label>
                    <div class="layui-input-block">
                        <input name="memo" placeholder="请输入备注" class="layui-input">
                        <input name="storeMax" placeholder="库存上限" type="number" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">滞留时间</label>
                    <div class="layui-input-block">
                        <input name="storeMaxDate" placeholder="最大滞留时间(天)" type="number" class="layui-input">
                    </div>
                </div>


            </div>

@@ -222,6 +228,21 @@
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">库存下限</label>
                    <div class="layui-input-block">
                        <input name="storeMin" placeholder="库存下线" type="number" class="layui-input">
                    </div>
                </div>


                <div class="layui-form-item">
                    <label class="layui-form-label">备注</label>
                    <div class="layui-input-block">
                        <input name="memo" placeholder="请输入备注" class="layui-input">
                    </div>
                </div>

            </div>
        </div>
        <hr class="layui-bg-gray">