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

ds-wms-service/DS.Module.Core/Data/DataResult.cs

@@ -266,6 +266,11 @@ public class DataResult<TData> : IDataResult<ResultCode, TData>
 
     public TData Data { get; set; }
 
+    /// <summary>
+    /// 附加数据
+    /// </summary>
+    public Dictionary<string,object>? AdditionalData { get; set; }
+
     /// <summary>
     /// 返回成功的结果
     /// </summary>

ds-wms-service/DS.Module.Core/Utils/ApiFox.cs

@@ -1,45 +1,31 @@
 using System.Collections.Specialized;
-using System.Security;
 using System.Text;
-using DS.Module.Core;
 using DS.Module.Core.Extensions;
-using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 
-namespace DS.WMS.Core.Invoice.Method
+namespace DS.Module.Core
 {
-    internal class ApiFox
+    /// <summary>
+    /// 提供对HTTP请求的低级别访问
+    /// </summary>
+    public class ApiFox
     {
         /// <summary>
-        /// 发票API的基URL
+        /// 基URI
         /// </summary>
-        public string? BaseUrl { get; set; }
+        public Uri? BaseUri { get; set; }
 
         /// <summary>
-        /// 用户Key
+        /// 默认请求头
         /// </summary>
-        public string? UserKey { get; set; }
+        public IDictionary<string, string> DefaultHeaders { get; private set; }
 
         /// <summary>
-        /// 用户密钥
+        /// 初始化
         /// </summary>
-        public SecureString? UserSecret { get; private set; }
+        public ApiFox()
-
-        public ApiFox(IConfiguration config)
         {
-            BaseUrl = config.GetValue<string>("InvoiceApi:BaseUrl");
+            DefaultHeaders = new Dictionary<string, string>();
-            UserKey = config.GetValue<string>("InvoiceApi:UserKey");
-
-            string? us = config.GetValue<string>("InvoiceApi:UserSecret");
-            if (!us.IsNullOrEmpty())
-            {
-                UserSecret = new SecureString();
-                for (int i = 0; i < us.Length; i++)
-                    UserSecret.AppendChar(us[i]);
-
-                UserSecret.MakeReadOnly();
-            }
-            us = null;
         }
 
         /// <summary>
@@ -52,9 +38,7 @@ namespace DS.WMS.Core.Invoice.Method
         /// <exception cref="ArgumentException"><paramref name="url"/>为null或空字符串</exception>
         public async Task<DataResult<T>> GetAsync<T>(string url, NameValueCollection? keyValues = null)
         {
-            ArgumentException.ThrowIfNullOrEmpty(nameof(url));
+            string queryString = string.Empty;
-
-            string? queryString = null;
             if (keyValues != null && keyValues.Count > 0)
             {
                 StringBuilder sb = new StringBuilder();
@@ -93,13 +77,11 @@ namespace DS.WMS.Core.Invoice.Method
         /// </summary>
         /// <typeparam name="T">请求结果的类型</typeparam>
         /// <param name="url">请求Url</param>
-        /// <param name="requestParams">查询字符串的键值对</param>
+        /// <param name="requestParams">请求参数对象</param>
         /// <returns></returns>
         /// <exception cref="ArgumentException"><paramref name="url"/>为null或空字符串</exception>
         public async Task<DataResult<T>> PostAsync<T>(string url, object? requestParams = null)
         {
-            ArgumentException.ThrowIfNullOrEmpty(nameof(url));
-
             var result = await SendRequestAsync(HttpMethod.Post, url, requestParams);
             if (!result.Succeeded)
                 return DataResult<T>.Failed(result.Message, result.MultiCode);
@@ -110,27 +92,42 @@ namespace DS.WMS.Core.Invoice.Method
         }
 
         /// <summary>
-        /// 发起请求
+        /// 发起HTTP请求
         /// </summary>
         /// <param name="method">请求方法</param>
         /// <param name="url">请求Url</param>
         /// <param name="requestParams">请求参数</param>
         /// <returns></returns>
-        public async Task<DataResult<HttpResponseMessage>> SendRequestAsync(HttpMethod method, string url, object? requestParams = null)
+        /// <exception cref="ArgumentNullException"><paramref name="method"/>为null</exception>
+        /// <exception cref="ArgumentException"><paramref name="url"/>为null或空字符串</exception>
+        public virtual async Task<DataResult<HttpResponseMessage>> SendRequestAsync(HttpMethod method, string url, object? requestParams = null)
         {
-            if (!Uri.TryCreate(BaseUrl, UriKind.RelativeOrAbsolute, out Uri? uri))
+            ArgumentNullException.ThrowIfNull(method);
-                return DataResult<HttpResponseMessage>.FailedWithDesc(nameof(MultiLanguageConst.InvoiceAPIUrlNull));
+            ArgumentException.ThrowIfNullOrEmpty(url);
+
+            Uri? reqUri = default;
+            if (BaseUri == null)
+            {
+                if (!Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out Uri? uri))
+                    throw new ArgumentException("给定的URL格式无效", nameof(url));
+
+                reqUri = new Uri(url);
+            }
+            else
+            {
+                reqUri = new(BaseUri, url);
+            }
 
             HttpClient http = new();
-            http.DefaultRequestHeaders.Add("User-Agent", "X-HttpClient");
+            http.DefaultRequestHeaders.Add("User-Agent", $"X-{nameof(ApiFox)}");
 
-            if (!UserKey.IsNullOrEmpty())
+            if (DefaultHeaders.Count > 0)
-                http.DefaultRequestHeaders.Add("USER_KEY", UserKey);
+                foreach (var header in DefaultHeaders)
+                    http.DefaultRequestHeaders.Add(header.Key, header.Value);
 
-            if (UserSecret != null)
+            if (!http.DefaultRequestHeaders.Contains("Accept"))
-                http.DefaultRequestHeaders.Add("USER_SECRET", UserSecret.ToString());
+                http.DefaultRequestHeaders.Add("Accept", "application/json, text/plain");
 
-            Uri reqUri = new(uri, url);
             try
             {
                 HttpResponseMessage? response = null;

ds-wms-service/DS.WMS.Core/Application/Method/InvoiceApplicationService.cs

@@ -80,6 +80,12 @@ namespace DS.WMS.Core.Application.Method
                 {
                     item.CreateByName = users.Find(x => x.Id == item.CreateBy)?.UserName;
                 }
+
+                result.AdditionalData = new Dictionary<string, object>
+                {
+                    { "ApplyAmountSum", result.Data.Sum(x => x.ApplyAmount) },
+                    { "InvoiceAmountSum", result.Data.Sum(x => x.InvoiceAmount.GetValueOrDefault()) }
+                };
             }
 
             return result;
@@ -392,7 +398,7 @@ namespace DS.WMS.Core.Application.Method
         /// </summary>
         /// <param name="ids">发票明细ID</param>
         /// <returns></returns>
-        public async Task<DataResult> DeleteInvoiceDetailAsync(params long[] ids) 
+        public async Task<DataResult> DeleteInvoiceDetailAsync(params long[] ids)
         {
             int rows = await TenantDb.Deleteable<InvoiceDetail>().Where(x => ids.Contains(x.Id)).ExecuteCommandAsync();
             return rows > 0 ? DataResult.Success : DataResult.FailedWithDesc(nameof(MultiLanguageConst.Operation_Failed));
@@ -555,12 +561,13 @@ namespace DS.WMS.Core.Application.Method
                             ApplicationId = application.Id,
                             Name = item.Name,
                             TaxRate = application.TaxRate,
+                            Quantity = 1,
                             TaxUnitPrice = application.Details.FindAll(x => item.FeeIds.Contains(x.FeeId)).Sum(x => x.ApplyAmount),
                             Category = DetailCategory.InvoiceApplication
                         };
                         invDetail.TaxAmount = invDetail.TaxUnitPrice * application.TaxRate;
                         invDetail.UnitPrice = invDetail.TaxUnitPrice - invDetail.TaxAmount;
-
+                        invDetail.Amount = invDetail.TaxUnitPrice * invDetail.Quantity;
                         application.InvoiceDetails.Add(invDetail);
                     }
                 }
@@ -621,7 +628,7 @@ namespace DS.WMS.Core.Application.Method
                     x.AmountUppercase
                 }).ExecuteCommandAsync();
             }
