From 3f351cf23f2f7a8253e29d7f6bd990a2c2b067fb Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Fri, 7 Jul 2023 17:15:05 +0800
Subject: [PATCH] =?UTF-8?q?MES=E9=BD=90=E5=A5=97=E6=90=AD=E9=85=8D?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5=E4=B8=AD=E9=97=B4=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/Outputs/CollocationSchemeOutput.cs             | 10 ++++++----
 .../Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs     |  5 ++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs
index 24ef9f82..6986be71 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/CollocationSchemeOutput.cs
@@ -3,6 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
+using SqlSugar;
 
 namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
 {
@@ -63,11 +65,11 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Outputs
         /// 齐套明细输出
         /// </summary>
         public List<CollocationSchemeDOutput>? CollocationSchemeDs { get; set; }
-
-        public List<WmsCollocationSchemeD> list{ get; set; }
+        [JsonIgnore]
+        public List<WmsCollocationSchemeD>? list { get; set; }
     }
-    
-    public class CollocationSchemeDOutput 
+
+    public class CollocationSchemeDOutput
     {
         /// <summary>
         /// 主键ID
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
index 88f7cdc4..2ade7c92 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsCollocationSchemeSevice.cs
@@ -94,13 +94,12 @@ namespace Tnb.WarehouseMgr
             try
             {
                 results = await _db.Queryable<WmsCollocationSchemeH>()
-                   .LeftJoin<WmsCollocationSchemeD>((a, b) => b.bill_id == a.id)
                    .Where(a => a.material_id == input.material_id)
-                   .Select((a, b) => new CollocationSchemeOutput
+                   .Select(a => new CollocationSchemeOutput
                    {
                        list = SqlFunc.Subqueryable<WmsCollocationSchemeD>().Where(b => b.bill_id == a.id).ToList(),
                    }, true)
-                   .Mapper(it=> it.CollocationSchemeDs = it.list.Adapt<List<CollocationSchemeDOutput>>())
+                   .Mapper(it => it.CollocationSchemeDs = it.list?.Adapt<List<CollocationSchemeDOutput>>())
                    .ToListAsync();
             }
             catch (Exception ex)