From 15c1f524ace27ae4fc50b033702c9fd76873e147 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 30 Nov 2023 13:44:24 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 4dabf6fc..0048ce30 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -170,24 +170,33 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <param name="str"></param>
         /// <param name="number"></param>
+        /// <param name="materialNumber"></param>
         /// <returns></returns>
         [HttpGet]
-        [Route("SCBox/{str}/{number}")]
-        public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number)
+        [Route("SCBox/{str}/{number}/{materialNumber}")]
+        public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromRoute] List<string> materialNumbers)
         {
-            var list = await GetList(str, number);
+            if (materialNumbers == null)
+                materialNumbers = new List<string>();
+            var list = await GetList(str, number, materialNumbers);
             await _boxService.Sync(list);
             return Result.ReSuccess();
         }
-        private async Task<List<OpsBoxResponse>> GetList(string str, int number)
+        private async Task<List<OpsBoxResponse>> GetList(string str, int number, List<string> materialNumbers)
         {
             var materials_result = await _erpService.BillQueryForMaterial();
             var materials = materials_result.Data.ToList();
+
+            List<int> mIds = materials.Where(w => materialNumbers.Equals(w.MaterialNumber)).Select(s => s.MaterialId).ToList();
+            int jn = 3;
+            if (mIds.Count() <= 0)
+                mIds= materials.Skip((new Random()).Next(1000, 10000)).Take(4).Select(s => s.MaterialId).ToList();
+            jn = mIds.Count() - 1;
             List<OpsBoxResponse> list = new List<OpsBoxResponse>();
             for (int i = 0; i < number; i++)
             {
                 List<OpsBoxDetailsResponse> Details = new List<OpsBoxDetailsResponse>();
-                for (int j = 0; j <= 3; j++)
+                for (int j = 0; j <= jn; j++)
                 {
                     var ran = (new Random()).Next(5, 10);
                     List<OpsSerialNumbersResponse> SerialNumbers = new List<OpsSerialNumbersResponse>();
@@ -204,7 +213,7 @@ namespace WMS.Web.Api.Controllers
                     var mi = (new Random()).Next(1000, 20000);
                     OpsBoxDetailsResponse d = new OpsBoxDetailsResponse()
                     {
-                        MaterialId = materials[mi].MaterialId,
+                        MaterialId = mIds[j],
                         Qty = ran,
                         SerialNumbers = SerialNumbers
                     };
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
index 168a90dc..35e74004 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
@@ -564,12 +564,13 @@
             <param name="number"></param>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Api.Controllers.TestController.SCBox(System.String,System.Int32)">
+        <member name="M:WMS.Web.Api.Controllers.TestController.SCBox(System.String,System.Int32,System.Collections.Generic.List{System.String})">
             <summary>
             自动生成箱信息
             </summary>
             <param name="str"></param>
             <param name="number"></param>
+            <param name="materialNumber"></param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Api.Controllers.TestController.InStock">

From 1f6c43937070b1fb7c129305b58ed2f344411b17 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 30 Nov 2023 13:45:44 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 0048ce30..fea44dbf 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -222,7 +222,7 @@ namespace WMS.Web.Api.Controllers
 
                 OpsBoxResponse response = new OpsBoxResponse()
                 {
-                    BoxBillNo = str + (500 + i).ToString(),
+                    BoxBillNo = str + ((new Random()).Next(100, 2000) + i).ToString(),
                     OpsBoxId = 100 + i,
                     CompleteCartonTime = DateTime.Now,
                     CompleteCartonUser = "02",

From c1b070a6959fd2149619a0ab17173c4c6581066f Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 30 Nov 2023 13:45:58 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/Controllers/TestController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index fea44dbf..385b0159 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -222,7 +222,7 @@ namespace WMS.Web.Api.Controllers
 
                 OpsBoxResponse response = new OpsBoxResponse()
                 {
-                    BoxBillNo = str + ((new Random()).Next(100, 2000) + i).ToString(),
+                    BoxBillNo = str + ((new Random()).Next(500, 2000) + i).ToString(),
                     OpsBoxId = 100 + i,
                     CompleteCartonTime = DateTime.Now,
                     CompleteCartonUser = "02",

From ca5271b6c24db4ff3ac8c2d9fc4911018144a986 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 30 Nov 2023 13:54:16 +0800
Subject: [PATCH 4/5] =?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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 385b0159..5d54a35f 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -173,8 +173,8 @@ namespace WMS.Web.Api.Controllers
         /// <param name="materialNumber"></param>
         /// <returns></returns>
         [HttpGet]
-        [Route("SCBox/{str}/{number}/{materialNumber}")]
-        public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromRoute] List<string> materialNumbers)
+        [Route("SCBox/{str}/{number}")]
+        public async Task<Result> SCBox([FromRoute] string str, [FromRoute] int number, [FromQuery] List<string> materialNumbers)
         {
             if (materialNumbers == null)
                 materialNumbers = new List<string>();

From 6c079fe15efd6dd71cc9894d57d29e875084f650 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Thu, 30 Nov 2023 13:54:26 +0800
Subject: [PATCH 5/5] =?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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 5d54a35f..dad68708 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -170,7 +170,7 @@ namespace WMS.Web.Api.Controllers
         /// </summary>
         /// <param name="str"></param>
         /// <param name="number"></param>
-        /// <param name="materialNumber"></param>
+        /// <param name="materialNumbers"></param>
         /// <returns></returns>
         [HttpGet]
         [Route("SCBox/{str}/{number}")]