Browse Source

寄售库库存合计分页导出修改为全部导出

master
wanggang 1 year ago
parent
commit
b17055eab6
  1. 31
      .drone.yml
  2. 1
      build/build.cmd
  3. 1
      build/build.sh
  4. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

31
.drone.yml

@ -41,8 +41,8 @@ steps:
password: Microsoft@2022
command_timeout: 10m
script:
- mkdir -p /d/BQ-JS/publish
- cd /d/BQ-JS/publish
- mkdir -p /d/publish/jie-suan/bei-qi
- cd /d/publish/jie-suan/bei-qi
- ./stop.cmd
- sleep 3
- cd ..
@ -58,7 +58,7 @@ steps:
FTP_PASSWORD:
from_secret: password
PLUGIN_SRC_DIR: /build/publish
PLUGIN_DEST_DIR: /publish
PLUGIN_DEST_DIR: /jie-suan/bei-qi
PLUGIN_SECURE: false
PLUGIN_CHMOD: false
@ -71,28 +71,5 @@ steps:
password: Microsoft@2022
command_timeout: 10m
script:
- cd /d/BQ-JS/publish
- cd /d/publish/jie-suan/bei-qi
- ./start.cmd
# - name: deploy-scp
# image: appleboy/drone-scp
# settings:
# host: dev.ccwin-in.com
# port: 16085
# username: Administrator
# password: Microsoft@2022
# source: build/publish
# target: /d/BQ-JS/publish
# timeout: 1800s
# command_timeout: 30m
# - name: deploy-sftp
# image: axute/drone-sftp
# settings:
# host: dev.ccwin-in.com
# port: 16085
# username: Administrator
# password: Microsoft@2022
# source: build/publish
# target: /d/BQ-JS/publish
# strip_components: 2

1
build/build.cmd

@ -1 +0,0 @@
dotnet publish -v normal -c Release -r win-x64 ../code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host -o ./publish

1
build/build.sh

@ -1 +1,2 @@
rm -rf ./publish
dotnet publish -v normal -c Release -r win-x64 ../code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host -o ./publish

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@ -216,7 +216,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
query = string.IsNullOrEmpty(input.Sorting) ? query : DynamicQueryableExtensions.OrderBy(query, input.Sorting);
var query2 = query.GroupBy(o => new { o.ErpToLoc, o.RealPartCode }).Select(o => new VmiBalanceSumDto { ErpToLoc = o.Key.ErpToLoc, RealPartCode = o.Key.RealPartCode, Qty = o.Sum(o => o.Qty) });
var totalCount = query2.Count();
var entities = await query2.PageBy(input.SkipCount, input.MaxResultCount).ToListAsync().ConfigureAwait(false); var fileName = $"库存余额_{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.xlsx";
var entities = await query2.ToListAsync().ConfigureAwait(false); var fileName = $"库存余额_{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.xlsx";
var content = this.GetContent(entities, "库存汇总");
await _fileContainer.SaveAsync(fileName, content, true).ConfigureAwait(false);
return fileName;

Loading…
Cancel
Save