Commit b5190ab9 by yinyong

Merge remote-tracking branch 'origin/master'

parents bd72b641 c50b1b7e
......@@ -439,9 +439,10 @@ public class BalanceSheetService {
BigDecimal semiInventoryAmountSum = dcSemiDailyStockMapper.getSemiDailyStockSum(date);
if(semiInventoryAmountSum == null) semiInventoryAmountSum = BigDecimal.ZERO;
dcBalanceSheet.setSemiInventoryAmount(semiInventoryAmountSum);
// 半成品在途金额
BigDecimal semiTransferAmountSum = dcSemiDailyTransferMapper.getSemiDailyTransferSum(date);
if(semiTransferAmountSum == null) semiTransferAmountSum = BigDecimal.ZERO;
// 半成品在途金额 吴通改为半成品在途金额设置为0。
BigDecimal semiTransferAmountSum = BigDecimal.ZERO;
// BigDecimal semiTransferAmountSum = dcSemiDailyTransferMapper.getSemiDailyTransferSum(date);
// if(semiTransferAmountSum == null) semiTransferAmountSum = BigDecimal.ZERO;
dcBalanceSheet.setSemiTransferAmount(semiTransferAmountSum);
// 库存金额
BigDecimal inventoryBalanceSum = fbaInventoryAmountSum.add(notFbaInventoryAmountSum).add(fbaTransferAmountSum).add(notFbaTransferAmountSum).add(semiInventoryAmountSum).add(semiTransferAmountSum);
......
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