-            
+
         }
 
 

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

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using SqlSugar;
 
 namespace DS.WMS.Core.Info.Dtos;
 
@@ -405,4 +406,24 @@ public class ClientInfoRes
     /// 联系人列表
     /// </summary>
     public List<ClientContactRes> ClientContactList { get; set; }
+
+    /// <summary>
+    /// 揽货人名字
+    /// </summary>
+    public string SaleName { get; set; }
+
+    /// <summary>
+    /// 操作名字
+    /// </summary>
+    public string OpName { get; set; }
+
+    /// <summary>
+    /// 单证名字
+    /// </summary>
+    public string DocName { get; set; }
+
+    /// <summary>
+    /// 客服名字
+    /// </summary>
+    public string CustomerServiceName { get; set; }
 }

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

@@ -457,4 +457,28 @@ public class InfoClient : BaseOrgModel<long>
     /// </summary>
     [SugarColumn(ColumnDescription = "仓储费开始日期模式", Length = 50, IsNullable = true)]
     public string WMSFeeRateType { get; set; }
+
+    /// <summary>
+    /// 揽货人名字
+    /// </summary>
+    [SugarColumn(ColumnDescription = "揽货人名字", Length = 50, IsNullable = true)]
+    public string SaleName { get; set; }
+
+    /// <summary>
+    /// 操作名字
+    /// </summary>
+    [SugarColumn(ColumnDescription = "操作名字", Length = 50, IsNullable = true)]
+    public string OpName { get; set; }
+
+    /// <summary>
+    /// 单证名字
+    /// </summary>
+    [SugarColumn(ColumnDescription = "单证名字", Length = 50, IsNullable = true)]
+    public string DocName { get; set; }
+
+    /// <summary>
+    /// 客服名字
+    /// </summary>
+    [SugarColumn(ColumnDescription = "客服名字", Length = 50, IsNullable = true)]
+    public string CustomerServiceName { get; set; }
 }

ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceApiFox.cs

