Commit 5194b1f2 by huluobin

update

parent 32686035
...@@ -30,5 +30,5 @@ feign: ...@@ -30,5 +30,5 @@ feign:
default: default:
connectTimeout: 30000 connectTimeout: 30000
readTimeout: 30000 readTimeout: 30000
server: #server:
port: 1225 # port: 1225
...@@ -531,13 +531,6 @@ public class BalanceSheetService { ...@@ -531,13 +531,6 @@ public class BalanceSheetService {
dcBalanceSheet.setFixedAssets(fixedAssetsSum.add(fixedAssetsImport)); dcBalanceSheet.setFixedAssets(fixedAssetsSum.add(fixedAssetsImport));
dcBalanceSheetNew.setFixedAssets(fixedAssetsSum.add(fixedAssetsImport)); dcBalanceSheetNew.setFixedAssets(fixedAssetsSum.add(fixedAssetsImport));
// // 货品库存
// dcInventoryBalanceMapper.deleteInventoryBalance(date);
// dcInventoryBalanceMapper.insertInventoryBalance(date);
//
// // 货品调拨在途
// dcInventoryBalanceMapper.insertTransferInventoryBalance(date);
// FBA在库金额 // FBA在库金额
BigDecimal fbaInventoryAmountSum = dcInventoryBalanceMapper.getFbaInventoryAmountSum(date); BigDecimal fbaInventoryAmountSum = dcInventoryBalanceMapper.getFbaInventoryAmountSum(date);
dcBalanceSheet.setFbaInventoryAmount(fbaInventoryAmountSum); dcBalanceSheet.setFbaInventoryAmount(fbaInventoryAmountSum);
......
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