Browse Source

为库存导入添加备注字段

lwx_dev
erdanergou 3 years ago
parent
commit
c60b9340b1
  1. 7
      src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java
  2. 24
      src/main/resources/templates/pages/warehouse/warehouse_view.html

7
src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryServiceImpl.java

@ -81,7 +81,8 @@ public class DepositoryServiceImpl implements DepositoryService {
code = "GK" + dnamePinYin + "-01"; code = "GK" + dnamePinYin + "-01";
} }
} }
} else { }
else {
map.put("parentId", map.get("depositoryId")); map.put("parentId", map.get("depositoryId"));
map.remove("depositoryId"); map.remove("depositoryId");
// 获取当前仓库父仓库 // 获取当前仓库父仓库
@ -113,6 +114,8 @@ public class DepositoryServiceImpl implements DepositoryService {
Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber")); Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber"));
if ((int) (maxNumber * 100) > 999999999) { if ((int) (maxNumber * 100) > 999999999) {
map.put("maxNumber", 999999999); map.put("maxNumber", 999999999);
}else{
map.put("maxNumber", maxNumber * 100);
} }
return depositoryMapper.insertDepository(map); return depositoryMapper.insertDepository(map);
} }
@ -221,6 +224,8 @@ public class DepositoryServiceImpl implements DepositoryService {
Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber")); Double maxNumber = ObjectFormatUtil.toDouble(map.get("maxNumber"));
if ((int) (maxNumber * 100) > 999999999) { if ((int) (maxNumber * 100) > 999999999) {
map.put("maxNumber", 999999999); map.put("maxNumber", 999999999);
}else{
map.put("maxNumber",maxNumber * 100);
} }
return depositoryMapper.updateDepository(map); return depositoryMapper.updateDepository(map);
} }

24
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 () { downloadCodeImg = function () {
let id = $("#did").val(); let id = $("#did").val();

Loading…
Cancel
Save