From b17055eab6de31d393d8cda327ba98111bce8a1c Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 26 Sep 2023 19:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=84=E5=94=AE=E5=BA=93=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=E5=88=86=E9=A1=B5=E5=AF=BC=E5=87=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=85=A8=E9=83=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                                    | 31 +++----------------
 build/build.cmd                               |  1 -
 build/build.sh                                |  1 +
 .../Entities/BQ/VmiAppService.cs              |  2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 build/build.cmd

diff --git a/.drone.yml b/.drone.yml
index 4addc79c..652f073d 100644
--- a/.drone.yml
+++ b/.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
diff --git a/build/build.cmd b/build/build.cmd
deleted file mode 100644
index 6ef4d1f3..00000000
--- a/build/build.cmd
+++ /dev/null
@@ -1 +0,0 @@
-dotnet publish -v normal -c Release -r win-x64 ../code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host -o ./publish
diff --git a/build/build.sh b/build/build.sh
index 6ef4d1f3..584397c0 100644
--- a/build/build.sh
+++ b/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
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 bf063116..c3fd785e 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
@@ -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;