From 9f62fad75643624517e44d7a932cc7cbd0c1e72a Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 1 Nov 2024 11:46:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 276926 -> 276926 bytes
 src/WMS.Web.Api/Controllers/TestController.cs |   6 +++---
 src/WMS.Web.Api/appsettings.json              |   4 ++--
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      |   2 +-
 .../Services/ProductInventoryService.cs       |   1 +
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index a2bfa09e0e112381d00a4742a5832c583525db76..6bf88877c9140240f18f83439a2b66519987e711 100644
GIT binary patch
delta 3346
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
NvtH-8cg|bW|Nk;2u;~B*

delta 3392
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

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 5dcf507d..a706af45 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -123,9 +123,9 @@ namespace WMS.Web.Api.Controllers
             //var b = b33.Data.Where(w => w.Id == 10923342).FirstOrDefault();
             //await _juShuiTanService.GetTest();
             //string codes = "AD";
-            //var b = await _erpInventoryService.GetInventory(codes);
-            int count = 10 / 5;
-            var bcd=await _productInventoryService.LingXing();
+           //var b = await _erpInventoryService.GetInventory(new List<string>() { "111"});
+            //int count = 10 / 5;
+            //var bcd=await _productInventoryService.LingXing();
 
             //LingXingResponse<LingXingStockResponse> r = new LingXingResponse<LingXingStockResponse>();
 
diff --git a/src/WMS.Web.Api/appsettings.json b/src/WMS.Web.Api/appsettings.json
index a87d8d73..b80a9f8e 100644
--- a/src/WMS.Web.Api/appsettings.json
+++ b/src/WMS.Web.Api/appsettings.json
@@ -37,10 +37,10 @@
   },
   "ErpOptions": {
     "EndpointAddress": "http://erp.orico.com.cn/k3cloud/ERPGW.asmx", //原:119.23.206.129
-    "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/666a6c4a522823 正式账号密码 orico/A123321./Orico/663a26829afbdd
+    "UserName": "mes", //测试账号密码 mes/A1B2C3Dh/ce20210909/6723b1acf19987 正式账号密码 orico/A123321./Orico/663a26829afbdd
     "Password": "A1B2C3Dh.",
     "ErpId": "ce20210909",
-    "ZhangTaoId": "666a6c4a522823"
+    "ZhangTaoId": "6723b1acf19987"
   },
   "OpsOptions": {
     "Url": "https://api.opsscm.test.f2b211.com/", //https://api.opsscm.test.f2b211.com/
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 5f2cd6fd..23377e50 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -4132,7 +4132,7 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.LingXing.LingXingRequest.offset">
             <summary>
-             页码
+             不是页码 是从第几条数据开始 如果是第二页的话 就是1*800
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.LingXing.LingXingRequest.length">
diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
index d1e6be2e..c7505401 100644
--- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs
+++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs
@@ -93,6 +93,7 @@ namespace WMS.Web.Domain.Services
                     OrgCode = item.OrgCode,
                     StockCode = item.StockCode,
                     Qty = item.Qty,
+                    Batch=item.Batch,
                     BeforeQty = item.BeforeQty
                 };
                 inventoryList.Add(entity);