提单信息修改

ds-wms-service/DS.WMS.Core/Op/Dtos/BillManageHistoryListRes.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -106,5 +107,31 @@ namespace DS.WMS.Core.Op.Dtos
         /// 录入人
         /// </summary>
         public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 国内发货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("国内发货人Id")]
+        public long? ShipperCnId { get; set; }
+        /// <summary>
+        /// 国内发货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("国内发货人")]
+        public string ShipperCn { get; set; }
+        /// <summary>
+        /// 发货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("发货人")]
+        public string Shipper { get; set; }
+        /// <summary>
+        /// 收货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("收货人")]
+        public string Consignee { get; set; }
+        /// <summary>
+        /// 通知人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("通知人")]
+        public string NotifyParty { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageReq.cs

@@ -433,5 +433,21 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         [Description("提单确认人邮箱")]
         public string BLConfirmationEmail { get; set; }
+
+        /// <summary>
+        /// 发货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("发货人")]
+        public string Shipper { get; set; }
+        /// <summary>
+        /// 收货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("收货人")]
+        public string Consignee { get; set; }
+        /// <summary>
+        /// 通知人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("通知人")]
+        public string NotifyParty { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportBillManageRes.cs

@@ -439,5 +439,21 @@ namespace DS.WMS.Core.Op.Dtos
         /// </summary>
         [Description("提单确认人邮箱")]
         public string BLConfirmationEmail { get; set; }
+
+        /// <summary>
+        /// 发货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("发货人")]
+        public string Shipper { get; set; }
+        /// <summary>
+        /// 收货人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("收货人")]
+        public string Consignee { get; set; }
+        /// <summary>
+        /// 通知人    t_info_client CUSTNAME
+        /// </summary>
+        [Description("通知人")]
+        public string NotifyParty { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Entity/SeaExportBillManage.cs

@@ -506,4 +506,23 @@ public class SeaExportBillManage : BaseOrgModel<long>
     [Description("提单确认人邮箱")]
     [SqlSugar.SugarColumn(ColumnDescription = "提单确认人邮箱", IsNullable = true, Length = 100)]
     public string BLConfirmationEmail { get; set; }
+
+    /// <summary>
+    /// 发货人    t_info_client CUSTNAME
+    /// </summary>
+    [Description("发货人")]
+    [SqlSugar.SugarColumn(ColumnDescription = "发货人", IsNullable = true, Length = 100)]
+    public string Shipper { get; set; }
+    /// <summary>
+    /// 收货人    t_info_client CUSTNAME
+    /// </summary>
+    [Description("收货人")]
+    [SqlSugar.SugarColumn(ColumnDescription = "收货人", IsNullable = true, Length = 100)]
+    public string Consignee { get; set; }
+    /// <summary>
+    /// 通知人    t_info_client CUSTNAME
+    /// </summary>
+    [Description("通知人")]
+    [SqlSugar.SugarColumn(ColumnDescription = "通知人", IsNullable = true, Length = 100)]
+    public string NotifyParty { get; set; }
 }

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportBillManageService.cs

@@ -228,21 +228,28 @@ namespace DS.WMS.Core.Op.Method
                 var temp = new SeaExportBillManage()
                 {
                     BusinessId = long.Parse(req.Id),
+                    
                     ShipperContent = item.ShipperContent,
                     ShipperCode = item.ShipperCode,
                     ShipperCountry = item.ShipperCountry,
                     ShipperEmail = item.ShipperEmail,
                     ShipperTel = item.ShipperTel,
+                    ShipperId = item.ShipperId,
+                    Shipper = item.Shipper,
                     ConsigneeContent = item.ConsigneeContent,
                     ConsigneeCode = item.ConsigneeCode,
                     ConsigneeCountry = item.ConsigneeCountry,
                     ConsigneeEmail = item.ConsigneeEmail,
                     ConsigneeTel = item.ConsigneeTel,
+                    ConsigneeId = item.ConsigneeId,
+                    Consignee = item.Consignee,
                     NotifyPartyContent = item.NotifyPartyContent,
                     NotifyPartyCode = item.NotifyPartyCode,
                     NotifyPartyCountry = item.NotifyPartyCountry,
                     NotifyPartyEmail = item.NotifyPartyEmail,
                     NotifyPartyTel = item.NotifyPartyTel,
+                    NotifyPartyId = item.NotifyPartyId,
+                    NotifyParty =  item.NotifyParty,
                     Marks = item.Marks,
                     Description = item.Description,
                 };

ds-wms-service/DS.WMS.Core/Sys/Method/ClientCommonService.cs

@@ -1385,7 +1385,7 @@ public class ClientCommonService : IClientCommonService
                PinYinCode = a.ShortName + "(" + a.CodeName + ")",
            }
            )
-            .MergeTable()
+            .ClearFilter<ISharedOrgId>().MergeTable()
             .Mapper(it =>
             {
                 it.UserIds = tenantDb.Queryable<InfoClientStakeholder>().Where(c => c.StartDate <= DateTime.Now && c.EndDate >= DateTime.Now && c.ClientId == it.Id).Select(n => n.CreateBy).ToList();