diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 0da73135..fd7903de 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -377,7 +377,11 @@ public class DepotItemController { } else { item.put("unitPrice", diEx.getPurchaseDecimal()); } - item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal())); + if(moveAvgPriceFlag) { + item.put("thisAllPrice", thisSum.multiply(diEx.getCurrentUnitPrice())); + } else { + item.put("thisAllPrice", thisSum.multiply(diEx.getPurchaseDecimal())); + } dataArray.add(item); } }