diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-part-count.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-part-count.js index 9a5849a4..15f76582 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-part-count.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance-part-count.js @@ -34,7 +34,7 @@ function balanceSchema() { ], }, - BSEQty: { + bseQty: { title: "期初发货数量", type: "string", input: "number", @@ -44,7 +44,7 @@ function balanceSchema() { }, ], }, - BRETQty: { + bretQty: { title: "期初退货数量", type: "string", input: "number", @@ -54,7 +54,7 @@ function balanceSchema() { }, ], }, - SEQTY : { + seqty : { title: "实际发货数量", type: "string", input: "number", @@ -64,7 +64,7 @@ function balanceSchema() { }, ], }, - RETQty: { + retQty: { title: "实际退货数量", type: "string", input: "number", @@ -74,7 +74,7 @@ function balanceSchema() { }, ], }, - CANQty: { + canQty: { title: "可结数量", type: "string", input: "number", @@ -85,7 +85,7 @@ function balanceSchema() { ], }, - NOTQty: { + notQty: { title: "不可结数量", type: "string", input: "number", @@ -96,7 +96,7 @@ function balanceSchema() { ], }, - SE_SA_CAN_QTY: { + sE_SA_CAN_QTY: { title: "有发有结有价格数量", type: "string", input: "number", @@ -107,7 +107,7 @@ function balanceSchema() { ], }, - SE_SA_NOT_QTY: { + sE_SA_NOT_QTY: { title: "有发有结无价格数量", type: "string", input: "number", @@ -118,7 +118,7 @@ function balanceSchema() { ], }, - ONLY_SE_QTY: { + onlY_SE_QTY: { title: "有发运无结算数量", type: "string", input: "number", @@ -129,7 +129,7 @@ function balanceSchema() { ], }, - ONLY_SA_QTY: { + onlY_SA_QTY: { title: "有结算无发运数量", type: "string", input: "number", @@ -139,7 +139,7 @@ function balanceSchema() { }, ], }, - INVQty: { + invQty: { title: "已开票数量", type: "string", input: "number", @@ -151,7 +151,8 @@ function balanceSchema() { }, sebegin: { title: "发运开始", - type: "datetime", + type: "datetime", + }, seend: { @@ -178,14 +179,20 @@ function balanceSchema() { const schema = balanceSchema(); +Object.keys(schema.properties).forEach((o) => { + if (o === "sebegin" || o === "seend" || o === "sabegin" || o === "saend") { + schema.properties[o].hideForList = true; + } + }); + const baseUrl = "settleaccount/vmi"; -const queryUrl = `${baseUrl}/get-receive-ship-sum`; +const queryUrl = `${baseUrl}/get-ship_rec_sumlist`; const detailsUrl = `${baseUrl}/get/%s`; const createUrl = `${baseUrl}/create`; const updateUrl = `${baseUrl}/update/%s`; const deleteUrl = `${baseUrl}/delete-list`; const importUrl = `${baseUrl}/code-setting-upload-excel-import`; -const exportUrl = `${baseUrl}/get-receive-ship-sum-export`; +const exportUrl = `${baseUrl}/get-receive-ship-sum`; const queryMethod = "POST"; const detailsMethod = "POST"; const createMethod = "POST"; diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs index 94985ccc..481e4101 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs @@ -1726,17 +1726,20 @@ namespace Win.Sfs.SettleAccount.Entities.BQ [HttpPost] - public async Task> GetSHIP_REC_SUMListAsync(RequestDto input) + public async Task> GetSHIP_REC_SUMListAsync(RequestDto input) { - return await _recRepository.ToListAsync().ConfigureAwait(false); - //var entities = await _recRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false); - //var totalCount = await _recRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false); - ////var dtos = ObjectMapper.Map, List>(entities); - //return new PagedResultDto(totalCount, entities); - } - - + if(input!=null) + { + input.MaxResultCount = 100000; + } + + //return await _recRepository.ToListAsync().ConfigureAwait(false); + var entities = await _recRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true).ConfigureAwait(false); + var totalCount = await _recRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false); + return new PagedResultDto(totalCount, entities); + } + /// /// jisbbac收发汇总 @@ -1757,7 +1760,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ var seend = input.Filters.Any(p => p.Column == "seend")? input.Filters.FirstOrDefault(p => p.Column == "seend").Value : ""; var sabegin = input.Filters.Any(p => p.Column == "sabegin")? input.Filters.FirstOrDefault(p => p.Column == "sabegin").Value : ""; var saend = input.Filters.Any(p => p.Column == "saend")? input.Filters.FirstOrDefault(p => p.Column == "saend").Value : ""; - var parcode = input.Filters.Any(p => p.Column == "partcode")? input.Filters.FirstOrDefault(p => p.Column == "partcode").Value : ""; + var parcode = input.Filters.Any(p => p.Column == "partCode")? input.Filters.FirstOrDefault(p => p.Column == "partCode").Value : ""; List list = new List(); list.Add(EnumBusinessType.JisBBAC);