From 226127a249d30d05c3c8c0f1be2b9cfdfff47350 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Mon, 18 Mar 2024 14:49:22 +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

---
 src/WMS.Web.Api/Controllers/TestController.cs |  6 +++---
 src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml      | 10 ----------
 src/WMS.Web.Core/Dto/OpsBoxResponse.cs        | 10 +++++-----
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 5594a5fe..11b24cba 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -211,10 +211,10 @@ namespace WMS.Web.Api.Controllers
             var materials_result = await _erpService.BillQueryForMaterial();
             var materials = materials_result.Data.ToList();
 
-            List<int> mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber) && w.OrgCode == orgCode).Select(s => s.MaterialId).ToList();
+            List<string> mIds = materials.Where(w => materialNumbers.Contains(w.MaterialNumber) && w.OrgCode == orgCode).Select(s => s.MaterialNumber).ToList();
             int jn = 3;
             if (mIds.Count() <= 0)
-                mIds = materials.Where(w => w.OrgCode == orgCode).Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList();
+                mIds = materials.Where(w => w.OrgCode == orgCode).Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialNumber).ToList();
             jn = mIds.Count() - 1;
             List<OpsBoxResponse> list = new List<OpsBoxResponse>();
             for (int i = 0; i < number; i++)
@@ -237,7 +237,7 @@ namespace WMS.Web.Api.Controllers
                     var mi = (new Random()).Next(1000, 20000);
                     OpsBoxDetailsResponse d = new OpsBoxDetailsResponse()
                     {
-                        MaterialId = mIds[j],
+                        MaterialNumber = mIds[j],
                         Qty = ran,
                         SerialNumbers = SerialNumbers
                     };
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 62bc6301..4352502d 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -4198,11 +4198,6 @@
             序列号
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.MaterialResponse.MaterialId">
-            <summary>
-            物料ID
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.MaterialResponse.MaterialName">
             <summary>
             物料名称
@@ -4428,11 +4423,6 @@
             序列号生成用户
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialId">
-            <summary>
-            物料ID
-            </summary>
-        </member>
         <member name="P:WMS.Web.Core.Dto.OpsBoxDetailsResponse.MaterialNumber">
             <summary>
             物料编码
diff --git a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
index 525e5e52..b7e79cab 100644
--- a/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
+++ b/src/WMS.Web.Core/Dto/OpsBoxResponse.cs
@@ -76,11 +76,11 @@ namespace WMS.Web.Core.Dto
         
     }
     public class OpsBoxDetailsResponse {
-        /// <summary>
-        /// 物料ID
-        /// </summary>
-        [JsonProperty("FMaterialId")]
-        public int MaterialId { get; set; }
+        ///// <summary>
+        ///// 物料ID
+        ///// </summary>
+        //[JsonProperty("FMaterialId")]
+        //public int MaterialId { get; set; }
         /// <summary>
         /// 物料编码
         /// </summary>