From b26f09fbbdcade81c48748eed8a89fe7f37416be Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Fri, 21 Jun 2024 13:43:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E7=AE=B1=E7=94=9F=E6=88=90=E6=96=B0?=
 =?UTF-8?q?=E7=AE=B1=E6=97=B6=E6=94=AF=E6=8C=81=E5=A4=9A=E6=9D=A1=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2      | Bin 274420 -> 274420 bytes
 .../Services/ChangeMoveBoxService.cs          |  20 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index fd87d6f7ebc6b88006ec91569e859d9d038cd136..4f2c2cc269ee2a92010b297d5c4fc31e4fe61122 100644
GIT binary patch
delta 302
zcmWm5KTE?v9LDipeu6C)>FS~gir|#X{oh;!l^{-n<6Z7Dy2Vl4x@jAw=Oldv)j<fj
zi7&u+VBdg)M@m6lOqS2{U7p2!u$T{SUeR89NE3^#R4Su+%(#sW){2tM*@QP3VlpnQ
zbeYlI<uWFUQHP}wLNTYLCLN?Y%0H)w45ulorfD>Tg9Ou<+lE9ko?|Ph##yeN6)`iK
z>Vy*Knh}Irp`Esp;oKR;DRWxJwz@rwE_Q%-_WgSiZ4G-xRP_p&Ui+6C9{hI+pVeCc
ziO5|yY_8Pd5{_HyFo6>JFzO!F4L|)bZfo3D*;d(<KLyzJCpE0C-*-zi3Rlf%63$os
W#}c;DqyJjMhJUJ|U;QoNSN;PDhi;_+

delta 421
zcmWm6zb^zq6bJCz9eXw+p+RzpNF)-~?9Pwf=`@Z@uFxnH#O>TnAt4k*!G%hNvl3G%
z_zP5${U3Dx0)K(zUglh(GSj^8=e@l5hTqe}@9FE0V71*$mB_o4@J_~fAtX+zORlw)
zSW=znLUCSTl4~V}N)tk<)SR+hsx(a!E^1-IYQns?19JP?4yxC7_>R^YmQ3>wNeN4-
zA|m5C;~48Kqm=7H2$?XQVV-9x&zLGQ(jinNiYwZon5yb-JKSACqPAvkKEtKk_$;jA
zGxXLo+a-Fb??o*Odj?8`>-*mO=3<C0>IdEj=4%tpOcmZmWTETPts1{54vw^MbYuq;
zEjWn=6BZ7m7Mw;dEG&+-;68R?;TXBSV`SkOm4ShWc+0vnn1sGp-|Nxq(W^1$)Nohx
z9`g<h9t-ASgyv?-xD5Jm?*2T(&iID47M^1BF+$6;KW^BEOIJ&{LQUu)IEtFp-w6HX
E|5Gfa1ONa4

diff --git a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
index a96d9f31..460e5479 100644
--- a/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
+++ b/src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs
@@ -82,7 +82,7 @@ namespace WMS.Web.Domain.Services
                         //if (d.DestBoxBillNo.Substring(0, 3) != "CTN")
                         //    return Result.ReFailure(ResultCodes.BoxBillNoError);
 
-                        var res = await CreateBox(d);
+                        var res = await CreateBox(dto);
                         if (!res.IsSuccess) return res;
                         dBox = await _boxRepositories.GetByNo(d.DestBoxBillNo);
                         dto.ForEach(f => f.DestBoxId = dBox.Id);
@@ -240,22 +240,28 @@ namespace WMS.Web.Domain.Services
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        private async Task<Result> CreateBox(SaveChangeBoxRecordRequest dto)
+        private async Task<Result> CreateBox(List<SaveChangeBoxRecordRequest> dto)
         {
             //增加一个空箱子
             List<OpsBoxResponse> list = new List<OpsBoxResponse>();
-            OpsBoxResponse response = new OpsBoxResponse() { BoxBillNo = dto.DestBoxBillNo };
-            foreach (var d in dto.Details)
+            OpsBoxResponse response = new OpsBoxResponse() { BoxBillNo = dto.First().DestBoxBillNo };
+
+            var details = dto.SelectMany(s => s.Details);
+           var materialNumberList= details.GroupBy(g => g.MaterialNumber).Select(s => s.Key).ToList();
+
+            foreach (var m in materialNumberList)
             {
+                var qty = details.Where(w => w.MaterialNumber.Equals(m)).Sum(s => s.Qty);
+                var serialNumbers = details.Where(w => w.MaterialNumber.Equals(m)).SelectMany(s => s.SerialNumbers);
                 List<OpsSerialNumbersResponse> s = new List<OpsSerialNumbersResponse>();
-                foreach (var sd in d.SerialNumbers)
+                foreach (var sd in serialNumbers)
                 {
                     s.Add(new OpsSerialNumbersResponse() { SerialNumber = sd });
                 }
                 OpsBoxDetailsResponse dr = new OpsBoxDetailsResponse()
                 {
-                    MaterialNumber = d.MaterialNumber,
-                    Qty = d.Qty,
+                    MaterialNumber = m,
+                    Qty = qty,
                     SerialNumbers = s
                 };
                 response.Details.Add(dr);