@@ -0,0 +1,46 @@
+using System.Security;
+using DS.Module.Core;
+using DS.Module.Core.Extensions;
+using Microsoft.Extensions.Configuration;
+
+namespace DS.WMS.Core.Invoice.Method
+{
+    /// <summary>
+    /// 提供对HTTP请求的低级别访问
+    /// </summary>
+    internal sealed class InvoiceApiFox : ApiFox
+    {
+        /// <summary>
+        /// 用户Key
+        /// </summary>
+        public string? UserKey { get; set; }
+
+        /// <summary>
+        /// 用户密钥
+        /// </summary>
+        public SecureString? UserSecret { get; private set; }
+
+
+        public InvoiceApiFox(IConfiguration config)
+        {
+            BaseUri = new Uri(config.GetValue<string>("InvoiceApi:BaseUrl"));
+            UserKey = config.GetValue<string>("InvoiceApi:UserKey");
+
+            string? us = config.GetValue<string>("InvoiceApi:UserSecret");
+            if (!us.IsNullOrEmpty())
+            {
+                UserSecret = new SecureString();
+                for (int i = 0; i < us.Length; i++)
+                    UserSecret.AppendChar(us[i]);
+
+                UserSecret.MakeReadOnly();
+            }
+            us = null;
+
+            DefaultHeaders.Add("USER_KEY", UserKey ?? string.Empty);
+            DefaultHeaders.Add("USER_SECRET", UserSecret?.ToString());
+        }
+
+
+    }
+}

ds-wms-service/DS.WMS.Core/Invoice/Method/InvoiceIssuanceService.cs

@@ -11,7 +11,7 @@ namespace DS.WMS.Core.Invoice.Method
     /// </summary>
     public sealed class InvoiceIssuanceService : ApplicationServiceBase
     {
-        readonly ApiFox api;
+        readonly InvoiceApiFox api;
 
         /// <summary>
         /// 初始化并加载配置
@@ -20,7 +20,7 @@ namespace DS.WMS.Core.Invoice.Method
         public InvoiceIssuanceService(IServiceProvider provider) : base(provider)
         {
             var config = provider.GetRequiredService<IConfiguration>();
-            api = new ApiFox(config);
+            api = new InvoiceApiFox(config);
         }
 
         /// <summary>
@@ -70,6 +70,7 @@ namespace DS.WMS.Core.Invoice.Method
                     goodsCode = "", //商品和服务税收分类合并编码
                     invoiceLineProperty = "00"
                 }).ToList()
+
             }).ToList();
 
             var result = await api.PostAsync<InvoiceIssuanceResult<string>>("/api/Invoice/services", request);
@@ -77,15 +78,19 @@ namespace DS.WMS.Core.Invoice.Method
                 return DataResult<string>.Failed(result.Message, result.MultiCode);
 
             var invResult = result.Data;
