Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientInfoRes.cs

@@ -287,6 +287,11 @@ public class ClientInfoRes
     /// </summary>
     public string OrganizationCode { get; set; }
 
+    /// <summary>
+    /// 所属集团ID
+    /// </summary>
+    public long? PcorpId { get; set; }
+
     /// <summary>
     /// Desc: 所属集团
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientShipperReq.cs

@@ -1,5 +1,6 @@
 using DS.Module.Core;
 using FluentValidation;
+using SqlSugar;
 
 namespace DS.WMS.Core.Info.Dtos;
 
@@ -28,6 +29,16 @@ public class ClientShipperReq
     /// </summary>
     public string ShortName { get; set; }
 
+    /// <summary>
+    /// 收发货人名称
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    public string? Address { get; set; }
+
     /// <summary>
     /// Desc:类型 下拉选择(Shipper-1,Consinee-2,Notifypaty-3,Agent-4)
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientShipperRes.cs

@@ -27,6 +27,16 @@ public class ClientShipperRes
     /// </summary>
     public string ShortName { get; set; }
 
+    /// <summary>
+    /// 收发货人名称
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    public string? Address { get; set; }
+
     /// <summary>
     /// Desc:类型 下拉选择(Shipper-1,Consinee-2,Notifypaty-3,Agent-4)
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagReq.cs

@@ -1,6 +1,3 @@
-using DS.Module.Core;
-using SqlSugar;
-
 namespace DS.WMS.Core.Info.Dtos;
 
 /// <summary>
@@ -18,10 +15,11 @@ public class ClientTagReq
     /// </summary>
     public long? ClientId { get; set; }
 
-     /// <summary>
-    /// Desc:是否特批放单客户
-    /// </summary>           
-    public bool? IsSpecialApproval { get; set; }= false;
+    ///// <summary>
+    ///// Desc:是否特批放单客户
+    ///// </summary>           
+    //public bool? IsSpecialApproval { get; set; } = false;
+
     /// <summary>
     /// Desc:是否船公司
     /// </summary>
@@ -128,7 +126,7 @@ public class ClientTagReq
     /// Desc:是否船代
     /// </summary>
     public bool? IsShipAgency { get; set; }
-    
+
     /// <summary>
     /// Desc:是否经营单位
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Dtos/ClientTagRes.cs

@@ -1,5 +1,3 @@
-using DS.Module.Core;
-
 namespace DS.WMS.Core.Info.Dtos;
 
 /// <summary>
@@ -17,10 +15,11 @@ public class ClientTagRes
     /// </summary>
     public long ClientId { get; set; }
 
-     /// <summary>
-    /// Desc:是否特批放单客户
-    /// </summary>           
-    public bool? IsSpecialApproval { get; set; }= false;
+    ///// <summary>
+    ///// Desc:是否特批放单客户
+    ///// </summary>           
+    //public bool? IsSpecialApproval { get; set; } = false;
+
     /// <summary>
     /// Desc:是否船公司
     /// </summary>
@@ -127,7 +126,7 @@ public class ClientTagRes
     /// Desc:是否船代
     /// </summary>
     public bool? IsShipAgency { get; set; }
-    
+
     /// <summary>
     /// Desc:是否经营单位
     /// </summary>
@@ -140,7 +139,7 @@ public class ClientTagRes
     /// 备注
     /// </summary>
     public string Note { get; set; } = "";
-  
+
     /// <summary>
     /// 创建时间
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Entity/InfoClientTag.cs

@@ -14,11 +14,12 @@ public class InfoClientTag : BaseModelV2<long>
     /// </summary>
     public long ClientId { get; set; }
 
-    /// <summary>
-    /// Desc:是否特批放单客户
-    /// </summary>
-    [SugarColumn(ColumnDescription = "是否特批放单客户", DefaultValue = "0")] 
-    public bool? IsSpecialApproval { get; set; }
+    ///// <summary>
+    ///// Desc:是否特批放单客户
+    ///// </summary>
+    //[SugarColumn(ColumnDescription = "是否特批放单客户", DefaultValue = "0")] 
+    //public bool? IsSpecialApproval { get; set; }
+
     /// <summary>
     /// Desc:是否船公司
     /// </summary>

ds-wms-service/DS.WMS.Core/Info/Method/ClientInfoService.cs

@@ -220,7 +220,6 @@ public class ClientInfoService : ServiceBase, IClientInfoService
         var data = await TenantDb.Queryable<InfoClient>().InnerJoin<InfoClientTag>((c, t) => c.Id == t.ClientId)
             .Where((c, t) => c.Id == query.ClientId)
             .WhereIF(query.IsController, (c, t) => t.IsController.HasValue && t.IsController.HasValue)
-            .WhereIF(query.IsSpecialApproval, (c, t) => t.IsSpecialApproval.HasValue && t.IsSpecialApproval.HasValue)
             .WhereIF(query.IsCarrier, (c, t) => t.IsCarrier.HasValue && t.IsCarrier.HasValue)
             .WhereIF(query.IsBooking, (c, t) => t.IsBooking.HasValue && t.IsBooking.HasValue)
             .WhereIF(query.IsYard, (c, t) => t.IsYard.HasValue && t.IsYard.HasValue)