数据中心--资产负债表存货半成品在库金额、存货半成品在途金额拆分为百伦与哈倪蔓

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

@@ -58,6 +58,14 @@ public class DcBalanceSheet {
 
     private BigDecimal semiTransferAmount;
 
+    private BigDecimal semiBailunInventoryAmount;
+
+    private BigDecimal semiHaNiInventoryAmount;
+
+    private BigDecimal semiBailunTransferAmount;
+
+    private BigDecimal semiHaNiTransferAmount;
+
     private BigDecimal fixedAssets;
 
     private BigDecimal shortTermBorrow;

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

@@ -20,4 +20,12 @@ public interface DcSemiDailyStockMapper {
     @Select("select sum(inventory_amount) from dc_semi_daily_stock where day = #{lastDay}")
     BigDecimal getSemiDailyStockSum(@Param("lastDay") Date lastDay);
 
+    @Select("select sum(inventory_amount) from dc_semi_daily_stock where day = #{lastDay} and warehouse_id in (27,1,26,5,17,15,19,18,2)")
+    BigDecimal getSemiBailunDailyStockSum(@Param("lastDay") Date lastDay);
+
+    @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);
+
+
+
 }
\ No newline at end of file

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

@@ -17,9 +17,13 @@ public interface DcSemiDailyTransferMapper {
             "</script>")
     void insertSemiDailyTransfer(@Param("lastDay") Date lastDay);
 
-
-
     @Select("select sum(transfer_quantity * unit_price) from dc_semi_daily_transfer where day = #{lastDay}")
     BigDecimal getSemiDailyTransferSum(@Param("lastDay") Date lastDay);
 
+    @Select("select sum(transfer_quantity * unit_price) from dc_semi_daily_transfer where day = #{lastDay} and warehouse_id in (27,1,26,5,17,15,19,18,2)")
+    BigDecimal getSemiBailunDailyTransferSum(@Param("lastDay") Date lastDay);
+
+    @Select("select sum(transfer_quantity * unit_price) from dc_semi_daily_transfer where day = #{lastDay} and warehouse_id in (16,9)")
+    BigDecimal getSemiHaNiDailyTransferSum(@Param("lastDay") Date lastDay);
+
 }
\ No newline at end of file

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

@@ -463,11 +463,27 @@ public class BalanceSheetService {
         BigDecimal semiInventoryAmountSum = dcSemiDailyStockMapper.getSemiDailyStockSum(date);
         if(semiInventoryAmountSum == null) semiInventoryAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiInventoryAmount(semiInventoryAmountSum);
+        //半成品在库金额=百伦
+        BigDecimal semiBailunInventoryAmountSum = dcSemiDailyStockMapper.getSemiBailunDailyStockSum(date);
+        if(semiBailunInventoryAmountSum == null) semiBailunInventoryAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setSemiBailunInventoryAmount(semiBailunInventoryAmountSum);
+        //半成品在库金额-哈尼曼
+        BigDecimal semiHaNiInventoryAmountSum = dcSemiDailyStockMapper.getSemiHaNiDailyStockSum(date);
+        if(semiHaNiInventoryAmountSum == null) semiHaNiInventoryAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setSemiHaNiInventoryAmount(semiHaNiInventoryAmountSum);
         // 半成品在途金额 恢复,不汇总进去存货里面
 //        BigDecimal semiTransferAmountSum =  BigDecimal.ZERO;
         BigDecimal semiTransferAmountSum = dcSemiDailyTransferMapper.getSemiDailyTransferSum(date);
         if(semiTransferAmountSum == null) semiTransferAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiTransferAmount(semiTransferAmountSum);
+        //半成品在途金额=百伦
+        BigDecimal semiBailunTransferAmountSum = dcSemiDailyTransferMapper.getSemiBailunDailyTransferSum(date);
+        if(semiBailunTransferAmountSum == null) semiBailunTransferAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setSemiBailunTransferAmount(semiBailunTransferAmountSum);
+        //半成品在途金额=哈尼曼
+        BigDecimal semiHaNiTransferAmountSum = dcSemiDailyTransferMapper.getSemiHaNiDailyTransferSum(date);
+        if(semiHaNiTransferAmountSum == null) semiHaNiTransferAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setSemiHaNiTransferAmount(semiHaNiTransferAmountSum);
         // 存货 金额
 //        BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum);
         BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiInventoryAmountSum);

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

@@ -329,9 +329,21 @@
       <if test="semiInventoryAmount != null">
         semi_inventory_amount = #{semiInventoryAmount,jdbcType=DECIMAL},
       </if>
+      <if test="semiBailunInventoryAmount != null">
+        semi_bailun_inventory_amount = #{semiBailunInventoryAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="semiHaNiInventoryAmount != null">
+        semi_hani_inventory_amount = #{semiHaNiInventoryAmount,jdbcType=DECIMAL},
+      </if>
       <if test="semiTransferAmount != null">
         semi_transfer_amount = #{semiTransferAmount,jdbcType=DECIMAL},
       </if>
+      <if test="semiBailunTransferAmount != null">
+        semi_bailun_transfer_amount = #{semiBailunTransferAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="semiHaNiTransferAmount != null">
+        semi_hani_transfer_amount = #{semiHaNiTransferAmount,jdbcType=DECIMAL},
+      </if>
       <if test="fixedAssets != null">
         fixed_assets = #{fixedAssets,jdbcType=DECIMAL},
       </if>