From 0436794d74d4a48f38d76799685f8ed448fffcc0 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Thu, 30 Nov 2023 14:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs | 9 +++++++--
 src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml       | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 871ab7b5..144889c6 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -95,9 +95,14 @@ namespace WMS.Web.Api.Controllers
 
             // var result = await this._erpService.BillQueryForSupplier();
 
-            var result= await this._erpService.BillQueryForTransferDirect();
+            var result= await this._erpService.BillQueryForAssembledApp_Assembly();
 
-            var tt = JsonConvert.SerializeObject(result.Data);
+            var result2 = await this._erpService.BillQueryForAssembledApp_Disassembly();
+
+            var  list= result.Data.ToList();
+            list.AddRange(result2.Data.ToList());
+
+            var tt = JsonConvert.SerializeObject(list);
 
             //var tttt = new List<string>() {  "ABCD14200999" };
             //var boxInventorys = await _boxInventoryRepositories.Get(142);
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 387a3b4d..a087b68f 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -570,7 +570,7 @@
             </summary>
             <param name="str"></param>
             <param name="number"></param>
-            <param name="materialNumber"></param>
+            <param name="materialNumbers"></param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Api.Controllers.TestController.InStock">