-            if (!invResult.Success)
+            if (invResult.Success)
+            {
+
+
+                return DataResult<string>.Success(invResult.Data);
+            }
+            else
             {
                 if (invResult.Code == 1)
                     return await InitiateAsync(invoices);
 
                 return DataResult<string>.Failed(invResult.Message);
             }
-
-            return DataResult<string>.Success(invResult.Data);
         }
 
         /// <summary>

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

@@ -0,0 +1,149 @@
+using System.Runtime.Serialization;
+using DS.Module.Core;
+
+namespace DS.WMS.Core.Op.Dtos.TaskInteraction
+{
+    /// <summary>
+    /// 任务台创建参数
+    /// </summary>
+    public class TaskCreation
+    {
+        [DataMember(Name = "head")]
+        public TaskHeader Head { get; set; }
+
+        [DataMember(Name = "main")]
+        public TaskMain Main { get; set; }
+
+        public TaskCreation()
+        {
+            Head = new TaskHeader();
+            Main = new TaskMain();
+        }
+    }
+
+    /// <summary>
+    /// 任务标头
+    /// </summary>
+    public class TaskHeader
+    {
+        /// <summary>
+        /// 流水ID
+        /// </summary>
+        [DataMember(Name = "gid")]
+        public Guid GID { get; set; } = Guid.NewGuid();
+
+        /// <summary>
+        /// 订单Id
+        /// </summary>
+        [DataMember(Name = "bsno")]
+        public long BSNO { get; set; }
+
+        /// <summary>
+        /// 消息类型
+        /// </summary>
+        [DataMember(Name = "messageType")]
+        public string MessageType { get; set; } = "WORK_FLOW_TASK";
+
+        [DataMember(Name = "senderId")]
+        public string SenderId { get; set; } = "WorkFlow";
+
+        [DataMember(Name = "senderName")]
+        public string SenderName { get; set; } = "工作流平台";
+
+        [DataMember(Name = "receiverId")]
+        public string ReceiverId { get; set; } = "TaskManage";
+
+        [DataMember(Name = "receiverName")]
+        public string ReceiverName { get; set; } = "任务管理平台";
+
+        /// <summary>
+        /// 标识符
+        /// </summary>
+        [DataMember(Name = "token")]
+        public string? Token { get; set; }
+
+        /// <summary>
+        /// 版本
+        /// </summary>
+        [DataMember(Name = "version")]
+        public string? Version { get; set; } = "1.0";
+
+        /// <summary>
+        /// 请求时间
+        /// </summary>
+        [DataMember(Name = "requestDate")]
+        public DateTime RequestDate { get; set; } = DateTime.Now;
+
+        [DataMember(Name = "senderKey")]
+        public string? SenderKey { get; set; }
+
+        [DataMember(Name = "requestAction")]
+        public string? RequestAction { get; set; } = "Add";
+    }
+
+    /// <summary>
+    /// 任务主信息
+    /// </summary>
+    public class TaskMain
+    {
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        [DataMember(Name = "taskType")]
+        public TaskBaseTypeEnum TaskType { get; set; }
+
+        /// <summary>
+        /// 任务来源
+        /// </summary>
+        [DataMember(Name = "taskSource")]
+        public int TaskSource { get; set; } = 9;
+
+        /// <summary>
+        /// 任务标题
+        /// </summary>
+        [DataMember(Name = "taskTitle")]
+        public string TaskTitle { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 任务描述
+        /// </summary>
+        [DataMember(Name = "taskDesp")]
+        public string? TaskDescription { get; set; }
+
+        /// <summary>
+        /// 任务创建者ID
+        /// </summary>
+        [DataMember(Name = "taskUserId")]
+        public long TaskUserId { get; set; }
+
+        /// <summary>
+        /// 任务创建者
+        /// </summary>
+        [DataMember(Name = "taskUserName")]
+        public string? TaskUserName { get; set; }
+
+        /// <summary>
+        /// 任务接收者ID
+        /// </summary>
+        [DataMember(Name = "recvUserId")]
+        public long RecvUserId { get; set; }
+
+        /// <summary>
+        /// 任务创建者
+        /// </summary>
+        [DataMember(Name = "recvUserName")]
+        public string? RecvUserName { get; set; }
+
+        /// <summary>
+        /// 任务租户ID
+        /// </summary>
+        [DataMember(Name = "taskTenatId")]
+        public long TaskTenatId { get; set; }
+
+        /// <summary>
+        /// 任务租户
+        /// </summary>
+        [DataMember(Name = "taskTenatName")]
+        public string? TaskTenatName { get; set; }
+    }
+}

ds-wms-service/DS.WMS.FeeApi/Logs/internal-nlog.txt

@@ -3120,3 +3120,10 @@
 2024-07-22 08:57:09.9055 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.FeeApi\bin\Debug\net8.0\nlog.config
 2024-07-22 08:57:09.9055 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
 2024-07-22 08:57:09.9319 Info Configuration initialized.
+2024-07-23 17:37:40.2936 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-07-23 17:37:40.3330 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-07-23 17:37:40.3386 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-07-23 17:37:40.3551 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False
+2024-07-23 17:37:40.3551 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.FeeApi\bin\Debug\net8.0\nlog.config
+2024-07-23 17:37:40.3551 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-07-23 17:37:40.3714 Info Configuration initialized.

ds-wms-service/DS.WMS.FeeApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Publish\DS8\FeeApi</_PublishTargetUrl>
-    <History>True|2024-07-22T00:59:23.3235603Z||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||;</History>
+    <History>True|2024-07-23T09:41:01.7494842Z||;True|2024-07-23T17:25:11.8773492+08:00||;True|2024-07-23T17:07:16.5460273+08:00||;True|2024-07-22T08:59:23.3235603+08:00||;True|2024-07-12T17:35:11.1225017+08:00||;True|2024-07-11T11:40:17.3581147+08:00||;True|2024-07-04T17:20:50.0175739+08:00||;True|2024-07-02T11:26:14.2092751+08:00||;True|2024-07-02T09:21:51.3513605+08:00||;True|2024-07-01T17:47:56.0407256+08:00||;True|2024-07-01T16:42:55.7374984+08:00||;True|2024-07-01T15:49:58.9266967+08:00||;True|2024-07-01T14:35:48.1117178+08:00||;True|2024-07-01T11:41:52.2969338+08:00||;True|2024-07-01T11:13:02.6561160+08:00||;True|2024-06-28T15:28:43.1470725+08:00||;True|2024-06-28T15:16:20.1999596+08:00||;True|2024-06-28T15:14:56.2534743+08:00||;True|2024-06-28T15:02:41.3033806+08:00||;True|2024-06-28T13:37:28.2462742+08:00||;True|2024-06-28T11:06:30.7400535+08:00||;True|2024-06-26T15:24:17.1939896+08:00||;True|2024-06-26T14:33:06.3530466+08:00||;True|2024-06-26T09:45:24.4055568+08:00||;True|2024-06-25T15:45:57.6052473+08:00||;True|2024-06-25T10:17:17.7408916+08:00||;False|2024-06-25T10:16:23.5639654+08:00||;False|2024-06-25T10:15:28.3857721+08:00||;False|2024-06-25T10:10:59.5536995+08:00||;False|2024-06-25T10:07:10.4050937+08:00||;True|2024-06-24T15:22:18.2672769+08:00||;True|2024-06-24T15:01:04.8153621+08:00||;False|2024-06-24T15:00:29.9618848+08:00||;True|2024-06-24T14:07:19.9401637+08:00||;False|2024-06-24T14:06:36.1250570+08:00||;True|2024-06-21T15:13:57.4273503+08:00||;True|2024-06-21T15:04:37.8218608+08:00||;True|2024-06-21T14:12:48.0266638+08:00||;True|2024-06-21T13:52:30.0950155+08:00||;True|2024-06-20T11:02:42.9508506+08:00||;True|2024-06-19T11:43:01.1899282+08:00||;True|2024-06-19T11:23:01.2938141+08:00||;True|2024-06-18T08:51:21.6222152+08:00||;True|2024-06-17T09:20:35.0804494+08:00||;True|2024-06-17T08:41:58.1319484+08:00||;True|2024-06-17T08:38:09.0137102+08:00||;True|2024-06-14T15:19:45.7395180+08:00||;True|2024-06-14T14:38:49.7094421+08:00||;True|2024-06-14T14:27:39.2815370+08:00||;True|2024-06-14T09:42:21.5397525+08:00||;True|2024-06-13T16:03:39.8475642+08:00||;True|2024-06-13T14:12:10.1725629+08:00||;True|2024-06-13T10:46:52.6971321+08:00||;True|2024-06-11T17:03:44.8328978+08:00||;True|2024-06-06T17:41:51.1810315+08:00||;True|2024-06-06T10:57:27.8273617+08:00||;True|2024-06-04T14:23:21.3742450+08:00||;True|2024-05-31T17:01:42.4717460+08:00||;True|2024-05-31T13:56:03.0734064+08:00||;True|2024-05-31T08:45:52.3549394+08:00||;True|2024-05-30T17:16:32.8907958+08:00||;True|2024-05-30T16:18:06.9957657+08:00||;True|2024-05-29T15:44:18.4051203+08:00||;True|2024-05-29T15:11:03.1518632+08:00||;True|2024-05-29T14:52:26.0823495+08:00||;True|2024-05-29T11:17:20.2245101+08:00||;True|2024-05-29T08:36:28.9569161+08:00||;True|2024-05-28T08:44:31.4427261+08:00||;False|2024-05-28T08:44:02.5254826+08:00||;True|2024-05-27T15:16:32.9413631+08:00||;True|2024-05-27T15:03:42.9803879+08:00||;True|2024-05-27T08:49:54.3933663+08:00||;True|2024-05-27T08:46:13.5862236+08:00||;True|2024-05-23T17:19:32.8154451+08:00||;True|2024-05-23T17:19:01.4587615+08:00||;True|2024-05-22T16:52:42.2166228+08:00||;True|2024-05-22T15:19:49.1773202+08:00||;True|2024-05-22T15:13:31.9485525+08:00||;True|2024-05-22T13:29:02.1355808+08:00||;True|2024-05-22T09:48:40.8753914+08:00||;True|2024-05-22T09:25:06.2068137+08:00||;True|2024-05-22T09:18:53.0759815+08:00||;True|2024-05-21T17:13:36.4091775+08:00||;True|2024-05-21T14:41:18.8486299+08:00||;True|2024-05-21T11:04:27.3649637+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.MainApi/Controllers/ClientInfoController.cs

@@ -61,4 +61,16 @@ public class ClientInfoController : ApiController
         var res = _invokeService.GetClientInfo(id);
         return res;
     }
