From da0b1cba16acc0794db1373496d4bcfe2a38c343 Mon Sep 17 00:00:00 2001
From: 18942506660 <18942506660@A18942506660>
Date: Wed, 6 Mar 2024 17:20:36 +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 | 39 +++++++++++++------
 src/WMS.Web.Domain/Mappers/OutStockMapper.cs  |  8 ++--
 .../OutStockTaskRepositories.cs               |  8 ++--
 3 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs
index 4cfa69a2..82720d74 100644
--- a/src/WMS.Web.Api/Controllers/TestController.cs
+++ b/src/WMS.Web.Api/Controllers/TestController.cs
@@ -72,7 +72,22 @@ namespace WMS.Web.Api.Controllers
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-           var st= await _erpService.BillQueryForDeliveryNoticeOutStock();
+            //var list = await _outStockTaskRepositories.GetEntityList(new List<int> { 14321 });
+           
+            //list[0].Details[0].ErpDetails[0].AccruedQty = 2;
+            //list[0].Details[0].ErpDetails.Add(new OutStockTaskErpDetails()
+            //{
+            //    Erp_DetailId = 1
+            //});
+            //list[0].Details.Add(new OutStockTaskDetails()
+            //{
+            //    AccruedQty = 2
+            //});
+            //var b = await _outStockTaskRepositories.EditEntityList(list);
+
+            //List<string> s = new List<string>();
+            //s.Add("XSCKD10629693");
+            //var st = await _outStockTaskService.BillQueryForSalOutStock(true, s);
             return "";
         }
 
@@ -118,7 +133,7 @@ namespace WMS.Web.Api.Controllers
             //    t.BarCode = item.BarCode;
             //    list.Add(t);
             //}
-           
+
             var tt = JsonConvert.SerializeObject(result);
 
             return tt;
@@ -160,11 +175,13 @@ namespace WMS.Web.Api.Controllers
             var materials = materials_result.Data.ToList();
 
             var mL = materials.Where(f => f.MaterialNumber.Contains(number))
-                .Select(s=>new { 
-                    Id=s.MaterialId, 
-                    Number=s.MaterialNumber, 
-                    name=s.MaterialName }).ToList();
-            foreach(var m in mL)
+                .Select(s => new
+                {
+                    Id = s.MaterialId,
+                    Number = s.MaterialNumber,
+                    name = s.MaterialName
+                }).ToList();
+            foreach (var m in mL)
             {
                 mList.Add((m.Id, m.Number, m.name));
             }
@@ -196,7 +213,7 @@ namespace WMS.Web.Api.Controllers
             List<int> mIds = materials.Where(w => materialNumbers.Contains(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();
+                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++)
@@ -278,10 +295,10 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("lst")]
-        public string Lst() 
+        public string Lst()
         {
-            var successStr = "tongfei test lst->数据库链接地址：" + _options.DBConnectionString+"，单点项目链接地址："+_options.SingleBaseUrl;
-            return successStr;            
+            var successStr = "tongfei test lst->数据库链接地址：" + _options.DBConnectionString + "，单点项目链接地址：" + _options.SingleBaseUrl;
+            return successStr;
         }
 
         /// <summary>
diff --git a/src/WMS.Web.Domain/Mappers/OutStockMapper.cs b/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
index a71c62dc..5a644575 100644
--- a/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
+++ b/src/WMS.Web.Domain/Mappers/OutStockMapper.cs
@@ -13,10 +13,10 @@ namespace WMS.Web.Domain.Mappers
     {
         public OutStockMapper()
         {
-            CreateMap<OutStockTask, OutStockTask>()
-                 .ForMember(x => x.Details, opt => opt.Ignore());
-            CreateMap<OutStockTaskDetails, OutStockTaskDetails>()
-                 .ForMember(x => x.ErpDetails, opt => opt.Ignore());
+            CreateMap<OutStockTask, OutStockTask>();
+                 //.ForMember(x => x.Details, opt => opt.Ignore());
+            CreateMap<OutStockTaskDetails, OutStockTaskDetails>();
+                 //.ForMember(x => x.ErpDetails, opt => opt.Ignore());
             CreateMap<OutStockTaskErpDetails, OutStockTaskErpDetails>();
 
             CreateMap<OutStock, OutStock>()
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index 25c6b14d..6d272c6b 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -131,8 +131,8 @@ namespace WMS.Web.Repositories
                     .Where(f => list.Contains(f.Id)).ToListAsync();
 
                 _mapper.ToMapList(entitys, res);
-                _mapper.ToMapList(entitys.SelectMany(s => s.Details).ToList(), res.SelectMany(s => s.Details).ToList());
-                _mapper.ToMapList(entitys.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList(), res.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList());
+                //_mapper.ToMapList(entitys.SelectMany(s => s.Details).ToList(), res.SelectMany(s => s.Details).ToList());
+               // _mapper.ToMapList(entitys.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList(), res.SelectMany(s => s.Details).SelectMany(s => s.ErpDetails).ToList());
                 await _context.SaveChangesAsync();
                 if (_transaction != null)
                     _transaction.Commit();
@@ -195,8 +195,8 @@ namespace WMS.Web.Repositories
                 if (res == null) return null;
 
                 _mapper.Map(entity, res);
-                _mapper.ToMapList(entity.Details, res.Details);
-                _mapper.ToMapList(entity.Details.SelectMany(s => s.ErpDetails).ToList(), res.Details.SelectMany(s => s.ErpDetails).ToList());
+                //_mapper.ToMapList(entity.Details, res.Details);
+                //_mapper.ToMapList(entity.Details.SelectMany(s => s.ErpDetails).ToList(), res.Details.SelectMany(s => s.ErpDetails).ToList());
                 await _context.SaveChangesAsync();
 
                 if (_transaction != null)