半成品在途数放在资产负债表里面, 但不汇总进去存货里面

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/service/BalanceSheetService.java

@@ -439,13 +439,14 @@ public class BalanceSheetService {
         BigDecimal semiInventoryAmountSum = dcSemiDailyStockMapper.getSemiDailyStockSum(date);
         if(semiInventoryAmountSum == null) semiInventoryAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiInventoryAmount(semiInventoryAmountSum);
-        // 半成品在途金额 吴通改为半成品在途金额设置为0。
-        BigDecimal semiTransferAmountSum =  BigDecimal.ZERO;
-//        BigDecimal semiTransferAmountSum = dcSemiDailyTransferMapper.getSemiDailyTransferSum(date);
-//        if(semiTransferAmountSum == null) semiTransferAmountSum = BigDecimal.ZERO;
+        // 半成品在途金额 恢复,不汇总进去存货里面
+//        BigDecimal semiTransferAmountSum =  BigDecimal.ZERO;
+        BigDecimal semiTransferAmountSum = dcSemiDailyTransferMapper.getSemiDailyTransferSum(date);
+        if(semiTransferAmountSum == null) semiTransferAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiTransferAmount(semiTransferAmountSum);
-        // 库存金额
-        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum);
+        // 存货 金额
+//        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum);
+        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum);
         dcBalanceSheet.setInventoryAmount(inventoryBalanceSum);
         dcBalanceSheet.setCompanyValue(0);
         dcBalanceSheet.setStatisticalTime(date);

data-finance/finance-balance-sheet/src/test/java/com/bailuntec/balancesheet/service/BalanceSheetServiceTest.java

@@ -168,8 +168,8 @@ public class BalanceSheetServiceTest {
 
     @Test
     public void getInventoryBalance(){
-        Date startDate = DateTimeUtil.stringToDate("2019-04-25", DateTimeUtil.DATE_FORMAT);
-        Date endDate = DateTimeUtil.stringToDate("2019-05-22", DateTimeUtil.DATE_FORMAT);
+        Date startDate = DateTimeUtil.stringToDate("2019-05-01", DateTimeUtil.DATE_FORMAT);
+        Date endDate = DateTimeUtil.stringToDate("2019-07-19", DateTimeUtil.DATE_FORMAT);
         while(startDate.compareTo(endDate) == -1){
 //            balanceSheetService.getInventoryBalance(startDate);
             balanceSheetService.updateInventoryBalance(startDate);