pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改库位之间转移时的bug

lwx_dev
erdanergou 3 years ago
parent
6a76aa74b8
commit
2fdec3acfc
4 changed files with 85 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
  2. 2
      src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java
  3. 71
      src/main/resources/templates/pages/material/selectPlaceByDepository.html
  4. 71
      target/classes/templates/pages/material/selectPlaceByDepository.html

12
src/main/java/com/dreamchaser/depository_manage/service/impl/MaterialServiceImpl.java
View File

@ -1638,7 +1638,7 @@ public class MaterialServiceImpl implements MaterialService {
// 如果转移后的拆单库存记录不为空
// 获取当前转移后的总数
int realQuantity = splitInventoryForAfter.getSaveQuantity() + (int) (quantity * 100);
double realQuantity = splitInventoryForAfter.getSaveQuantity() / 100.0 + quantity;
if (realQuantity >= splitInfo.getQuantity()) {
// 如果当前转移后的总数大于进制数
@ -1648,7 +1648,7 @@ public class MaterialServiceImpl implements MaterialService {
// 获取进位后当前入库的数量
realQuantity = realQuantity - dispose * splitInfo.getQuantity();
// 设置当前库存数量
splitInventoryForAfter.setSaveQuantity(realQuantity);
splitInventoryForAfter.setSaveQuantity((int) (realQuantity * 100));
// 设置当前入库数量
splitInventoryForAfter.setInQuantity(splitInventoryForAfter.getInQuantity() + (int) (quantity * 100));
// 修改库存记录
@ -1675,7 +1675,7 @@ public class MaterialServiceImpl implements MaterialService {
// 如果不大于进制数
// 设置转移后的库存数量
splitInventoryForAfter.setSaveQuantity(realQuantity);
splitInventoryForAfter.setSaveQuantity((int) (realQuantity * 100));
// 设置转移后的入库数量
splitInventoryForAfter.setInQuantity(splitInventoryForAfter.getSaveQuantity() + (int) (quantity * 100));
// 修改库存数量
@ -1717,8 +1717,8 @@ public class MaterialServiceImpl implements MaterialService {
}
} else {
// 如果不大于
insertForSplitInventory.put("saveQuantity", quantity);
insertForSplitInventory.put("inQuantity", quantity);
insertForSplitInventory.put("saveQuantity",(int)(quantity * 100));
insertForSplitInventory.put("inQuantity",(int)(quantity * 100));
splitUnitMapper.addSplitInventory(insertForSplitInventory);
}
}
@ -1753,7 +1753,7 @@ public class MaterialServiceImpl implements MaterialService {
if (splitInfo.getParentId() != null) {
// 获取当前父级
SplitInfo parentSplitInfo = splitUnitMapper.findSplitInfoById(splitInfo.getParentId());
splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, dispose, ObjectFormatUtil.toInteger(insertForSplitInventory.get("id")), paramForNewMap, quantity, splitInfo);
splitUnitService.updateSplitInfoSaveQuantity(parentSplitInfo, dispose, ObjectFormatUtil.toInteger(insertForAfter.get("id")), paramForNewMap, quantity, splitInfo);
} else {
if (inventoryByMid.getPrice() == null) {
inventoryByMid.setPrice(0.0);

2
src/main/java/com/dreamchaser/depository_manage/service/impl/SplitUnitServiceImpl.java
View File

@ -667,7 +667,7 @@ public class SplitUnitServiceImpl implements SplitUnitService {
paramForInsertSplitInventory.put("inQuantity", quantity * 100);
paramForInsertSplitInventory.put("outQuantity", 0);
paramForInsertSplitInventory.put("iid", iid);
if (quantity > splitInfo.getQuantity()) {
if (quantity >= splitInfo.getQuantity()) {
// 如果当前处理数量大于当前设置的进制数量
// 计算需要进位的数量

71
src/main/resources/templates/pages/material/selectPlaceByDepository.html
View File

@ -22,6 +22,8 @@
var $ = layui.jquery,
tree = layui.tree;
// 用于标志是否为第一次提交
let flagForForm = false;
// 获取当前仓库
var depositoryId = $("#depositoryId").val();
// 当前库存总数
@ -93,39 +95,44 @@
})
} else {
// 修改当前物料所在库位
var req = {};
req.quantity = value;
req.mid = mid;
req.fromPlaceId = fromPlaceId;
req.toPlaceId = placeId;
req.unit = unit;
req.depositoryId = depositoryId;
$.ajax({
url:"/material/editPlaceMaterial",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
success:function (data) {
if(data.status === 205){
layer.msg("修改成功",{
icon:1,
time:1000
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}else{
layer.msg(data.statusInfo.detail,{
icon:5,
time:1000
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
if(!flagForForm){
flagForForm = true;
var req = {};
req.quantity = value;
req.mid = mid;
req.fromPlaceId = fromPlaceId;
req.toPlaceId = placeId;
req.unit = unit;
req.depositoryId = depositoryId;
$.ajax({
url:"/material/editPlaceMaterial",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
success:function (data) {
if(data.status === 205){
layer.msg("修改成功",{
icon:1,
time:1000
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}else{
layer.msg(data.statusInfo.detail,{
icon:5,
time:1000
},function () {
flagForForm = false;
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}
}
}
})
})
}
}
});

71
target/classes/templates/pages/material/selectPlaceByDepository.html
View File

@ -22,6 +22,8 @@
var $ = layui.jquery,
tree = layui.tree;
// 用于标志是否为第一次提交
let flagForForm = false;
// 获取当前仓库
var depositoryId = $("#depositoryId").val();
// 当前库存总数
@ -93,39 +95,44 @@
})
} else {
// 修改当前物料所在库位
var req = {};
req.quantity = value;
req.mid = mid;
req.fromPlaceId = fromPlaceId;
req.toPlaceId = placeId;
req.unit = unit;
req.depositoryId = depositoryId;
$.ajax({
url:"/material/editPlaceMaterial",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
success:function (data) {
if(data.status === 205){
layer.msg("修改成功",{
icon:1,
time:1000
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}else{
layer.msg(data.statusInfo.detail,{
icon:5,
time:1000
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
if(!flagForForm){
flagForForm = true;
var req = {};
req.quantity = value;
req.mid = mid;
req.fromPlaceId = fromPlaceId;
req.toPlaceId = placeId;
req.unit = unit;
req.depositoryId = depositoryId;
$.ajax({
url:"/material/editPlaceMaterial",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(req),
success:function (data) {
if(data.status === 205){
layer.msg("修改成功",{
icon:1,
time:1000
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}else{
layer.msg(data.statusInfo.detail,{
icon:5,
time:1000
},function () {
flagForForm = false;
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
}
}
}
})
})
}
}
});

Write Preview
Loading…
Cancel
Save