From 539c640ad09e691b461f5eb76d55e04446c6d549 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期一, 29 五月 2023 08:34:55 +0800 Subject: [PATCH] 出库作业-提取商品显示上架区域 --- src/main/java/com/zy/asrs/entity/LocDetl.java | 12 ++++++++++++ src/main/resources/mapper/LocDetlMapper.xml | 3 +++ src/main/webapp/views/pakStore/locDetlQuery.html | 10 ++++++++++ src/main/webapp/static/js/common.js | 1 + src/main/java/com/zy/asrs/entity/LocMast.java | 10 +++++----- 5 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index 760adbd..b9b4124 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/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); } diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java index 92eb5ac..04b4eea 100644 --- a/src/main/java/com/zy/asrs/entity/LocMast.java +++ b/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); } diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index ce393d8..6726429 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/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"> diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 5839c02..1920a7b 100644 --- a/src/main/webapp/static/js/common.js +++ b/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) diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html index 6babd7e..c39f5df 100644 --- a/src/main/webapp/views/pakStore/locDetlQuery.html +++ b/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"> -- Gitblit v1.9.1