Browse Source

修改仓储中心提交出库申请时由自己审批

lwx_dev
erdanergou 3 years ago
parent
commit
80b2925daf
  1. 8
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 6
      src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

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

@ -1965,7 +1965,9 @@ public class PageController {
if ("-1".equals(unit)) { if ("-1".equals(unit)) {
// 如果是基础单位 // 如果是基础单位
if (inventoryById.getPrice() != null) { if (inventoryById.getPrice() != null) {
sumPrice += (inventoryById.getPrice() * recordMinP.getQuantity()); BigDecimal bd = BigDecimal.valueOf(inventoryById.getPrice() * recordMinP.getQuantity());
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
sumPrice += v;
} else { } else {
sumPrice += 0.0; sumPrice += 0.0;
} }
@ -1982,7 +1984,9 @@ public class PageController {
// 获取当前拆单记录与基础单位的进制 // 获取当前拆单记录与基础单位的进制
int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); int scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1);
if (inventoryById.getPrice() != null) { if (inventoryById.getPrice() != null) {
sumPrice += (inventoryById.getPrice() / scale * recordMinP.getQuantity()); BigDecimal bd = BigDecimal.valueOf((inventoryById.getPrice() / scale * recordMinP.getQuantity()));
double v = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
sumPrice += v;
} else { } else {
sumPrice += 0.0; sumPrice += 0.0;
} }

6
src/main/java/com/dreamchaser/depository_manage/service/impl/StockTakingServiceImpl.java

@ -900,7 +900,8 @@ public class StockTakingServiceImpl implements StockTakingService {
placeAndMaterialByMidAndPid.setQuantity(newNumberForMatrialAndPlace); placeAndMaterialByMidAndPid.setQuantity(newNumberForMatrialAndPlace);
} else { }
else {
// 如果是拆单单位 // 如果是拆单单位
// 用于查找对应的拆单记录 // 用于查找对应的拆单记录
Map<String, Object> paramForSplitInfo = new HashMap<>(); Map<String, Object> paramForSplitInfo = new HashMap<>();
@ -1021,7 +1022,8 @@ public class StockTakingServiceImpl implements StockTakingService {
} }
} else { }
else {
// 如果盘点后的库存数非法 // 如果盘点后的库存数非法
placeById.setQuantity(placeById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity()); placeById.setQuantity(placeById.getQuantity() - placeAndMaterialByMidAndPid.getQuantity());

Loading…
Cancel
Save