From eb6e10359141157305ca6a39d524305c583a297e Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 27 Mar 2023 11:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=AB=E7=A0=81=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0=E5=BA=93=E4=BD=8D=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MaterialController.java | 10 + .../controller/PageController.java | 39 ++- .../controller/PlaceController.java | 30 ++ .../service/impl/MaterialServiceImpl.java | 20 +- .../pages/scanQrCode/ScanQrCode.html | 265 +++--------------- .../showInventoryForLocation.html | 246 ++++++++++++++++ .../showInventoryForMaterial.html | 261 +++++++++++++++++ .../pages/scanQrCode/ScanQrCode.html | 265 +++--------------- 8 files changed, 675 insertions(+), 461 deletions(-) create mode 100644 src/main/resources/templates/pages/showInventory/showInventoryForLocation.html create mode 100644 src/main/resources/templates/pages/showInventory/showInventoryForMaterial.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 285f8e00..a60e2dfa 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java @@ -321,6 +321,16 @@ public class MaterialController { return new RestResponse(list); } + /** + * 用于根据物料id获取物料基础信息 + * @param map + * @return + */ + @PostMapping("/findOnlyMaterialById") + public RestResponse findOnlyMaterialById(@RequestBody Map map){ + Material materialById = materialService.findMaterialById(ObjectFormatUtil.toInteger(map.get("id"))); + return new RestResponse(materialById); + } /** * 根据id获取物料 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 f5c8b210..a531ef35 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -339,10 +339,10 @@ public class PageController { } mv.addObject("depositoryCount", depositoryIdList.size()); Integer inventoryCountByDepository = materialService.findInventoryCountByDepository(depositoryIdList); - if(inventoryCountByDepository == null){ + if (inventoryCountByDepository == null) { inventoryCountByDepository = 0; } - mv.addObject("allPrice",(int)(inventoryCountByDepository / 100)); + mv.addObject("allPrice", (int) (inventoryCountByDepository / 100)); mv.addObject("allMaterial", materialService.findMaterialCount(new HashMap<>())); /** * 获取当天日期 @@ -586,7 +586,7 @@ public class PageController { Inventory inventoryById = materialService.findInventoryById(mid); if (inventoryById.getUnit().equals(unit)) { // 如果转移的基础单位 - mv.addObject("quantity", (int)(placeAndMaterialByMidAndPid.getQuantity() / 100)); + mv.addObject("quantity", (int) (placeAndMaterialByMidAndPid.getQuantity() / 100)); } else { // 获取当前的拆单记录 Map paramForSplitInfo = new HashMap<>(); @@ -596,10 +596,10 @@ public class PageController { SplitInfo splitInfo = splitUnitService.findSplitInfoByMidAndUnit(paramForSplitInfo); SplitInventory splitInventory = splitUnitService.findSplitInventoryByIidAndSid(placeAndMaterialByMidAndPid.getId(), splitInfo.getId()); if (splitInventory != null) { - mv.addObject("quantity",(int)(splitInventory.getSaveQuantity() / 100)); + mv.addObject("quantity", (int) (splitInventory.getSaveQuantity() / 100)); } else { int Scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); - mv.addObject("quantity", (int)(inventoryById.getQuantity() * Scale / 100)); + mv.addObject("quantity", (int) (inventoryById.getQuantity() * Scale / 100)); } } mv.addObject("depositoryId", depositoryId); @@ -840,7 +840,7 @@ public class PageController { role = 1; } mv.setViewName("pages/application/application-out"); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(4,role) == 0) { + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(4, role) == 0) { mv.setViewName("pages/applicationForStorageCenter/application-out"); } return mv; @@ -859,7 +859,7 @@ public class PageController { if (role == null) { role = 1; } - if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(4,role) == 0) { + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(4, role) == 0) { mv.setViewName("pages/applicationForStorageCenter/application-out_back"); } InventoryP inventoryP = new InventoryP(); @@ -2088,7 +2088,7 @@ public class PageController { } mv.addObject("gidList", gidList); mv.setViewName("pages/group/applicationOutForGroup"); - if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role,4) == 0) { + if (Integer.compare(userToken.getMaindeparment(), 361) == 0 || Integer.compare(role, 4) == 0) { mv.setViewName("pages/applicationForStorageCenter/applicationOutForGroup"); } return mv; @@ -3025,4 +3025,27 @@ public class PageController { mv.addObject("record", constructionUnitById); return mv; } + + @GetMapping("/toShowInventory") + public ModelAndView toShowInventory(@RequestParam Map param) { + ModelAndView mv = new ModelAndView(); + if (param.containsKey("id")) { + String type = param.get("type"); + mv.addObject("id",param.get("id")); + if("m".equals(type)){ + // 如果是物料 + mv.setViewName("pages/showInventory/showInventoryForMaterial"); + + }else if("d".equals(type) || "p".equals(type)){ + mv.addObject("type",type); + // 如果是位置 + mv.setViewName("pages/showInventory/showInventoryForLocation"); + } + return mv; + + } else { + throw new MyException("缺少必要参数"); + } + } + } diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java index db10ba0d..05c3f317 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PlaceController.java @@ -484,4 +484,34 @@ public class PlaceController { } return new RestResponse(result); } + + + @PostMapping("/findLocationById") + public RestResponse findLocationById(@RequestBody Map map) { + if (map.containsKey("id") && map.containsKey("type")) { + String type = map.get("type"); + String id = map.get("id"); + if ("d".equals(type)) { + // 如果是仓库 + Depository depositoryById = depositoryService.findDepositoryById(ObjectFormatUtil.toInteger(id)); + return new RestResponse(depositoryById); + } else if ("p".equals(type)) { + // 如果是库位 + Place placeById = placeService.findPlaceById(ObjectFormatUtil.toInteger(id)); + if (placeById != null) { + PlaceP placeP = new PlaceP(placeById); + Depository depositoryById = depositoryService.findDepositoryById(placeById.getDid()); + placeP.setDepositoryName(depositoryById.getDname()); + placeP.setDepositoryCode(depositoryById.getCode()); + return new RestResponse(placeP); + } else { + return new RestResponse(placeById); + } + } else { + return new RestResponse(null); + } + } else { + throw new MyException("缺少必要参数"); + } + } } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java index dba2267b..2ba313e8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java @@ -438,17 +438,19 @@ public class MaterialServiceImpl implements MaterialService { @Override public Material findMaterialById(int id) { Material material = materialMapper.findMaterialById(id); - if (material.getMaterialTypeId() != null) { - MaterialType materialTypeByOldId = materialTypeMapper.findMaterialTypeByOldId(material.getMaterialTypeId()); - material.setTypeName(materialTypeByOldId.getTname()); - } - if (material.getPrice() != null) { + if(material != null) { + if (material.getMaterialTypeId() != null) { + MaterialType materialTypeByOldId = materialTypeMapper.findMaterialTypeByOldId(material.getMaterialTypeId()); + material.setTypeName(materialTypeByOldId.getTname()); + } + if (material.getPrice() != null) { - material.setPrice(material.getPrice() / 100); - } else { - material.setPrice(0.0); + material.setPrice(material.getPrice() / 100); + } else { + material.setPrice(0.0); + } + material.setAmounts(material.getPrice() * material.getQuantity()); } - material.setAmounts(material.getPrice() * material.getQuantity()); return material; } diff --git a/src/main/resources/templates/pages/scanQrCode/ScanQrCode.html b/src/main/resources/templates/pages/scanQrCode/ScanQrCode.html index a7c1881e..54998897 100644 --- a/src/main/resources/templates/pages/scanQrCode/ScanQrCode.html +++ b/src/main/resources/templates/pages/scanQrCode/ScanQrCode.html @@ -17,33 +17,6 @@ - @@ -53,21 +26,26 @@ function outboundLogic() { }; + function temporaryScanValue() { } + function chooseInOrOut() { } - var materialList = [], - depository= null, - place=null; - let params = {}; // 用于暂存扫描结果 - - + var material = null, + depository = null, + place = null; + let wxScan = parent; layui.$(function () { - parent.wx.scanQRCode({ + if (wxScan.wx === undefined) { + wxScan = wxScan.parent.wx; + } else { + wxScan = wxScan.wx; + } + wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 @@ -84,8 +62,7 @@ } } }); - }) - + }); outboundLogic = function (req) { @@ -101,202 +78,46 @@ var flag = data.flag; if (flag === 0) { // 如果是无效码 - layer.msg("扫描失败，请确认扫描是否正确"); - } - else if (flag === 1) { - // 如果是物料 - material = data.material; - materialList.push(material); - layer.confirm("是否继续扫描", - { - btn: ["继续", "取消"] - }, - function () { // 继续扫描物料 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var param = {}; - param.qrCode = result; - outboundLogic(param); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }); - }, - function () { - // 不扫描物料 - params.materialList = materialList; - params.depository = depository; - params.place = place; - temporaryScanValue(params); // 将物料暂存 - if (depository !== null || place !== null) { - // 如果已经扫描了仓库或库位 - // 弹出选择框 - chooseInOrOut(); - } else { - // 如果没有扫描仓库或库位 - layer.confirm("暂未扫描仓库，是否继续该操作", - { - btn: ["继续", "取消"] - }, - function () {// 继续 - // 弹出选择框 - chooseInOrOut(); - }, - function () { // 取消当前操作 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var param = {}; - param.qrCode = result; - outboundLogic(param); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }); - } - ) + layer.confirm("扫描失败，是否重新扫描", { + btn: ["确定", "取消"] + }, function () { + wxScan.scanQRCode({ + desc: 'scanQRCode desc', + needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， + scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + success: function (res) { + // 回调 + var result = res.resultStr;//当needResult为1时返回处理结果 + var req = {}; + req.qrCode = result; + outboundLogic(req); } }) - } - else if (flag === 2) { - // 如果扫描的为库位 - place = data.place;// 暂存扫描结果 - params.depository = depository; - params.place = place; - params.materialList = materialList; - if (materialList.length > 0) { - // 如果有物料 - temporaryScanValue(params); // 将数据暂存至redis中 - chooseInOrOut(); // 弹出选择框 - } else { - // 如果没有 - layer.confirm("当前并未扫描物料，是否继续扫描", - {btn:["继续","取消"]}, - function () { // 继续扫描 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var req = {}; - req.qrCode = result; - outboundLogic(req); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }) - }, - function () { - temporaryScanValue(params); // 将数据暂存 - chooseInOrOut(); // 弹出选择框 - } - ) - } + }, function () { + // 关闭当前页 + var index = parent.layer.getFrameIndex(window.name); + parent.layer.close(index); + }) + } else if (flag === 1) { + // 如果是物料 + material = data.material; + window.location.href = "/toShowInventory?id="+material.id+"&type=m"; + + } else if (flag === 2) { + // 如果扫描的为库位 + place = data.place;// 将扫描结果保存到vue中 + window.location.href = "/toShowInventory?id="+place.id+"&type=p"; } else if (flag === 3) { - // 如果是仓库 - depository = data.depository; - params.depository = depository; - params.place = place; - params.materialList = materialList; - if (materialList.length > 0) { - // 如果有物料 - temporaryScanValue(params); // 将数据暂存至redis中 - chooseInOrOut(); // 弹出选择框 - } else { - // 如果没有 - layer.confirm("暂未选择物料，是否继续扫描", { - btn:["继续","取消"] - },function () { // 继续 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var req = {}; - req.qrCode = result; - outboundLogic(req); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }); - },function () { // 取消 - temporaryScanValue(params); // 将数据暂存 - chooseInOrOut(); // 弹出选择框 - }) - } + depository = data.depository;// 将扫描结果保存到vue中 + window.location.href = "/toShowInventory?id="+depository.id+"&type=d"; + } } }) }; - temporaryScanValue = function (params) { - layui.$.ajax({ - url: "/material/temporaryValue", - type: 'post', - dataType: 'json', - contentType: "application/json;charset=utf-8", - data: JSON.stringify(params) - }); - }; - // 弹出入库|出库选择框 - chooseInOrOut = function () { - layer.confirm("是否入库", { - btn: ["入库", "取消"] - }, - function () { // 选择入库 - layer.open({ - type: 2, - title: '入库', - skin: 'layui-layer-rim', - maxmin: true, - shadeClose: true, //点击遮罩关闭层 - area: ['100%', '100%'], - move: '.layui-layer-title', - fixed: false, - content: '/application_in_scanQrCode', - end: function () { - var index = parent.layer.getFrameIndex(window.name); - parent.layer.close(index); - } - }) - }, - function () { // 选择取消 - var index = parent.layer.getFrameIndex(window.name); - parent.layer.close(index); - - }) - } diff --git a/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html new file mode 100644 index 00000000..e94e79a5 --- /dev/null +++ b/src/main/resources/templates/pages/showInventory/showInventoryForLocation.html @@ -0,0 +1,246 @@ + + + + + 仓库盘点 + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ + +
+ +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/showInventory/showInventoryForMaterial.html b/src/main/resources/templates/pages/showInventory/showInventoryForMaterial.html new file mode 100644 index 00000000..b2de11cc --- /dev/null +++ b/src/main/resources/templates/pages/showInventory/showInventoryForMaterial.html @@ -0,0 +1,261 @@ + + + + + 仓库盘点 + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + + \ No newline at end of file diff --git a/target/classes/templates/pages/scanQrCode/ScanQrCode.html b/target/classes/templates/pages/scanQrCode/ScanQrCode.html index a7c1881e..54998897 100644 --- a/target/classes/templates/pages/scanQrCode/ScanQrCode.html +++ b/target/classes/templates/pages/scanQrCode/ScanQrCode.html @@ -17,33 +17,6 @@ - @@ -53,21 +26,26 @@ function outboundLogic() { }; + function temporaryScanValue() { } + function chooseInOrOut() { } - var materialList = [], - depository= null, - place=null; - let params = {}; // 用于暂存扫描结果 - - + var material = null, + depository = null, + place = null; + let wxScan = parent; layui.$(function () { - parent.wx.scanQRCode({ + if (wxScan.wx === undefined) { + wxScan = wxScan.parent.wx; + } else { + wxScan = wxScan.wx; + } + wxScan.scanQRCode({ desc: 'scanQRCode desc', needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 @@ -84,8 +62,7 @@ } } }); - }) - + }); outboundLogic = function (req) { @@ -101,202 +78,46 @@ var flag = data.flag; if (flag === 0) { // 如果是无效码 - layer.msg("扫描失败，请确认扫描是否正确"); - } - else if (flag === 1) { - // 如果是物料 - material = data.material; - materialList.push(material); - layer.confirm("是否继续扫描", - { - btn: ["继续", "取消"] - }, - function () { // 继续扫描物料 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var param = {}; - param.qrCode = result; - outboundLogic(param); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }); - }, - function () { - // 不扫描物料 - params.materialList = materialList; - params.depository = depository; - params.place = place; - temporaryScanValue(params); // 将物料暂存 - if (depository !== null || place !== null) { - // 如果已经扫描了仓库或库位 - // 弹出选择框 - chooseInOrOut(); - } else { - // 如果没有扫描仓库或库位 - layer.confirm("暂未扫描仓库，是否继续该操作", - { - btn: ["继续", "取消"] - }, - function () {// 继续 - // 弹出选择框 - chooseInOrOut(); - }, - function () { // 取消当前操作 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var param = {}; - param.qrCode = result; - outboundLogic(param); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }); - } - ) + layer.confirm("扫描失败，是否重新扫描", { + btn: ["确定", "取消"] + }, function () { + wxScan.scanQRCode({ + desc: 'scanQRCode desc', + needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， + scanType: ["barCode", "qrCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 + success: function (res) { + // 回调 + var result = res.resultStr;//当needResult为1时返回处理结果 + var req = {}; + req.qrCode = result; + outboundLogic(req); } }) - } - else if (flag === 2) { - // 如果扫描的为库位 - place = data.place;// 暂存扫描结果 - params.depository = depository; - params.place = place; - params.materialList = materialList; - if (materialList.length > 0) { - // 如果有物料 - temporaryScanValue(params); // 将数据暂存至redis中 - chooseInOrOut(); // 弹出选择框 - } else { - // 如果没有 - layer.confirm("当前并未扫描物料，是否继续扫描", - {btn:["继续","取消"]}, - function () { // 继续扫描 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var req = {}; - req.qrCode = result; - outboundLogic(req); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }) - }, - function () { - temporaryScanValue(params); // 将数据暂存 - chooseInOrOut(); // 弹出选择框 - } - ) - } + }, function () { + // 关闭当前页 + var index = parent.layer.getFrameIndex(window.name); + parent.layer.close(index); + }) + } else if (flag === 1) { + // 如果是物料 + material = data.material; + window.location.href = "/toShowInventory?id="+material.id+"&type=m"; + + } else if (flag === 2) { + // 如果扫描的为库位 + place = data.place;// 将扫描结果保存到vue中 + window.location.href = "/toShowInventory?id="+place.id+"&type=p"; } else if (flag === 3) { - // 如果是仓库 - depository = data.depository; - params.depository = depository; - params.place = place; - params.materialList = materialList; - if (materialList.length > 0) { - // 如果有物料 - temporaryScanValue(params); // 将数据暂存至redis中 - chooseInOrOut(); // 弹出选择框 - } else { - // 如果没有 - layer.confirm("暂未选择物料，是否继续扫描", { - btn:["继续","取消"] - },function () { // 继续 - layer.close(layer.index); // 关闭弹窗 - parent.wx.scanQRCode({ - desc: 'scanQRCode desc', - needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果， - scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码（一维码），默认二者都有 - success: function (res) { - // 回调 - var result = res.resultStr;//当needResult为1时返回处理结果 - var req = {}; - req.qrCode = result; - outboundLogic(req); - }, - error: function (res) { - if (res.errMsg.indexOf('function_not_exist') > 0) { - alert('版本过低请升级') - } - } - }); - },function () { // 取消 - temporaryScanValue(params); // 将数据暂存 - chooseInOrOut(); // 弹出选择框 - }) - } + depository = data.depository;// 将扫描结果保存到vue中 + window.location.href = "/toShowInventory?id="+depository.id+"&type=d"; + } } }) }; - temporaryScanValue = function (params) { - layui.$.ajax({ - url: "/material/temporaryValue", - type: 'post', - dataType: 'json', - contentType: "application/json;charset=utf-8", - data: JSON.stringify(params) - }); - }; - // 弹出入库|出库选择框 - chooseInOrOut = function () { - layer.confirm("是否入库", { - btn: ["入库", "取消"] - }, - function () { // 选择入库 - layer.open({ - type: 2, - title: '入库', - skin: 'layui-layer-rim', - maxmin: true, - shadeClose: true, //点击遮罩关闭层 - area: ['100%', '100%'], - move: '.layui-layer-title', - fixed: false, - content: '/application_in_scanQrCode', - end: function () { - var index = parent.layer.getFrameIndex(window.name); - parent.layer.close(index); - } - }) - }, - function () { // 选择取消 - var index = parent.layer.getFrameIndex(window.name); - parent.layer.close(index); - - }) - }