Commit c4def909 by yinyong

数据中心--资产负债表存货计算:FBA在库金额+非FBA在库金额(不包含耗材仓)+FBA调拨在途金额(不包含调拨计划)+非FBA调拨在途金额(不包含调拨计划)+半成品在库金额(不包含哈尼曼在库)

parent 1416a4a7
...@@ -490,9 +490,9 @@ public class BalanceSheetService { ...@@ -490,9 +490,9 @@ public class BalanceSheetService {
BigDecimal semiHaNiTransferAmountSum = dcSemiDailyTransferMapper.getSemiHaNiDailyTransferSum(date); BigDecimal semiHaNiTransferAmountSum = dcSemiDailyTransferMapper.getSemiHaNiDailyTransferSum(date);
if(semiHaNiTransferAmountSum == null) semiHaNiTransferAmountSum = BigDecimal.ZERO; if(semiHaNiTransferAmountSum == null) semiHaNiTransferAmountSum = BigDecimal.ZERO;
dcBalanceSheet.setSemiHaNiTransferAmount(semiHaNiTransferAmountSum); dcBalanceSheet.setSemiHaNiTransferAmount(semiHaNiTransferAmountSum);
// 存货 金额 // 存货 金额 FBA在库金额+非FBA在库金额(不包含耗材仓)+FBA调拨在途金额(不包含调拨计划)+非FBA调拨在途金额(不包含调拨计划)+半成品在库金额
// BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum); // BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum);
BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiInventoryAmountSum); BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAllotAmountSum).add(notFbaTransferAllotAmountSum).add(semiBailunInventoryAmountSum);
dcBalanceSheet.setInventoryAmount(inventoryBalanceSum); dcBalanceSheet.setInventoryAmount(inventoryBalanceSum);
dcBalanceSheet.setCompanyValue(0); dcBalanceSheet.setCompanyValue(0);
dcBalanceSheet.setStatisticalTime(date); dcBalanceSheet.setStatisticalTime(date);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment