库存、在途计算金额包含占用库存

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 * r.exchange_rate),#{lastDay},0" +
+            " 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" +
             " 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" +
@@ -28,7 +28,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 t.warehouse_code,w.warehouse_name,w.hq_type,sum(s.unit_price * t.quantity_transfer * r.exchange_rate),#{lastDay},1" +
+            " select t.warehouse_code,w.warehouse_name,w.hq_type,sum((s.unit_price * t.quantity_transfer * r.exchange_rate) + (s.unit_price * t.quantity_purchase * r.exchange_rate)),#{lastDay},1" +
             " from dc_daily_transit t left join dc_base_sku s on t.bailun_sku = s.bailun_sku" +
             " left join dc_base_warehouse w on t.warehouse_code = w.warehouse_code" +
             " left join dc_exchange_rate r on s.currency = r.init_curreny" +