diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java index 5422d1c4..16b44eb1 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java @@ -81,7 +81,8 @@ public class DepositoryServiceImpl implements DepositoryService { code = "GK" + dnamePinYin + "-01"; } } - } else { + } + else { map.put("parentId", map.get("depositoryId")); map.remove("depositoryId"); // 获取当前仓库父仓库 @@ -113,6 +114,8 @@ public class DepositoryServiceImpl implements DepositoryService { Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber")); if ((int) (maxNumber * 100) > 999999999) { map.put("maxNumber", 999999999); + }else{ + map.put("maxNumber", maxNumber * 100); } return depositoryMapper.insertDepository(map); } @@ -221,6 +224,8 @@ public class DepositoryServiceImpl implements DepositoryService { Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber")); if ((int) (maxNumber * 100) > 999999999) { map.put("maxNumber", 999999999); + }else{ + map.put("maxNumber",maxNumber * 100); } return depositoryMapper.updateDepository(map); } diff --git a/src/main/resources/templates/pages/warehouse/warehouse_view.html b/src/main/resources/templates/pages/warehouse/warehouse_view.html index c9442c7a..70a13edd 100644 --- a/src/main/resources/templates/pages/warehouse/warehouse_view.html +++ b/src/main/resources/templates/pages/warehouse/warehouse_view.html @@ -239,30 +239,6 @@ }; - /*downloadCodeImg = function() { //下载base64图片 - let imgCode = $("#barCode").attr("src"); - let aLink = document.createElement('a'); - let blob = base64ToBlob(imgCode); //new Blob([content]); - let evt = document.createEvent("HTMLEvents"); - evt.initEvent("click", true, true); //initEvent 不加后两个参数在FF下会报错 事件类型,是否冒泡,是否阻止浏览器的默认行为 - aLink.download = $("#dname").val(); - aLink.href = URL.createObjectURL(blob); - aLink.click(); - }; - - base64ToBlob = function (code) { - let parts = code.split(';base64,'); - let contentType = parts[0].split(':')[1]; - let raw = window.atob(parts[1]); - let rawLength = raw.length; - let uInt8Array = new Uint8Array(rawLength); - for (let i = 0; i < rawLength; ++i) { - uInt8Array[i] = raw.charCodeAt(i); - } - return new Blob([uInt8Array], { - type: contentType - }); - };*/ downloadCodeImg = function () { let id = $("#did").val();