From dbb98db416ecb1cd460978c31a7ee33ac7264664 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 18 四月 2025 14:57:05 +0800 Subject: [PATCH] * --- src/main/webapp/views/locMast/locMast.html | 18 ++-- src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 21 +++++ src/main/java/com/zy/asrs/controller/LocMastController.java | 57 +++++++++++--- src/main/resources/mapper/LocMastMapper.xml | 53 +++++++++++++ src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 30 +++++++ src/main/java/com/zy/asrs/service/LocMastService.java | 20 +++++ 6 files changed, 178 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java index 7b37390..b56e0dd 100644 --- a/src/main/java/com/zy/asrs/controller/LocMastController.java +++ b/src/main/java/com/zy/asrs/controller/LocMastController.java @@ -58,11 +58,40 @@ @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ - excludeTrash(param); - EntityWrapper<LocMast> wrapper = new EntityWrapper<>(); - convert(param, wrapper); - if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} - return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper.eq("STATUS",0))); + + try{ + String locNo = null; + long whsType = 0L; + Integer crnNo = 0; + Integer row1 = 0; + Integer bay1 = 0; + Integer lev1 = 0; + for (Map.Entry<String, Object> entry : param.entrySet()) { + String val = String.valueOf(entry.getValue()); + if (Cools.isEmpty(val)) { + continue; + } + if (entry.getKey().equals("whsType")) { + whsType = Long.getLong(val); + }else if (entry.getKey().equals("locNo")) { + locNo = val; + }else if (entry.getKey().equals("crnNo")) { + crnNo = Integer.getInteger(val); + }else if (entry.getKey().equals("row1")) { + row1 = Integer.getInteger(val); + }else if (entry.getKey().equals("bay1")) { + bay1 = Integer.getInteger(val); + }else if (entry.getKey().equals("lev1")) { + lev1 = Integer.getInteger(val); + } + } + List<LocMast> locMastList = locMastService.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,0,10); + Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList); + page.setTotal(locMastService.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1)); + return R.ok(page); + }catch (Exception e){ + return R.error("寮傚父" + e); + } } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ @@ -116,15 +145,19 @@ @RequestMapping(value = "/locMastQuery/auth") @ManagerAuth public R query(String condition) { - EntityWrapper<LocMast> wrapper = new EntityWrapper<>(); - wrapper.like("loc_no", condition); - Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper); + + List<LocMast> locMastList = locMastService.selectLocMastList(condition,0,10); + Page<LocMast> page = new Page<LocMast>(0,10).setRecords(locMastList); + page.setTotal(locMastService.selectLocMastListTotal(condition)); + List<Map<String, Object>> result = new ArrayList<>(); for (LocMast locMast : page.getRecords()){ - Map<String, Object> map = new HashMap<>(); - map.put("id", locMast.getLocNo()); - map.put("value", locMast.getLocNo()); - result.add(map); + if (!Cools.isEmpty(locMast)){ + Map<String, Object> map = new HashMap<>(); + map.put("id", locMast.getLocNo()); + map.put("value", locMast.getLocNo()); + result.add(map); + } } return R.ok(result); } diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java index 59e9fed..fff410c 100644 --- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java +++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java @@ -13,6 +13,36 @@ @Repository public interface LocMastMapper extends BaseMapper<LocMast> { + + /** + * 搴撲綅妯$硦鏌ヨ搴撲綅鍙� + */ + List<LocMast> selectLocMastListSix(@Param("locNo") String locNo, + @Param("whsType") Long whsType, + @Param("crnNo") Integer crnNo, + @Param("row1") Integer row1, + @Param("bay1") Integer bay1, + @Param("lev1") Integer lev1, + @Param("pageNumber") Integer curr, + @Param("pageSize") Integer limit); + + /** + * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 + */ + Long selectLocMastListTotalSix(@Param("locNo") String locNo, + @Param("whsType") Long whsType, + @Param("crnNo") Integer crnNo, + @Param("row1") Integer row1, + @Param("bay1") Integer bay1, + @Param("lev1") Integer lev1); + + + List<LocMast> selectLocMastList(@Param("locNo") String locNo, + @Param("pageNumber") Integer curr, + @Param("pageSize") Integer limit); + + Long selectLocMastListTotal(@Param("locNo") String locNo); + // @Select("select distinct row1 from "SOURCE"."asr_loc_mast" where crn_no = #{crnNo}") @Select("select row1 from ( select distinct row1 from \"SOURCE\".\"asr_loc_mast\" where crn_no = #{crnNo} ) a " + "order by case row1 when 1 then 1 when 2 then 0 when 3 then 0 when 4 then 1 " + diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java index 5e75f6b..775a3aa 100644 --- a/src/main/java/com/zy/asrs/service/LocMastService.java +++ b/src/main/java/com/zy/asrs/service/LocMastService.java @@ -9,6 +9,26 @@ public interface LocMastService extends IService<LocMast> { /** + * 搴撲綅妯$硦鏌ヨ搴撲綅鍙� + */ + List<LocMast> selectLocMastListSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1, Integer curr, Integer limit); + + /** + * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 + */ + Long selectLocMastListTotalSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1); + + /** + * 搴撲綅妯$硦鏌ヨ搴撲綅鍙� + */ + List<LocMast> selectLocMastList(String locNo, Integer curr, Integer limit); + + /** + * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 + */ + Long selectLocMastListTotal(String locNo); + + /** * 鍫嗗灈鏈哄搴旂殑鎺掑彿闆嗗悎 */ List<Integer> queryDistinctRow(Integer crnNo); diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java index ef957cb..15a4fc0 100644 --- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java @@ -32,6 +32,27 @@ private ApiLogService apiLogService; @Override + public List<LocMast> selectLocMastListSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1,Integer curr,Integer limit) { + return this.baseMapper.selectLocMastListSix(locNo,whsType,crnNo,row1,bay1,lev1,curr,limit); + } + + @Override + public Long selectLocMastListTotalSix(String locNo,Long whsType,Integer crnNo,Integer row1,Integer bay1,Integer lev1) { + return this.baseMapper.selectLocMastListTotalSix(locNo,whsType,crnNo,row1,bay1,lev1); + } + + @Override + public List<LocMast> selectLocMastList(String locNo,Integer curr,Integer limit) { + return this.baseMapper.selectLocMastList(locNo,curr,limit); + } + + @Override + public Long selectLocMastListTotal(String locNo) { + return this.baseMapper.selectLocMastListTotal(locNo); + } + + + @Override public List<Integer> queryDistinctRow(Integer crnNo) { return this.baseMapper.queryDistinctRow(crnNo); } diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml index 2c70150..6c4385a 100644 --- a/src/main/resources/mapper/LocMastMapper.xml +++ b/src/main/resources/mapper/LocMastMapper.xml @@ -42,6 +42,59 @@ </resultMap> + <sql id="batchSeq"> + <if test="locNo != null and locNo != ''"> + and LOC_NO like '%' + #{locNo} + '%' + </if> + <if test="whsType != null and whsType != 0"> + and WHS_TYPE = #{whsType} + </if> + <if test="crnNo != null and crnNo != 0"> + and CRN_NO = #{crnNo} + </if> + <if test="row1 != null and row1 != 0"> + and ROW1 = #{row1} + </if> + <if test="bay1 != null and bay1 != 0"> + and BAY1 = #{bay1} + </if> + <if test="lev1 != null and lev1 != 0"> + and LEV1 = #{lev1} + </if> + </sql> + + <select id="selectLocMastListSix" resultMap="BaseResultMap"> + SELECT * FROM "SOURCE"."sys_role" + WHERE 1=1 + <include refid="batchSeq"></include> + ORDER BY ID DESC + LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize}); + </select> + + <select id="selectLocMastListTotalSix" resultType="Long"> + SELECT count(1) FROM "SOURCE"."sys_role" + WHERE 1=1 + <include refid="batchSeq"></include> + </select> + + <select id="selectLocMastList" resultMap="BaseResultMap"> + SELECT * FROM "SOURCE"."sys_role" + WHERE 1=1 + <if test="locNo != null and locNo != ''"> + and LOC_NO like '%' + #{locNo} + '%' + </if> + ORDER BY ID DESC + LIMIT #{pageSize} OFFSET ((#{pageNumber} - 1) * #{pageSize}); + </select> + + <select id="selectLocMastListTotal" resultType="Long"> + SELECT count(1) FROM "SOURCE"."sys_role" + WHERE 1=1 + <if test="locNo != null and locNo != ''"> + and LOC_NO like '%' + #{locNo} + '%' + </if> + </select> + <select id="queryFreeLocMast" resultMap="BaseResultMap"> select top 1 * from "SOURCE"."asr_loc_mast" diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html index bc9a91f..56f0abc 100644 --- a/src/main/webapp/views/locMast/locMast.html +++ b/src/main/webapp/views/locMast/locMast.html @@ -60,15 +60,15 @@ <input class="layui-input" type="text" name="lev1" placeholder="灞�" autocomplete="off"> </div> </div> - <div class="layui-inline"> - <div class="layui-input-inline"> - <select class="layui-input" id="loc_type1" name="loc_type1" autocomplete="off"> - <option value>閫夋嫨妗剁被鍨�</option> - <option value="1">娌规《</option> - <option value="2">鍑�妗�</option> - </select> - </div> - </div> +<!-- <div class="layui-inline">--> +<!-- <div class="layui-input-inline">--> +<!-- <select class="layui-input" id="loc_type1" name="loc_type1" autocomplete="off">--> +<!-- <option value>閫夋嫨妗剁被鍨�</option>--> +<!-- <option value="1">娌规《</option>--> +<!-- <option value="2">鍑�妗�</option>--> +<!-- </select>--> +<!-- </div>--> +<!-- </div>--> <!-- 寰呮坊鍔� --> <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block"> <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button> -- Gitblit v1.9.1