资产负债-统计新增半成品生产库存金额

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

@@ -64,6 +64,8 @@ public class DcBalanceSheet {
 
     private BigDecimal semiBailunInventoryAmount;
 
+    private BigDecimal semiProdInventoryAmount;
+
     private BigDecimal semiHaNiInventoryAmount;
 
     private BigDecimal semiBailunTransferAmount;

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

@@ -26,6 +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 * new_price) from dc_semi_stock_prod_daily where record_time = #{lastDay}")
+    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

@@ -479,6 +479,9 @@ public class BalanceSheetService {
         BigDecimal semiHaNiInventoryAmountSum = dcSemiDailyStockMapper.getSemiHaNiDailyStockSum(date);
         if(semiHaNiInventoryAmountSum == null) semiHaNiInventoryAmountSum = BigDecimal.ZERO;
         dcBalanceSheet.setSemiHaNiInventoryAmount(semiHaNiInventoryAmountSum);
+        BigDecimal semiProdInventoryAmountSum = dcSemiDailyStockMapper.getSemiProdInventoryAmountSum(date);
+        if(semiProdInventoryAmountSum == null) semiProdInventoryAmountSum = BigDecimal.ZERO;
+        dcBalanceSheet.setSemiProdInventoryAmount(semiProdInventoryAmountSum);
         // 半成品在途金额 恢复,不汇总进去存货里面
 //        BigDecimal semiTransferAmountSum =  BigDecimal.ZERO;
         BigDecimal semiTransferAmountSum = dcSemiDailyTransferMapper.getSemiDailyTransferSum(date);

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

@@ -350,6 +350,9 @@
       <if test="semiHaNiTransferAmount != null">
         semi_hani_transfer_amount = #{semiHaNiTransferAmount,jdbcType=DECIMAL},
       </if>
+      <if test="semiProdInventoryAmount != null">
+        semi_prod_inventory_amount = #{semiProdInventoryAmount,jdbcType=DECIMAL},
+      </if>
       <if test="fixedAssets != null">
         fixed_assets = #{fixedAssets,jdbcType=DECIMAL},
       </if>