diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java index f0cba59f..2586782d 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java @@ -17,4 +17,6 @@ public interface MaterialCurrentStockMapperEx { void updateUnitPriceByMId( @Param("currentUnitPrice") BigDecimal currentUnitPrice, @Param("materialId") Long materialId); + + BigDecimal getCurrentUnitPriceByMId(@Param("materialId") Long materialId); } \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java index 9be070a5..a944c7d7 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java @@ -578,7 +578,10 @@ public class DepotItemService { BusinessConstants.SUB_TYPE_SALES_RETURN.equals(depotHead.getSubType()) || BusinessConstants.SUB_TYPE_RETAIL.equals(depotHead.getSubType()) || BusinessConstants.SUB_TYPE_RETAIL_RETURN.equals(depotHead.getSubType())) { - depotItem.setPurchaseUnitPrice(materialExtend.getPurchaseDecimal()); + boolean moveAvgPriceFlag = systemConfigService.getMoveAvgPriceFlag(); + BigDecimal currentUnitPrice = materialCurrentStockMapperEx.getCurrentUnitPriceByMId(materialExtend.getMaterialId()); + BigDecimal unitPrice = moveAvgPriceFlag? currentUnitPrice: materialExtend.getPurchaseDecimal(); + depotItem.setPurchaseUnitPrice(unitPrice); if(StringUtil.isNotEmpty(depotItem.getBatchNumber())) { depotItem.setPurchaseUnitPrice(getDepotItemByBatchNumber(depotItem.getMaterialExtendId(),depotItem.getBatchNumber()).getUnitPrice()); } diff --git a/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml index d068cb71..70373c61 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml @@ -27,4 +27,8 @@ and ifnull(delete_flag,'0') !='1' + + \ No newline at end of file