From 32b5608c39f97467aed3f3e0eb87e1463207370c Mon Sep 17 00:00:00 2001
From: wanghaomei <wanghaomei@myshipping.net>
Date: Tue, 16 May 2023 14:56:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=A2=9E=E5=8A=A0=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Myshipping.Core/Myshipping.Core.xml                    | 10 ++++++++++
 .../Service/DjyCustomer/DjyCustomerService.cs          |  1 +
 .../Service/DjyCustomer/Dto/DjyCustomerInput.cs        |  4 ++++
 3 files changed, 15 insertions(+)

diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml
index 42bcd889..cc3c7a7a 100644
--- a/Myshipping.Core/Myshipping.Core.xml
+++ b/Myshipping.Core/Myshipping.Core.xml
@@ -10744,6 +10744,11 @@
             服务项目
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Service.QueryDjyCustomerInput.SALE">
+            <summary>
+            销售
+            </summary>
+        </member>
         <member name="T:Myshipping.Core.Service.DjyCustomerOutput">
             <summary>
             客户输出参数
@@ -18005,6 +18010,11 @@
             开船日期
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.DjyVesselInfo.YgtETD">
+            <summary>
+            开船日期
+            </summary>
+        </member>
         <member name="P:Myshipping.Application.Entity.DjyVesselInfo.ClosingDate">
             <summary>
             截港日期
diff --git a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
index 9c28f78d..1421c23c 100644
--- a/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
+++ b/Myshipping.Core/Service/DjyCustomer/DjyCustomerService.cs
@@ -67,6 +67,7 @@ namespace Myshipping.Core.Service
                 .WhereIF(!string.IsNullOrWhiteSpace(input.USDBank), u => u.USDBank.Contains(input.USDBank.Trim()))
                 .WhereIF(!string.IsNullOrWhiteSpace(input.USDAccount), u => u.USDAccount.Contains(input.USDAccount.Trim()))
                 .WhereIF(!string.IsNullOrWhiteSpace(input.ServiceItem), u => u.ServiceItem.Contains(input.ServiceItem.Trim()))
+                .WhereIF(!string.IsNullOrWhiteSpace(input.SALE), u => u.SALE.Contains(input.SALE.Trim()))
                 .WhereIF(!string.IsNullOrWhiteSpace(input.SearchValue), u => u.ShortName.Contains(input.SearchValue.Trim()) || u.CodeName.Contains(input.SearchValue.Trim()))
                 .Where(u => u.TenantId == UserManager.TENANT_ID) //权限范围目前不支持根据模块设置，客户模块暂时写死本公司数据
                 .ToPagedListAsync(input.PageNo, input.PageSize);
diff --git a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs
index 9879755a..74bef481 100644
--- a/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs
+++ b/Myshipping.Core/Service/DjyCustomer/Dto/DjyCustomerInput.cs
@@ -322,6 +322,10 @@ namespace Myshipping.Core.Service
         /// 服务项目
         /// </summary>
         public string ServiceItem { get; set; }
+        /// <summary>
+        /// 销售
+        /// </summary>
+        public string SALE { get; set; }
 
     }
 }