数据中心--资产负债表在途数据拆分在途、调拨在途、调拨计划在途、采购在途

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/entity/DcBalanceSheet.java

@@ -42,6 +42,18 @@ public class DcBalanceSheet {
 
     private BigDecimal notFbaTransferAmount;
 
+    private BigDecimal fbaTransferPlanAmount;
+
+    private BigDecimal notFbaTransferPlanAmount;
+
+    private BigDecimal fbaTransferAllotAmount;
+
+    private BigDecimal notFbaTransferAllotAmount;
+
+    private BigDecimal fbaPurchaseAmount;
+
+    private BigDecimal notFbaPurchaseAmount;
+
     private BigDecimal semiInventoryAmount;
 
     private BigDecimal semiTransferAmount;

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

@@ -27,8 +27,10 @@ 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) + (s.unit_price * t.quantity_purchase * r.exchange_rate)),#{lastDay},1" +
+    @Insert("insert into dc_inventory_balance(warehouse_code,warehouse_name,hq_type,balance_rmb,statistical_time,is_transfer,transfer_rmb,transfer_plan_rmb,purchase_rmb)" +
+            " 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,sum(s.unit_price * (t.quantity_transfer - t.quantity_transfer_plan) * r.exchange_rate),sum(s.unit_price * t.quantity_transfer_plan * r.exchange_rate)," +
+            "sum(s.unit_price * t.quantity_purchase * r.exchange_rate)" +
             " 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" +
@@ -61,7 +63,7 @@ public interface DcInventoryBalanceMapper {
     BigDecimal getNotFbaInventoryAmountSum(@Param("lastDay")Date lastDay);
 
     /**
-     * 获取FBA在途金额
+     * 获取FBA在途金额(调拨+采购)
      * @param lastDay
      * @return
      */
@@ -69,14 +71,60 @@ public interface DcInventoryBalanceMapper {
     BigDecimal getFbaTransferAmountSum(@Param("lastDay")Date lastDay);
 
     /**
-     * 获取非FBA在库金额
+     * 获取非FBA在途金额(调拨+采购)
      * @param lastDay
      * @return
      */
     @Select("select sum(balance_rmb) from dc_inventory_balance where statistical_time = #{lastDay} and hq_type<>'FBA仓' and is_transfer=1")
     BigDecimal getNotFbaTransferAmountSum(@Param("lastDay")Date lastDay);
 
+    /**
+     * 获取FBA在途金额(调拨不包含计划)
+     * @param lastDay
+     * @return
+     */
+    @Select("select sum(transfer_rmb) from dc_inventory_balance where statistical_time = #{lastDay} and hq_type='FBA仓' and is_transfer=1")
+    BigDecimal getFbaTransferAllotAmountSum(@Param("lastDay")Date lastDay);
+
+    /**
+     * 获取非FBA在途金额(调拨不包含计划)
+     * @param lastDay
+     * @return
+     */
+    @Select("select sum(transfer_rmb) from dc_inventory_balance where statistical_time = #{lastDay} and hq_type<>'FBA仓' and is_transfer=1")
+    BigDecimal getNotFbaTransferAllotAmountSum(@Param("lastDay")Date lastDay);
+
+    /**
+     * 获取FBA调拨计划在途金额
+     * @param lastDay
+     * @return
+     */
+    @Select("select sum(transfer_plan_rmb) from dc_inventory_balance where statistical_time = #{lastDay} and hq_type='FBA仓' and is_transfer=1")
+    BigDecimal getFbaTransferPlanAmountSum(@Param("lastDay")Date lastDay);
+
+    /**
+     * 获取非FBA调拨计划在途金额
+     * @param lastDay
+     * @return
+     */
+    @Select("select sum(transfer_plan_rmb) from dc_inventory_balance where statistical_time = #{lastDay} and hq_type<>'FBA仓' and is_transfer=1")
+    BigDecimal getNotFbaTransferPlanAmountSum(@Param("lastDay")Date lastDay);
 
+    /**
+     * 获取FBA采购在途金额
+     * @param lastDay
+     * @return
+     */
+    @Select("select sum(purchase_rmb) from dc_inventory_balance where statistical_time = #{lastDay} and hq_type='FBA仓' and is_transfer=1")
+    BigDecimal getFbaPurchaseAmountSum(@Param("lastDay")Date lastDay);
+
+    /**
+     * 获取非FBA采购在途金额
+     * @param lastDay
+     * @return
+     */
+    @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(b.balance_rmb) from dc_inventory_balance b,dc_inventory_company_relation r" +

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

@@ -427,14 +427,38 @@ public class BalanceSheetService {
         BigDecimal notFbaInventoryAmountSum = dcInventoryBalanceMapper.getNotFbaInventoryAmountSum(date);
         if(notFbaInventoryAmountSum == null) notFbaInventoryAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setNotFbaInventoryAmount(notFbaInventoryAmountSum);
-        // FBA在途金额
+        // FBA在途金额(调拨+采购)
         BigDecimal fbaTransferAmountSum = dcInventoryBalanceMapper.getFbaTransferAmountSum(date);
         if(fbaTransferAmountSum == null) fbaTransferAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setFbaTransferAmount(fbaTransferAmountSum);
-        // 非FBA在途金额
+        // 非FBA在途金额(调拨+采购)
         BigDecimal notFbaTransferAmountSum = dcInventoryBalanceMapper.getNotFbaTransferAmountSum(date);
         if(notFbaTransferAmountSum == null) notFbaTransferAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setNotFbaTransferAmount(notFbaTransferAmountSum);
+        // FBA调拨在途金额(调拨不包含计划)
+        BigDecimal fbaTransferAllotAmountSum = dcInventoryBalanceMapper.getFbaTransferAllotAmountSum(date);
+        if(fbaTransferAllotAmountSum == null) fbaTransferAllotAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setFbaTransferAllotAmount(fbaTransferAllotAmountSum);
+        // 非FBA调拨在途金额(调拨不包含计划)
+        BigDecimal notFbaTransferAllotAmountSum = dcInventoryBalanceMapper.getNotFbaTransferAllotAmountSum(date);
+        if(notFbaTransferAllotAmountSum == null) notFbaTransferAllotAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setNotFbaTransferAllotAmount(notFbaTransferAllotAmountSum);
+        // FBA调拨计划在途金额
+        BigDecimal fbaTransferPlanAmountSum = dcInventoryBalanceMapper.getFbaTransferPlanAmountSum(date);
+        if(fbaTransferPlanAmountSum == null) fbaTransferPlanAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setFbaTransferPlanAmount(fbaTransferPlanAmountSum);
+        // 非FBA调拨计划在途金额
+        BigDecimal notFbaTransferPlanAmountSum = dcInventoryBalanceMapper.getNotFbaTransferPlanAmountSum(date);
+        if(notFbaTransferPlanAmountSum == null) notFbaTransferPlanAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setNotFbaTransferPlanAmount(notFbaTransferPlanAmountSum);
+        // FBA采购在途金额
+        BigDecimal fbaPurchaseAmountSum = dcInventoryBalanceMapper.getFbaPurchaseAmountSum(date);
+        if(fbaPurchaseAmountSum == null) fbaPurchaseAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setFbaPurchaseAmount(fbaPurchaseAmountSum);
+        // 非FBA采购在途金额
+        BigDecimal notFbaPurchaseAmountSum = dcInventoryBalanceMapper.getNotFbaPurchaseAmountSum(date);
+        if(notFbaPurchaseAmountSum == null) notFbaPurchaseAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setNotFbaPurchaseAmount(notFbaPurchaseAmountSum);
         // 半成品在库金额
         BigDecimal semiInventoryAmountSum = dcSemiDailyStockMapper.getSemiDailyStockSum(date);
         if(semiInventoryAmountSum == null) semiInventoryAmountSum = BigDecimal.ZERO;
@@ -446,7 +470,7 @@ public class BalanceSheetService {
         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);
+        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiInventoryAmountSum);
         dcBalanceSheet.setInventoryAmount(inventoryBalanceSum);
         dcBalanceSheet.setCompanyValue(0);
         dcBalanceSheet.setStatisticalTime(date);

data-finance/finance-balance-sheet/src/main/resources/mapper/DcBalanceSheetMapper.xml

@@ -308,6 +308,24 @@
       <if test="notFbaTransferAmount != null">
         not_fba_transfer_amount = #{notFbaTransferAmount,jdbcType=DECIMAL},
       </if>
+      <if test="fbaTransferAllotAmount != null">
+        fba_transfer_allot_amount = #{fbaTransferAllotAmount, jdbcType=DECIMAL},
+      </if>
+      <if test="notFbaTransferAllotAmount != null">
+        not_fba_transfer_allot_amount = #{notFbaTransferAllotAmount, jdbcType=DECIMAL},
+      </if>
+      <if test="fbaTransferPlanAmount != null">
+        fba_transfer_plan_amount = #{fbaTransferPlanAmount, jdbcType=DECIMAL},
+      </if>
+      <if test="notFbaTransferPlanAmount != null">
+        not_fba_transfer_plan_amount = #{notFbaTransferPlanAmount, jdbcType=DECIMAL},
+      </if>
+      <if test="fbaPurchaseAmount != null">
+        fba_purchase_amount = #{fbaPurchaseAmount, jdbcType=DECIMAL},
+      </if>
+      <if test="notFbaPurchaseAmount != null">
+        not_fba_purchase_amount = #{notFbaPurchaseAmount, jdbcType=DECIMAL},
+      </if>
       <if test="semiInventoryAmount != null">
         semi_inventory_amount = #{semiInventoryAmount,jdbcType=DECIMAL},
       </if>