From 9e61b22201ae3d0f13943530f161364012241acf Mon Sep 17 00:00:00 2001
From: cjy <tiankui_xing@163.com>
Date: Tue, 5 Nov 2024 18:07:22 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3E?=
 =?UTF-8?q?di=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0SO=20=E5=92=8C=20SI=20?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 13c2e6852ccd3ab971796f1e8b5d73752bbe54da.
---
 .../DS.WMS.Core/Op/Dtos/SeaExportEdiReq.cs        |  8 --------
 .../DS.WMS.Core/Op/Dtos/SeaExportEdiRes.cs        | 10 +---------
 ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs |  9 ++++++++-
 .../DS.WMS.Core/Op/Entity/SeaExportEdi.cs         | 15 ---------------
 4 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiReq.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiReq.cs
index 1927474a..88765146 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiReq.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiReq.cs
@@ -193,15 +193,7 @@ namespace DS.WMS.Core.Op.Dtos
         /// CNPTNo
         /// </summary>
         public string CNPTNo { get; set; }
-        /// <summary>
-        /// SO备注 
-        /// </summary>
-        public string SORemark { get; set; }
 
-        /// <summary>
-        /// SI备注 
-        /// </summary>
-        public string SIRemark { get; set; }
 
     }
 }
diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiRes.cs
index a4c334c8..dc0a5baa 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiRes.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportEdiRes.cs
@@ -189,14 +189,6 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         public string EmcNameAccount { get; set; }
 
-        /// <summary>
-        /// SO备注 
-        /// </summary>
-        public string SORemark { get; set; }
-
-        /// <summary>
-        /// SI备注 
-        /// </summary>
-        public string SIRemark { get; set; }
+        
     }
 }
diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
index 8e0cb7cc..29b39cda 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExport.cs
@@ -1833,7 +1833,14 @@ public class SeaExport : BaseOrgModel<long>
     [Description("船司航线")]
     [SugarColumn(ColumnDescription = "船司航线", IsNullable = true, Length = 100)]
     public string CarrierLane { get; set; }
-     
+
+    /// <summary>
+    /// SO备注 
+    /// </summary>
+    [Description("SO备注")]
+    [SqlSugar.SugarColumn(ColumnDescription = "SO备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
+    public string SORemark { get; set; }
+
     /// <summary>
     /// 签单要求
     /// </summary>
diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportEdi.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportEdi.cs
index 19f90ec4..aed669fb 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportEdi.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportEdi.cs
@@ -220,19 +220,4 @@ public class SeaExportEdi: BaseModel<long>
     /// </summary>
     [SqlSugar.SugarColumn(ColumnDescription = "CNPTNo", IsNullable = true, Length = 50)]
     public string CNPTNo { get; set; }
-
-
-    /// <summary>
-    /// SO备注 
-    /// </summary>
-    [Description("SO备注")]
-    [SqlSugar.SugarColumn(ColumnDescription = "SO备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
-    public string SORemark { get; set; }
-
-    /// <summary>
-    /// SI备注 
-    /// </summary>
-    [Description("SI备注")]
-    [SqlSugar.SugarColumn(ColumnDescription = "SI备注", IsNullable = true, ColumnDataType = StaticConfig.CodeFirst_BigString)]
-    public string SIRemark { get; set; }
 }
\ No newline at end of file