资产负债-自产采购发货在途

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

@@ -58,6 +58,8 @@ public class DcBalanceSheet {
 
     private BigDecimal notFbaPurchaseAmount;
 
+    private BigDecimal purchaseProAmount;
+
     private BigDecimal semiInventoryAmount;
 
     private BigDecimal semiTransferAmount;

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

@@ -27,9 +27,9 @@ public interface DcInventoryBalanceMapper {
      * @param lastDay
      */
     @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) + (s.unit_price * t.quantity_purchase))," +
-            "#{lastDay},1,sum(s.unit_price * (t.quantity_transfer - t.quantity_transfer_plan)),sum(s.unit_price * t.quantity_transfer_plan)," +
-            "sum(s.unit_price * t.quantity_purchase)" +
+            " select t.warehouse_code,w.warehouse_name,w.hq_type,sum((t.unit_price * t.quantity_transfer) + (t.unit_price * t.quantity_purchase))," +
+            "#{lastDay},1,sum(t.unit_price * (t.quantity_transfer - t.quantity_transfer_plan)),sum(t.unit_price * t.quantity_transfer_plan)," +
+            "sum(t.unit_price * t.quantity_purchase)" +
             " 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" +
             " where t.record_time = #{lastDay}" +
@@ -127,6 +127,9 @@ 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')")
+    BigDecimal getPurchaseProAmount(@Param("lastDay")Date lastDay);
+
 
     /*@Select("select sum(b.balance_rmb) from dc_inventory_balance b,dc_inventory_company_relation r" +
             " where b.warehouse_code = r.warehouse_code and r.company_value = #{companyValue} and b.statistical_time = #{lastDay}")

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

@@ -26,7 +26,7 @@ public interface DcSemiDailyStockMapper {
     @Select("select sum(inventory_amount) from dc_semi_daily_stock where day = #{lastDay} and warehouse_id in (16,9)")
     BigDecimal getSemiHaNiDailyStockSum(@Param("lastDay") Date lastDay);
 
-    @Select("select sum((jit_prod_stock + plan_prod_stock) * new_price) from dc_semi_stock_prod_daily where record_time = #{lastDay}")
+    @Select("select sum((jit_prod_stock + plan_prod_stock) * new_price) from dc_semi_stock_prod_daily where record_time = #{lastDay} and warehouse_name != '哈倪蔓美甲灌装车间'")
     BigDecimal getSemiProdInventoryAmountSum(@Param("lastDay") Date lastDay);
 
 }
\ No newline at end of file

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

@@ -469,6 +469,9 @@ 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);
         // 半成品在库金额
         BigDecimal semiInventoryAmountSum = dcSemiDailyStockMapper.getSemiDailyStockSum(date);
         if(semiInventoryAmountSum == null) semiInventoryAmountSum = BigDecimal.ZERO;

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

@@ -332,6 +332,9 @@
       <if test="notFbaPurchaseAmount != null">
         not_fba_purchase_amount = #{notFbaPurchaseAmount, jdbcType=DECIMAL},
       </if>
+      <if test="purchaseProAmount != null">
+        purchase_pro_amount = #{purchaseProAmount, jdbcType=DECIMAL},
+      </if>
       <if test="semiInventoryAmount != null">
         semi_inventory_amount = #{semiInventoryAmount,jdbcType=DECIMAL},
       </if>