+
+    /// <summary>
+    /// 获取往来单位详情（含有联系人列表）
+    /// </summary>
+    /// <param name="query">查询往来单位</param>
+    /// <returns>返回往来单位详情</returns>
+    [HttpPost]
+    [Route("GetClientInfoWithContact")]
+    public async Task<DataResult<ClientInfoRes>> GetClientInfoWithContact([FromBody] QueryClientInfo query)
+    {
+        return await _invokeService.GetClientInfoWithContact(query);
+    }
 }

ds-wms-service/DS.WMS.MainApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Code\PublishCopy\ds8-mainapi</_PublishTargetUrl>
-    <History>True|2024-07-19T04:03:03.1399057Z||;True|2024-07-19T11:47:36.2698405+08:00||;True|2024-07-18T15:59:36.7010783+08:00||;True|2024-07-16T18:17:43.9220347+08:00||;True|2024-06-18T17:36:34.9035076+08:00||;True|2024-06-18T16:25:54.2461596+08:00||;True|2024-06-18T10:09:37.3872162+08:00||;True|2024-06-18T10:00:43.4402179+08:00||;True|2024-06-18T08:55:07.3014083+08:00||;True|2024-06-18T08:40:51.6182342+08:00||;True|2024-06-13T19:48:34.0429148+08:00||;True|2024-06-13T19:09:39.6804400+08:00||;True|2024-06-13T15:41:56.9502735+08:00||;True|2024-06-13T15:23:59.4555910+08:00||;True|2024-06-13T15:12:55.6093356+08:00||;True|2024-06-11T17:08:01.8930314+08:00||;True|2024-06-07T15:23:11.1389680+08:00||;True|2024-06-07T10:23:59.6079620+08:00||;True|2024-06-06T17:42:56.1843783+08:00||;True|2024-06-04T14:20:46.7742295+08:00||;True|2024-05-31T17:57:35.6858600+08:00||;True|2024-05-31T15:25:20.8503086+08:00||;True|2024-05-30T17:22:52.2563382+08:00||;True|2024-05-30T17:05:35.7504154+08:00||;True|2024-05-29T17:17:39.6966826+08:00||;</History>
+    <History>True|2024-07-24T01:32:35.6165520Z||;True|2024-07-19T12:03:03.1399057+08:00||;True|2024-07-19T11:47:36.2698405+08:00||;True|2024-07-18T15:59:36.7010783+08:00||;True|2024-07-16T18:17:43.9220347+08:00||;True|2024-06-18T17:36:34.9035076+08:00||;True|2024-06-18T16:25:54.2461596+08:00||;True|2024-06-18T10:09:37.3872162+08:00||;True|2024-06-18T10:00:43.4402179+08:00||;True|2024-06-18T08:55:07.3014083+08:00||;True|2024-06-18T08:40:51.6182342+08:00||;True|2024-06-13T19:48:34.0429148+08:00||;True|2024-06-13T19:09:39.6804400+08:00||;True|2024-06-13T15:41:56.9502735+08:00||;True|2024-06-13T15:23:59.4555910+08:00||;True|2024-06-13T15:12:55.6093356+08:00||;True|2024-06-11T17:08:01.8930314+08:00||;True|2024-06-07T15:23:11.1389680+08:00||;True|2024-06-07T10:23:59.6079620+08:00||;True|2024-06-06T17:42:56.1843783+08:00||;True|2024-06-04T14:20:46.7742295+08:00||;True|2024-05-31T17:57:35.6858600+08:00||;True|2024-05-31T15:25:20.8503086+08:00||;True|2024-05-30T17:22:52.2563382+08:00||;True|2024-05-30T17:05:35.7504154+08:00||;True|2024-05-29T17:17:39.6966826+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -6,7 +6,7 @@
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi</_PublishTargetUrl>
-    <History>True|2024-07-24T00:42:02.7606608Z||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
+    <History>True|2024-07-24T00:47:26.1616069Z||;True|2024-07-24T08:42:02.7606608+08:00||;True|2024-07-24T08:41:18.4678459+08:00||;False|2024-07-24T08:40:29.5381703+08:00||;False|2024-07-24T08:39:20.2230656+08:00||;True|2024-07-23T15:56:16.8305907+08:00||;True|2024-07-22T16:42:12.1933090+08:00||;True|2024-07-19T18:28:29.1420269+08:00||;True|2024-07-19T15:45:49.1068004+08:00||;True|2024-07-19T15:33:45.3242155+08:00||;False|2024-07-19T15:32:41.9604526+08:00||;True|2024-07-19T13:48:27.9722093+08:00||;False|2024-07-19T13:47:56.7900396+08:00||;True|2024-07-19T11:41:15.4223247+08:00||;True|2024-07-19T08:46:28.8014836+08:00||;True|2024-07-18T19:24:50.4184188+08:00||;True|2024-07-18T19:19:14.7056635+08:00||;True|2024-07-18T19:04:43.5615501+08:00||;True|2024-07-18T18:38:39.1976753+08:00||;True|2024-07-18T18:25:15.6833492+08:00||;True|2024-07-18T18:08:46.3114951+08:00||;True|2024-07-18T17:59:12.5292256+08:00||;True|2024-07-18T16:18:45.8049777+08:00||;True|2024-07-18T16:12:42.9723969+08:00||;True|2024-07-18T16:07:14.1432207+08:00||;True|2024-07-17T17:44:18.4741963+08:00||;True|2024-07-17T17:42:47.2735071+08:00||;True|2024-07-17T16:13:32.9037697+08:00||;True|2024-07-17T15:40:21.2550083+08:00||;True|2024-07-17T14:03:08.1814323+08:00||;True|2024-07-15T13:43:42.6073130+08:00||;True|2024-07-15T11:53:40.6498579+08:00||;True|2024-07-15T11:53:03.1652559+08:00||;True|2024-07-15T11:42:33.0154478+08:00||;True|2024-07-15T10:20:03.3925876+08:00||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.Test/SaasTest.cs

@@ -212,7 +212,7 @@ public class SaasTest
     {
         var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
         StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 
-        tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder));
+        //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder));
         //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn));
         //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule));
         //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase));
@@ -227,6 +227,7 @@ public class SaasTest
         //tenantDb.CodeFirst.InitTables(typeof(BookingLabel));
         //tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation));
 
+        tenantDb.CodeFirst.InitTables(typeof(InfoClient));
         //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty));
         //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail));
         //db.CodeFirst.InitTables(typeof(OpBusinessTruckCtn));