Browse Source

修改移动端库存查询跳转到出库申请页面

lwx_dev
erdanergou 3 years ago
parent
commit
96edc9dd8a
  1. 3
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  2. 2
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 17
      src/main/resources/templates/pages/depository/Inventory-view.html

3
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java

@ -650,7 +650,8 @@ public class MaterialController {
UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
if (map.containsKey("id")) { if (map.containsKey("id")) {
String s = map.get("id").toString(); 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<String> range = redisTemplate.opsForList().range(key, 0, -1); List<String> range = redisTemplate.opsForList().range(key, 0, -1);
if (range != null) { if (range != null) {
if (!range.contains(s)) { if (!range.contains(s)) {

2
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@ -2808,7 +2808,7 @@ public class PageController {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
List<String> range = redisTemplateForHash.boundListOps("WMS_temporaryValue" + userToken.getNumber()).range(0, -1); List<String> range = redisTemplateForHash.boundListOps("WMS_temporaryValue_Out" + userToken.getNumber()).range(0, -1);
if (range.size() > 0) { if (range.size() > 0) {
List<Inventory> result = new ArrayList<>(); List<Inventory> result = new ArrayList<>();
for (String value : range for (String value : range

17
src/main/resources/templates/pages/depository/Inventory-view.html

@ -190,24 +190,11 @@
}); });
applicationOut = function () { 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({ $.ajax({
url: "/material/temporaryValue", url: "/material/temporaryValue",
type: "post", type: "post",
dataType: 'json', dataType: 'json',
data: JSON.stringify({"id": $("#id").val()}), data: JSON.stringify({"id": $("#id").val(),"type":"Out"}),
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success: function (d) { success: function (d) {
miniTab.openNewTabByIframeNew({ miniTab.openNewTabByIframeNew({
@ -216,7 +203,7 @@
}); });
} }
}) });
return false; return false;
}; };

Loading…
Cancel
Save