出库作业-提取商品显示上架区域

Junjie

2023-05-29 539c640ad09e691b461f5eb76d55e04446c6d549

出库作业-提取商品显示上架区域

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

@@ -258,6 +258,18 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getLocType2$() {
        if (Cools.isEmpty(this.locNo)) {
            return "";
        }
        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = locMastService.selectById(this.locNo);
        if (locMast == null) {
            return "";
        }
        return locMast.getLocType2$();
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

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

@@ -94,7 +94,7 @@
    @TableField("loc_type1")
    private Short locType1;

    @ApiModelProperty(value= "宽窄类型{0:未知,1:窄库位,2:宽库位}")
    @ApiModelProperty(value= "上架区域类型{1:单品区,2:高频混放区,3:低频混放区}")
    @TableField("loc_type2")
    private Short locType2;

@@ -238,12 +238,12 @@
    public String getLocType2$() {
        if (null == this.locType2){ return null; }
        switch (this.locType2){
            case 0:
                return "未知";
            case 1:
                return "窄库位";
                return "单品区";
            case 2:
                return "宽库位";
                return "高频混放区";
            case 3:
                return "低频混放区";
            default:
                return String.valueOf(this.locType2);
        }

 src/main/resources/mapper/LocDetlMapper.xml

@@ -111,6 +111,9 @@
        <if test="startTime!=null and endTime!=null">
            and a.modi_time between #{startTime} and #{endTime}
        </if>
        <if test="locType2!=null and locType2!='' ">
            and b.loc_type2 = #{locType2}
        </if>
    </sql>

    <sql id="groupListCondition">

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

@@ -262,6 +262,7 @@
    ,{field: 'check$', align: 'center',title: '要求检验', hide: true}
    ,{field: 'danger$', align: 'center',title: '危险品', hide: true}
    ,{field: 'memo', align: 'center',title: '备注', hide: false}
    ,{field: 'locType2$', align: 'center',title: '上架区域', width: 90}
]

function getQueryVariable(variable)

 src/main/webapp/views/pakStore/locDetlQuery.html

@@ -76,6 +76,16 @@
                <input class="layui-input" type="text" name="manu" placeholder="客户信息" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <select name="locType2">
                    <option value="">选择上架区域</option>
                    <option value="1">单品区</option>
                    <option value="2">高频混放区</option>
                    <option value="3">低频混放区</option>
                </select>
            </div>
        </div>
        <!-- 日期范围 -->
        <div class="layui-inline" style="width: 300px">
            <div class="layui-input-inline">