From db2e24f7d1ce042a82d6b064490e18391af6b8c9 Mon Sep 17 00:00:00 2001
From: wet <1034391973@qq.com>
Date: Wed, 16 Aug 2023 08:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95=E7=8A=B6=E6=80=81=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingOrderService.cs       | 23 ++++++++++++++++++-
 .../BookingOrder/Dto/BookingOrderDto.cs       |  6 +++++
 .../BookingOrder/Dto/PageBookingOrder.cs      |  4 ++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
index 57ba819d..4599fdcf 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs
@@ -724,6 +724,14 @@ namespace Myshipping.Application
 
 
                 item.statuslogs1 = CNTRNODtolist;
+
+                var extendstate = await _repextendstate.FirstOrDefaultAsync(x => x.bookingId == item.Id);
+                if (extendstate!=null) {
+
+                    item.ExtendState = extendstate;
+                }
+              
+
             }
 
 
@@ -1150,6 +1158,12 @@ namespace Myshipping.Application
                         LinkUrlVmgSi = ordUrl.UrlVgmSi,
                     };
                 }
+                var extendstate = await _repextendstate.FirstOrDefaultAsync(x => x.bookingId == Id);
+                if (extendstate != null)
+                {
+                    ordOut.ExtendState = extendstate;
+                    //检索EDI扩展
+                }
             }
             List<BookingOrderDto> HbList = new List<BookingOrderDto>();
             var _hblist = await _rep.AsQueryable().Where(x => x.ParentId == Id).ToListAsync();
@@ -1178,8 +1192,9 @@ namespace Myshipping.Application
                 }
                 ordOut.HbList = HbList;
             }
+          
+
 
-            //检索EDI扩展
             var ediExtEntity = _bookingEDIExt.FirstOrDefault(u => u.BookingId == Id);
 
             if (ediExtEntity != null)
@@ -1561,6 +1576,12 @@ namespace Myshipping.Application
                         LinkUrlVmgSi = ordUrl.UrlVgmSi,
                     };
                 }
+                var extendstate = await _repextendstate.FirstOrDefaultAsync(x => x.bookingId == Id);
+                if (extendstate != null)
+                {
+                    ordOut.ExtendState = extendstate;
+                    //检索EDI扩展
+                }
             }
             List<BookingOrderDto> HbList = new List<BookingOrderDto>();
             var _hblist = await _rep.AsQueryable().Where(x => x.ParentId == Id).ToListAsync();
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
index 3ad1345d..1ced0a2e 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using Myshipping.Application.Entity;
 using Myshipping.Core;
 
 namespace Myshipping.Application
@@ -825,6 +826,11 @@ namespace Myshipping.Application
         /// 箱高
         /// </summary>
         public decimal CtrnHeight { get; set; }
+
+        /// <summary>
+        /// 扩展状态
+        /// </summary>
+        public BookingExtendState ExtendState { get; set; }
     }
 
     /// <summary>
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs b/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs
index f31bbf93..439bc18f 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs
@@ -968,5 +968,9 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// 状态底色
         /// </summary>
         public string GoodsStatusColor { get; set; }
+
+
+
+        public BookingExtendState ExtendState { get; set; }
     }
 }