purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决移动平均价遇到负库存情况下的bug

Browse Source
This commit is contained in:
jishenghua
2024-11-07 18:09:47 +08:00
parent 800cf85f39
commit d80d3b0fc4
1 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -1077,6 +1077,9 @@ public class DepotItemService {
BigDecimal currentAllPrice = BigDecimal.ZERO; BigDecimal currentAllPrice = BigDecimal.ZERO;
for(DepotItemVo4DetailByTypeAndMId item: itemList) { for(DepotItemVo4DetailByTypeAndMId item: itemList) {
BigDecimal basicNumber = item.getBnum()!=null?item.getBnum():BigDecimal.ZERO; BigDecimal basicNumber = item.getBnum()!=null?item.getBnum():BigDecimal.ZERO;
//数量*单价 另外计算新的成本价
BigDecimal allPrice = unitService.parseAllPriceByUnit(item.getAllPrice()!=null?item.getAllPrice():BigDecimal.ZERO, unitInfo, item.getMaterialUnit());
if(basicNumber.compareTo(BigDecimal.ZERO)!=0 && allPrice.compareTo(BigDecimal.ZERO)!=0) {
//入库 //入库
if (BusinessConstants.DEPOTHEAD_TYPE_IN.equals(item.getType())) { if (BusinessConstants.DEPOTHEAD_TYPE_IN.equals(item.getType())) {
//零售退货、销售退货 //零售退货、销售退货
@@ -1085,12 +1088,13 @@ public class DepotItemService {
currentNumber = currentNumber.add(basicNumber); currentNumber = currentNumber.add(basicNumber);
currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice)); currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice));
} else { } else {
//数量*单价 另外计算新的成本价
BigDecimal allPrice = unitService.parseAllPriceByUnit(item.getAllPrice(), unitInfo, item.getMaterialUnit());
currentAllPrice = currentAllPrice.add(allPrice); currentAllPrice = currentAllPrice.add(allPrice);
currentNumber = currentNumber.add(basicNumber); currentNumber = currentNumber.add(basicNumber);
if(currentNumber.compareTo(BigDecimal.ZERO)!=0) { //只有当前库存总金额和当前库存数量都大于0才计算移动平均价
if (currentAllPrice.compareTo(BigDecimal.ZERO) > 0 && currentNumber.compareTo(BigDecimal.ZERO) > 0) {
currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP); currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
} else {
currentUnitPrice = item.getUnitPrice();
} }
} }
} }
@@ -1098,12 +1102,13 @@ public class DepotItemService {
if (BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(item.getType())) { if (BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(item.getType())) {
//采购退货 //采购退货
if (BusinessConstants.SUB_TYPE_PURCHASE_RETURN.equals(item.getSubType())) { if (BusinessConstants.SUB_TYPE_PURCHASE_RETURN.equals(item.getSubType())) {
//数量*单价 另外计算新的成本价
BigDecimal allPrice = unitService.parseAllPriceByUnit(item.getAllPrice(), unitInfo, item.getMaterialUnit());
currentAllPrice = currentAllPrice.add(allPrice); currentAllPrice = currentAllPrice.add(allPrice);
currentNumber = currentNumber.add(basicNumber); currentNumber = currentNumber.add(basicNumber);
if(currentNumber.compareTo(BigDecimal.ZERO)!=0) { //只有当前库存总金额和当前库存数量都大于0才计算移动平均价
if (currentAllPrice.compareTo(BigDecimal.ZERO) > 0 && currentNumber.compareTo(BigDecimal.ZERO) > 0) {
currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP); currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
} else {
currentUnitPrice = item.getUnitPrice();
} }
} else { } else {
currentNumber = currentNumber.add(basicNumber); currentNumber = currentNumber.add(basicNumber);
@@ -1116,6 +1121,7 @@ public class DepotItemService {
currentUnitPrice = BigDecimal.ZERO; currentUnitPrice = BigDecimal.ZERO;
} }
} }
}
//更新实时库存中的当前单价 //更新实时库存中的当前单价
materialCurrentStockMapperEx.updateUnitPriceByMId(currentUnitPrice, depotItem.getMaterialId()); materialCurrentStockMapperEx.updateUnitPriceByMId(currentUnitPrice, depotItem.getMaterialId());
} }