资产负债-自产采购在途金额

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcInventoryBalanceMapper.java

@@ -127,7 +127,7 @@ public interface DcInventoryBalanceMapper {
     @Select("select sum(purchase_rmb) from dc_inventory_balance where statistical_time = #{lastDay} and hq_type<>'FBA仓' and is_transfer=1")
     BigDecimal getNotFbaPurchaseAmountSum(@Param("lastDay")Date lastDay);
 
-    @Select("select sum(dc0.unit_price * dc0.quantity_purchase) from dc_daily_transit dc0 left join dc_base_sku dc1 on dc0.bailun_sku = dc1.bailun_sku where dc0.record_time = #{lastDay} and dc1.buyer_name in ('张莹霞', '张莹霞1')")
+    @Select("select sum(t1.count * t1.price) amount from dc_daily_purchase_semi_deliveronway t1 where t1.day= #{lastDay}")
     BigDecimal getPurchaseProAmount(@Param("lastDay")Date lastDay);
 
 

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

@@ -140,7 +140,7 @@ public class BalanceSheetService {
     }
 
 
-    @Scheduled(cron = "0 30 2 * * *") // 每天凌晨1点半运行一次
+    @Scheduled(cron = "0 30 2 * * *") // 每天凌晨2点半运行一次
     public void doScheduledTask0100() {
         Date lastDay = DateTimeUtil.getCurrentLastDay();
         getInventoryBalance(lastDay); // 获取成品存货
@@ -469,6 +469,7 @@ public class BalanceSheetService {
         BigDecimal notFbaPurchaseAmountSum = dcInventoryBalanceMapper.getNotFbaPurchaseAmountSum(date);
         if(notFbaPurchaseAmountSum == null) notFbaPurchaseAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setNotFbaPurchaseAmount(notFbaPurchaseAmountSum);
+        // 自产采购在途金额
         BigDecimal purchaseProAmountSum = dcInventoryBalanceMapper.getPurchaseProAmount(date);
         if(purchaseProAmountSum == null) purchaseProAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setPurchaseProAmount(purchaseProAmountSum);
@@ -501,9 +502,9 @@ public class BalanceSheetService {
         BigDecimal semiHaNiTransferAmountSum = dcSemiDailyTransferMapper.getSemiHaNiDailyTransferSum(date);
         if(semiHaNiTransferAmountSum == null) semiHaNiTransferAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiHaNiTransferAmount(semiHaNiTransferAmountSum);
-        // 存货 金额   FBA在库金额+非FBA在库金额(不包含耗材仓)+FBA调拨在途金额(不包含调拨计划)+非FBA调拨在途金额(不包含调拨计划)+半成品在库金额+半成品生产在库金额
+        // 存货 金额   FBA在库金额+非FBA在库金额(不包含耗材仓)+FBA调拨在途金额(不包含调拨计划)+非FBA调拨在途金额(不包含调拨计划)+半成品在库金额+半成品生产在库金额+自产采购在途
 //        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum);
-        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiBailunInventoryAmountSum).add(semiProdInventoryAmountSum);
+        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiBailunInventoryAmountSum).add(semiProdInventoryAmountSum).add(purchaseProAmountSum);
         dcBalanceSheet.setInventoryAmount(inventoryBalanceSum);
         dcBalanceSheet.setCompanyValue(0);
         dcBalanceSheet.setStatisticalTime(date);