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 be15022f..8c2018de 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -650,7 +650,8 @@ public class MaterialController { UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); if (map.containsKey("id")) { String s = map.get("id").toString(); - String key = "WMS_temporaryValue" + userByPort.getNumber(); + String type = map.get("type").toString(); + String key = "WMS_temporaryValue_"+type+ userByPort.getNumber(); List range = redisTemplate.opsForList().range(key, 0, -1); if (range != null) { if (!range.contains(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 61fa5e12..c1df23b9 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -2808,7 +2808,7 @@ public class PageController { token = (String) request.getSession().getAttribute("userToken"); } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); - List range = redisTemplateForHash.boundListOps("WMS_temporaryValue" + userToken.getNumber()).range(0, -1); + List range = redisTemplateForHash.boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1); if (range.size() > 0) { List result = new ArrayList<>(); for (String value : range diff --git a/src/main/resources/templates/pages/depository/Inventory-view.html b/src/main/resources/templates/pages/depository/Inventory-view.html index 2e4ff79c..44c6c634 100644 --- a/src/main/resources/templates/pages/depository/Inventory-view.html +++ b/src/main/resources/templates/pages/depository/Inventory-view.html @@ -190,24 +190,11 @@ }); applicationOut = function () { - /*var index = layer.open({ - title: '出库申请', - type: 2, - shade: 0.2, - maxmin: true, - shadeClose: true, - area: ['100%', '100%'], - content: '/application_out_back?code=' + $("#code").val() + "&depositoryId=" + $("#depositoryId").val() - }); - $(window).on("resize", function () { - layer.full(index); - });*/ - // 暂存当前选择的库存记录 $.ajax({ url: "/material/temporaryValue", type: "post", dataType: 'json', - data: JSON.stringify({"id": $("#id").val()}), + data: JSON.stringify({"id": $("#id").val(),"type":"Out"}), contentType: "application/json;charset=utf-8", success: function (d) { miniTab.openNewTabByIframeNew({ @@ -216,7 +203,7 @@ }); } - }) + }); return false; };