sephiroth190326/EPCMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pp管道的金额计算更改：单价*总重

Browse Source
This commit is contained in:
suncz
2024-04-30 17:19:40 +08:00
parent b174c04733
commit 7fe7d434f0
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/vverp/service/PurchaseOrderService.java
View File

@@ -828,7 +828,8 @@ public class PurchaseOrderService extends BaseOrderService<PurchaseOrder, Long>
purchaseOrderItem.setLongDescription(materialOrderItem.getLongDescription());
purchaseOrderItem.setUnit(materialOrderItem.getUnit());
purchaseOrderItem.setCodeType(materialOrderItem.getCodeType());
purchaseOrderItem.setBigProductType(materialOrderItem.getBigProductType());
purchaseOrderItem.setSmallProductType(materialOrderItem.getSmallProductType());
purchaseOrderItem.setProductId(materialOrderItem.getProductId());
purchaseOrderItem.setPrice(materialOrderItem.getPrice());
purchaseOrderItem.setCount(materialOrderItem.getCount());
@@ -977,7 +978,11 @@ public class PurchaseOrderService extends BaseOrderService<PurchaseOrder, Long>
purchaseOrderItem.setPurchaseOrder(purchaseOrder);
purchaseOrderItem.setInd(ind);
purchaseOrderItemService.save(purchaseOrderItem);
totalAmount = totalAmount.add(purchaseOrderItem.getPrice().multiply(purchaseOrderItem.getCount()));
if(Objects.equals(purchaseOrderItem.getBigProductType(), "PP")) {//pp管道系列采用总重*单价计算
totalAmount = totalAmount.add(purchaseOrderItem.getPrice().multiply(purchaseOrderItem.getTotalWeight()));
}else{
totalAmount = totalAmount.add(purchaseOrderItem.getPrice().multiply(purchaseOrderItem.getCount()));
}
totalCount = totalCount.add(purchaseOrderItem.getCount());
ind++;