diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java index dfb7b9a1..529cc089 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -651,12 +651,12 @@ public class MaterialController { if (map.containsKey("id")) { String s = map.get("id").toString(); String type = map.get("type").toString(); - String key = "WMS_temporaryValue_"+type+ userByPort.getNumber(); + String key = "WMS_temporaryValue_" + type + userByPort.getNumber(); List range = redisTemplate.opsForList().range(key, 0, -1); if (range != null) { if (!range.contains(s)) { - redisTemplate.opsForList().rightPush(key,s); - redisTemplate.expire(key,DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); + redisTemplate.opsForList().rightPush(key, s); + redisTemplate.expire(key, DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); } } return new RestResponse(); @@ -665,6 +665,37 @@ public class MaterialController { } } + @PostMapping("/getTemporaryValue") + public RestResponse getTemporaryValue(@RequestBody Map map, HttpServletRequest request) { + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); + if (map.containsKey("type")) { + String type = map.get("type").toString(); + String key = "WMS_temporaryValue_" + type + userByPort.getNumber(); + List range = redisTemplate.opsForList().range(key, 0, -1); + List result = new ArrayList<>(); + if (range != null && range.size() > 0) { + for (String value : + range) { + if ("".equals(value)) { + continue; + } + Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toInteger(value)); + List splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid()); + inventoryById.setSplitInfoList(splitInfoByMid); + result.add(inventoryById); + } + } + return new RestResponse(result); + } else { + return CrudUtil.insertHandle(-1, 0); + } + } + + @PostMapping("/delTemporaryValue") public void delTemporaryValue(@RequestBody Map map, HttpServletRequest request) { String token = request.getHeader("user-token"); @@ -675,7 +706,7 @@ public class MaterialController { if (map.containsKey("id")) { String s = map.get("id").toString(); String type = map.get("type").toString(); - redisTemplate.opsForList().remove("WMS_temporaryValue_"+type + userByPort.getNumber(), 0, s); + redisTemplate.opsForList().remove("WMS_temporaryValue_" + type + userByPort.getNumber(), 0, s); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index 61ad26aa..4b32a3c0 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2752,18 +2752,6 @@ public class PageController { // 获取当前key值存储在redis中的值 List range = redisTemplateForHash.opsForList().range("WMS_temporaryValue_In" + userByPort.getNumber(), 0, -1); if( range != null && range.size() > 0){ - List result = new ArrayList<>(); - for (String value: - range ) { - if("".equals(value)){ - continue; - } - Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toInteger(value)); - List splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid()); - inventoryById.setSplitInfoList(splitInfoByMid); - result.add(inventoryById); - } - mv.addObject("inventoryList", JSONObject.toJSONString(result)); mv.setViewName("pages/application/application-in_temporaryValue"); }else{ mv.setViewName("pages/application/application-in"); @@ -2819,19 +2807,6 @@ public class PageController { UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List range = redisTemplateForHash.boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); if (range != null && range.size() > 0) { - List result = new ArrayList<>(); - for (String value : range - ) { - if ("".equals(value)) { - continue; - } - Inventory inventoryById = materialService.findInventoryById(ObjectFormatUtil.toInteger(value)); - List splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryById.getMid()); - inventoryById.setSplitInfoList(splitInfoByMid); - result.add(inventoryById); - - } - mv.addObject("inventoryList", JSONObject.toJSONString(result)); mv.setViewName("pages/application/application-out_temporaryValue"); Integer role = userToken.getIsadmin(); if (role == null) { diff --git a/src/main/resources/templates/pages/application/application-in_temporaryValue.html b/src/main/resources/templates/pages/application/application-in_temporaryValue.html index 99e6eabc..d749b76f 100644 --- a/src/main/resources/templates/pages/application/application-in_temporaryValue.html +++ b/src/main/resources/templates/pages/application/application-in_temporaryValue.html @@ -46,7 +46,6 @@