From 3f9d31f6b6500c663c8f2a7d227226f8ed95e025 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Tue, 25 Apr 2023 13:35:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaterialController.java | 55 +- .../controller/PageController.java | 27 +- .../controller/UserController.java | 2 +- .../mapper/MaterialMapper.xml | 6 - .../service/impl/ExcelServiceImpl.java | 47 +- .../service/impl/MaterialServiceImpl.java | 6 +- src/main/resources/redisson-config.yml | 4 +- .../static/images/materialTypeCreate.ico | Bin 5441 -> 5452 bytes .../static/js/JcPrinter/layer/mobile/layer.js | 76 +- ...lication-in_temporaryValueForMaterial.html | 1107 +++++++++++++++++ .../depository/Inventory-view_mobile.html | 46 +- .../pages/depository/table-out_mobile.html | 10 +- .../pages/depository/table-stock.html | 66 +- .../pages/material/material-out.html | 74 +- .../pages/materialtype/materialType_view.html | 61 +- .../templates/pages/split/split_edit.html | 2 +- 16 files changed, 1431 insertions(+), 158 deletions(-) create mode 100644 src/main/resources/templates/pages/application/application-in_temporaryValueForMaterial.html 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 b2e2f7f5..df20900d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -618,7 +618,8 @@ public class MaterialController { } } return new RestResponse(); - } else { + } + else { return CrudUtil.insertHandle(-1, 0); } } @@ -660,6 +661,41 @@ public class MaterialController { return CrudUtil.insertHandle(-1, 0); } } + @PostMapping("/getTemporaryValueForMaterial") + public RestResponse getTemporaryValueForMaterial(@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; + } + // 获取当前用户可见的仓库 + List depositoryList = new ArrayList<>(); + Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(value)); + Depository depository = new Depository(); + depositoryList.add(depository); + List splitInfoByMid = splitUnitService.findSplitInfoByMid(materialById.getId()); + materialById.setSplitInfoList(splitInfoByMid); + materialById.setDepositoryList(depositoryList); + result.add(materialById); + } + } + return new RestResponse(result); + } else { + return CrudUtil.insertHandle(-1, 0); + } + } @PostMapping("/delTemporaryValue") @@ -685,8 +721,23 @@ public class MaterialController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); + if (map.containsKey("mids")) { + String[] mids = map.get("mids").toString().split(","); + String type = map.get("type").toString(); + String key = "WMS_temporaryValue_" + type + userByPort.getNumber(); + List range = redisTemplate.opsForList().range(key, 0, -1); + if (range != null) { + for (String s : mids) { + if (!range.contains(s)) { + redisTemplate.opsForList().rightPush(key, s); + redisTemplate.expire(key, DateUtil.getSecondsNextEarlyMorning(), TimeUnit.SECONDS); + } + } + + } + return new RestResponse(); + } // 存入mids - redisTemplate.opsForValue().set("temporaryValueForMaterial" + userByPort.getNumber(), JSONObject.toJSONString(map)); return new RestResponse(200); } 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 9adbae7e..d5c3e400 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2783,32 +2783,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); - String scanQrCodeValue = redisTemplate.opsForValue().get("temporaryValueForMaterial" + userByPort.getNumber()).toString(); - redisTemplate.delete("temporaryValueForMaterial" + userByPort.getNumber()); - JSONObject jsonObject = JSONObject.parseObject(scanQrCodeValue); - JSONArray mids = (JSONArray) jsonObject.get("mids"); - List materialList = new ArrayList<>(); - for (Object mid : mids) { - Map param = new HashMap<>(); - Integer o = ObjectFormatUtil.toInteger(mid); - MaterialP mp = new MaterialP(materialService.findMaterialById(o)); - List splitInfoByMid = splitUnitService.findSplitInfoByMid(mp.getId()); - param.put("mid", mp.getId()); - param.put("mname", mp.getMname()); - param.put("code", mp.getCode()); - param.put("price", mp.getPrice() != null ? mp.getPrice() : 0); - param.put("version", mp.getVersion()); - param.put("codeFlag", 1); - List materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param); - param.put("materialAndBarCodeList", materialByBarCodeByCondition); - param.put("splitList", splitInfoByMid); - param.put("unit", mp.getUnit()); - String context = JSONObject.toJSONString(param); - materialList.add(context); - } - - mv.addObject("materialList", materialList); - mv.setViewName("pages/application/application-in_scanQrCode"); + mv.setViewName("pages/application/application-in_temporaryValueForMaterial"); return mv; } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java index 9e112a30..b8fd7030 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/UserController.java @@ -164,7 +164,7 @@ public class UserController { String userToken = (String) data.get("token"); String keyAndToken = userkey + "&" + userToken; - UserByPort userinfo = JSONObject.toJavaObject((JSONObject) data.get("userinfo"), UserByPort.class); + UserByPort userinfo = JSONObject.toJavaObject((JSONObject) data.get("usercont"), UserByPort.class); // 将key与token暂存至池中保存 UserKeyAndTokenPool.addKeyAndToken(userinfo.getNumber(), keyAndToken); diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml index 7aeee296..be07644f 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/MaterialMapper.xml @@ -212,9 +212,6 @@ and mname = #{mname} - - and version is null - and version = #{version} @@ -503,9 +500,6 @@ and version = #{version} - - and version is null -