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

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

@@ -1077,43 +1077,49 @@ 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;
//入库 //数量*单价 另外计算新的成本价
if(BusinessConstants.DEPOTHEAD_TYPE_IN.equals(item.getType())) { 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.SUB_TYPE_RETAIL_RETURN.equals(item.getSubType())||BusinessConstants.SUB_TYPE_SALES_RETURN.equals(item.getSubType())) { //入库
//数量*当前的成本单价 if (BusinessConstants.DEPOTHEAD_TYPE_IN.equals(item.getType())) {
currentNumber = currentNumber.add(basicNumber); //零售退货、销售退货
currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice)); if (BusinessConstants.SUB_TYPE_RETAIL_RETURN.equals(item.getSubType()) || BusinessConstants.SUB_TYPE_SALES_RETURN.equals(item.getSubType())) {
} else { //数量*当前的成本单价
//数量*单价 另外计算新的成本价 currentNumber = currentNumber.add(basicNumber);
BigDecimal allPrice = unitService.parseAllPriceByUnit(item.getAllPrice(), unitInfo, item.getMaterialUnit()); currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice));
currentAllPrice = currentAllPrice.add(allPrice); } else {
currentNumber = currentNumber.add(basicNumber); currentAllPrice = currentAllPrice.add(allPrice);
if(currentNumber.compareTo(BigDecimal.ZERO)!=0) { currentNumber = currentNumber.add(basicNumber);
currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP); //只有当前库存总金额和当前库存数量都大于0才计算移动平均价
if (currentAllPrice.compareTo(BigDecimal.ZERO) > 0 && currentNumber.compareTo(BigDecimal.ZERO) > 0) {
currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
} else {
currentUnitPrice = item.getUnitPrice();
}
} }
} }
} //出库
//出库 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())) { currentAllPrice = currentAllPrice.add(allPrice);
//数量*单价 另外计算新的成本价 currentNumber = currentNumber.add(basicNumber);
BigDecimal allPrice = unitService.parseAllPriceByUnit(item.getAllPrice(), unitInfo, item.getMaterialUnit()); //只有当前库存总金额和当前库存数量都大于0才计算移动平均价
currentAllPrice = currentAllPrice.add(allPrice); if (currentAllPrice.compareTo(BigDecimal.ZERO) > 0 && currentNumber.compareTo(BigDecimal.ZERO) > 0) {
currentNumber = currentNumber.add(basicNumber); currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
if(currentNumber.compareTo(BigDecimal.ZERO)!=0) { } else {
currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP); currentUnitPrice = item.getUnitPrice();
}
} else {
currentNumber = currentNumber.add(basicNumber);
//数量*当前的成本单价
currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice));
} }
} else {
currentNumber = currentNumber.add(basicNumber);
//数量*当前的成本单价
currentAllPrice = currentAllPrice.add(basicNumber.multiply(currentUnitPrice));
} }
} //防止单价金额溢出
//防止单价金额溢出 if(currentUnitPrice.compareTo(BigDecimal.valueOf(100000000))>0 || currentUnitPrice.compareTo(BigDecimal.valueOf(-100000000))<0) {
if(currentUnitPrice.compareTo(BigDecimal.valueOf(100000000))>0 || currentUnitPrice.compareTo(BigDecimal.valueOf(-100000000))<0) { currentUnitPrice = BigDecimal.ZERO;
currentUnitPrice = BigDecimal.ZERO; }
} }
} }
//更新实时库存中的当前单价 //更新实时库存中的当前单价