数据中心--资产负债表应收账款

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

@@ -15,7 +15,7 @@ public interface DcInventoryBalanceMapper {
      * @param lastDay
      */
     @Insert("insert into dc_inventory_balance(warehouse_code,warehouse_name,hq_type,balance_rmb,statistical_time,is_transfer)" +
-            " select ds.warehouse_code,w.warehouse_name,w.hq_type,sum(s.unit_price * (ds.usable_stock + ds.occupy_stock) * r.exchange_rate),#{lastDay},0" +
+            " select ds.warehouse_code,w.warehouse_name,w.hq_type,sum(ds.unit_price * (ds.usable_stock + ds.occupy_stock) * r.exchange_rate),#{lastDay},0" +
             " from dc_daily_stock ds left join dc_base_sku s on ds.bailun_sku = s.bailun_sku" +
             " left join dc_base_warehouse w on ds.warehouse_code = w.warehouse_code" +
             " left join dc_exchange_rate r on s.currency = r.init_curreny" +

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

@@ -49,6 +49,9 @@ public interface DcSupplierTransactionMapper {
     @Select("select sum(end_amount) from dc_supplier_transaction where day = #{lastDay} and end_amount > 0 and is_finish = 1 and types = 2")
     BigDecimal getFinishedAccountsPayableSum(@Param("lastDay") Date lastDay);
 
+    @Select("select sum(amount_end) from dc_daily_receivable where day = #{lastDay}")
+    BigDecimal getAccountsReceivable(@Param("lastDay") Date lastDay);
+
     /**
      * 成品预付款项汇总
      * @return

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

@@ -137,7 +137,7 @@ public class BalanceSheetService {
     }
 
 
-    @Scheduled(cron = "0 30 1 * * *") // 每天凌晨1点半运行一次
+    @Scheduled(cron = "0 30 2 * * *") // 每天凌晨1点半运行一次
     public void doScheduledTask0100() {
         Date lastDay = DateTimeUtil.getCurrentLastDay();
         getInventoryBalance(lastDay); // 获取成品存货
@@ -531,7 +531,9 @@ public class BalanceSheetService {
         // 应付款项
         BigDecimal accountsPayableSum = finishedAccountsPayableSum.add(semiAccountsPayableSum).add(logisticsAccountsPayableSum);
         dcBalanceSheet.setAccountsPayable(accountsPayableSum);
-
+        // 应收款项
+        BigDecimal accountsReceivableSum = dcSupplierTransactionMapper.getAccountsReceivable(date);
+        dcBalanceSheet.setAccountsReceivable(accountsReceivableSum);
         // 成品供应商预付款项
         BigDecimal finishedPrepaymentSum = dcSupplierTransactionMapper.getFinishedPrepaymentSum(date);
         if(finishedPrepaymentSum == null) finishedPrepaymentSum = BigDecimal.ZERO;