diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java index aabd8c77..53ac6431 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotItemMapperEx.java @@ -132,6 +132,13 @@ public interface DepotItemMapperEx { @Param("creatorArray") String[] creatorArray, @Param("forceFlag") Boolean forceFlag); + BigDecimal getSkuStockCheckSumByDepotList( + @Param("depotList") List depotList, + @Param("meId") Long meId, + @Param("forceFlag") Boolean forceFlag, + @Param("beginTime") String beginTime, + @Param("endTime") String endTime); + BigDecimal getStockCheckSumByDepotList( @Param("depotList") List depotList, @Param("mId") Long mId, 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 b8da39d8..9deed577 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 @@ -883,6 +883,8 @@ public class DepotItemService { public BigDecimal getSkuStockByParam(Long depotId, Long meId, String beginTime, String endTime) throws Exception { Boolean forceFlag = systemConfigService.getForceApprovalFlag(); List depotList = depotService.parseDepotList(depotId); + //盘点复盘后数量的变动 + BigDecimal stockCheckSum = depotItemMapperEx.getSkuStockCheckSumByDepotList(depotList, meId, forceFlag, beginTime, endTime); DepotItemVo4Stock stockObj = depotItemMapperEx.getSkuStockByParamWithDepotList(depotList, meId, forceFlag, beginTime, endTime); BigDecimal stockSum = BigDecimal.ZERO; if(stockObj!=null) { @@ -897,7 +899,7 @@ public class DepotItemService { stockSum = inTotal.add(transfInTotal).add(assemInTotal).add(disAssemInTotal) .subtract(outTotal).subtract(transfOutTotal).subtract(assemOutTotal).subtract(disAssemOutTotal); } - return stockSum; + return stockCheckSum.add(stockSum); } /** diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml index a4b803d1..b3c54ae4 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml @@ -606,6 +606,33 @@ and ifnull(di.delete_flag, '0') != '1') tb + +