对账接口修改及附件上传接口

ds-wms-service/DS.WMS.CheckApi/Controllers/CheckBillController.cs

@@ -25,7 +25,7 @@ public class CheckBillController : ApiController
     }
 
     /// <summary>
-    /// 客户对账明细查询列表
+    /// 客户对账业务查询列表
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
@@ -38,7 +38,7 @@ public class CheckBillController : ApiController
     }
 
     /// <summary>
-    /// 客户对账明细查询列表
+    /// 客户对账业务费用明细查询列表
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
@@ -62,7 +62,18 @@ public class CheckBillController : ApiController
         var res = _invokeService.GetCheckBillList(request);
         return res;
     }
-
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("EditCheckBill")]
+    public DataResult EditCheckBill([FromBody] CheckBillReq req)
+    {
+        var res = _invokeService.EditCheckBill(req);
+        return res;
+    }
     /// <summary>
     /// 详情
     /// </summary>
@@ -82,7 +93,7 @@ public class CheckBillController : ApiController
     /// <returns></returns>
     [HttpPost]
     [Route("GetCheckBillBusinessList")]
-    public DataResult<List<VW_CheckBill_Bussiness>> GetCheckBillBusinessList([FromBody] PageRequest request)
+    public DataResult<List<VW_CheckBill_Business>> GetCheckBillBusinessList([FromBody] PageRequest request)
     {
         var res = _invokeService.GetCheckBillBusinessList(request);
         return res;

ds-wms-service/DS.WMS.Core/Check/Interface/ICheckBillService.cs

@@ -31,7 +31,7 @@ namespace DS.WMS.Core.Check.Interface
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public DataResult<List<VW_CheckBill_Bussiness>> GetCheckBillBusinessList(PageRequest request);
+        public DataResult<List<VW_CheckBill_Business>> GetCheckBillBusinessList(PageRequest request);
         /// <summary>
         /// 客户对账明细对应费用列表
         /// </summary>

ds-wms-service/DS.WMS.Core/Check/Method/CheckBillService.cs

@@ -93,7 +93,7 @@ namespace DS.WMS.Core.Check.Method
                 .Select<CheckBillRes>()
                 .Mapper(it =>
                  {
-                     var checkBillDetails = tenantDb.Queryable<VW_CheckBill_Bussiness>().Where(x => x.CheckId == it.Id).ToList();
+                     var checkBillDetails = tenantDb.Queryable<VW_CheckBill_Business>().Where(x => x.CheckId == it.Id).ToList();
                      it.RMBDR = checkBillDetails.Sum(x => x.RMBDR);
                      it.RMBCR = checkBillDetails.Sum(x => x.RMBCR);
                      it.USDDR = checkBillDetails.Sum(x => x.USDDR);
@@ -127,13 +127,13 @@ namespace DS.WMS.Core.Check.Method
         /// </summary>
         /// <param name="request"></param>
         /// <returns></returns>
-        public DataResult<List<VW_CheckBill_Bussiness>> GetCheckBillBusinessList(PageRequest request)
+        public DataResult<List<VW_CheckBill_Business>> GetCheckBillBusinessList(PageRequest request)
         {
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
 
             //序列化查询条件
             var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
-            var data = tenantDb.Queryable<VW_CheckBill_Bussiness>()
+            var data = tenantDb.Queryable<VW_CheckBill_Business>()
                 .Where(whereList)
                 .ToQueryPage(request.PageCondition);
             return data;

ds-wms-service/DS.WMS.Core/Check/View/VW_CheckBill_Business.cs

@@ -9,8 +9,12 @@ namespace DS.WMS.Core.Check.View
     /// <summary>
     /// 对账单业务关联视图
     /// </summary>
-    public class VW_CheckBill_Bussiness
+    public class VW_CheckBill_Business
     {
+        /// <summary>
+        /// 自增Id
+        /// </summary>
+        public int Id { get; set; }
         /// <summary>
         /// 对账Id
         /// </summary>
@@ -179,12 +183,12 @@ namespace DS.WMS.Core.Check.View
         /// </summary>
         public decimal OrderInvoiceUSDDR { get; set; }
         /// <summary>
-        /// 开票RMB应付
+        /// 订单金额RMB应付
         /// </summary>
-        public decimal OrderInvoiceRMBCR { get; set; }
+        public decimal OrderAmountRMBCR { get; set; }
         /// <summary>
-        /// 开票USD应付
+        /// 订单金额USD应付
         /// </summary>
-        public decimal OrderInvoiceUSDCR { get; set; }
+        public decimal OrderAmountUSDCR { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Check/View/VW_CheckBill_Fee_Records.cs

@@ -13,6 +13,10 @@ namespace DS.WMS.Core.Check.View
     /// </summary>
     public class VW_CheckBill_Fee_Records
     {
+        /// <summary>
+        /// 自增Id
+        /// </summary>
+        public int Id { get; set; }
         /// <summary>
         /// 对账Id
         /// </summary>
@@ -27,10 +31,10 @@ namespace DS.WMS.Core.Check.View
         /// </summary>
         public long FeeRecordId { get; set; }
 
-        /// <summary>
-        /// 对账金额
-        /// </summary>
-        public decimal? CheckBillAmount { get; set; } = 0;
+        ///// <summary>
+        ///// 对账金额
+        ///// </summary>
+        //public decimal? CheckBillAmount { get; set; } = 0;
         /// <summary>
         /// 收付类型（收、付） 1应收 2 应付
         /// </summary>

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

@@ -27,4 +27,9 @@ public class ClientSelectRes
     /// </summary>
     public string EnShortName { get; set; }
 
+    /// <summary>
+    /// Desc:提单信息
+    /// </summary>
+    public string BLContent { get; set; }
+
 }

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

@@ -37,5 +37,18 @@ namespace DS.WMS.Core.Op.Dtos
         /// 文件路径
         /// </summary>
         public string FilePath { get; set; }
+        /// <summary>
+        /// 创建人Id
+        /// </summary>
+        public long CreateBy { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateByName { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateTime { get; set; }
     }
 }

ds-wms-service/DS.WMS.Core/Op/Interface/IOpFileService.cs

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using DS.Module.Core.Data;
 using DS.WMS.Core.Op.Dtos;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -19,11 +20,26 @@ namespace DS.WMS.Core.Op.Interface
         /// <param name="req"></param>
         /// <returns></returns>
         public Task<DataResult<string>> AddFile(IFormFile file, [FromForm] OpFileReq req);
+
+        /// <summary>
+        /// 多附件上传
+        /// </summary>
+        /// <param name="formCollection"></param>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        public Task<DataResult<string>> AddMultiFiles(IFormCollection formCollection, [FromForm] OpFileReq req);
         /// <summary>
-        /// 获取业务附件
+        /// 获取业务附件列表
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
         public DataResult<List<OpFileRes>> GetOpFileList(string id);
+
+        /// <summary>
+        /// 批量删除附件
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        public  Task<DataResult<string>> BatchDelFiles(IdModel req);
     }
 }

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

@@ -1,9 +1,11 @@
 using DS.Module.Core;
+using DS.Module.Core.Data;
 using DS.Module.SqlSugar;
 using DS.Module.UserModule;
 using DS.WMS.Core.Op.Dtos;
 using DS.WMS.Core.Op.Entity;
 using DS.WMS.Core.Op.Interface;
+using DS.WMS.Core.Sys.Entity;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -52,7 +54,7 @@ namespace DS.WMS.Core.Op.Method
                 return await Task.FromResult(DataResult<string>.Failed("附件不存在!"));
             }
 
-            var limitFiles = AppSetting.app(new string[] { "FileSettings", "FileType" });
+            var limitFiles = AppSetting.app<string>(new string[] { "FileSettings", "FileType" });
             var originalFilename = file.FileName; // 文件原始名称
             var fileSuffix = Path.GetExtension(file.FileName).ToLower(); // 文件后缀
             if (!limitFiles.Contains(fileSuffix))
@@ -101,6 +103,74 @@ namespace DS.WMS.Core.Op.Method
 
             return await Task.FromResult(DataResult<string>.Success(fileRelaPath));
         }
+
+        /// <summary>
+        /// 添加附件
+        /// </summary>
+        /// <param name="formCollection"></param>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        public async Task<DataResult<string>> AddMultiFiles(IFormCollection formCollection, [FromForm] OpFileReq req)
+        {
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+            //文件集合
+            FormFileCollection fileCollection = (FormFileCollection)formCollection.Files;
+            //未上传文件
+            if (fileCollection == null || fileCollection.Count == 0)
+            {
+                return await Task.FromResult(DataResult<string>.Failed("附件不存在!"));
+            }
+
+            var limitFiles = AppSetting.app<string>(new string[] { "FileSettings", "FileType" });
+            var basePath = AppSetting.app(new string[] { "FileSettings", "BasePath" });
+            var relativePath = AppSetting.app(new string[] { "FileSettings", "RelativePath" });
+            foreach (IFormFile file in fileCollection)
+            {
+                var originalFilename = file.FileName; // 文件原始名称
+                var fileSuffix = Path.GetExtension(file.FileName).ToLower(); // 文件后缀
+                if (!limitFiles.Contains(fileSuffix))
+                {
+                    return await Task.FromResult(DataResult<string>.Failed("不允许的文件类型!"));
+                }
+                var dirAbs = string.Empty;
+                var fileRelaPath = string.Empty;
+                var fileAbsPath = string.Empty;
+                if (string.IsNullOrEmpty(basePath))
+                {
+                    dirAbs = Path.Combine(_environment.WebRootPath, relativePath);
+                }
+                else
+                {
+                    dirAbs = Path.Combine(basePath, relativePath);
+                }
+
+                if (!Directory.Exists(dirAbs))
+                    Directory.CreateDirectory(dirAbs);
+                // 先存库获取Id
+                var id = SnowFlakeSingle.Instance.NextId();
+                var fileSaveName = $"{id}{fileSuffix}".ToLower();
+                fileRelaPath = Path.Combine(relativePath, fileSaveName).ToLower();
+                fileAbsPath = Path.Combine(dirAbs, fileSaveName).ToLower();
+                var newFile = new OpFile
+                {
+                    Id = id,
+                    FileName = originalFilename,
+                    FilePath = fileRelaPath,
+                    TypeCode = req.TypeCode,
+                    TypeName = req.TypeName,
+                    LinkId = req.LinkId,
+
+                };
+                await tenantDb.Insertable(newFile).ExecuteCommandAsync();
+
+                using (var stream = File.Create(fileAbsPath))
+                {
+                    await file.CopyToAsync(stream);
+                }
+            }
+            return await Task.FromResult(DataResult<string>.Success("批量上传成功"));
+            //return await Task.FromResult(DataResult<string>.Success(fileRelaPath));
+        }
         /// <summary>
         /// 获取业务附件
         /// </summary>
@@ -109,12 +179,50 @@ namespace DS.WMS.Core.Op.Method
         public DataResult<List<OpFileRes>> GetOpFileList(string id)
         {
             var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
-
+            var users = db.Queryable<SysUser>().Select(x => new { x.Id, x.UserName }).ToList();
             var data = tenantDb.Queryable<OpFile>()
             .Where(a => a.LinkId == long.Parse(id))
             .Select<OpFileRes>()
+            .Mapper(it =>
+            {
+                it.CreateByName = users.Find(x => x.Id == it.CreateBy).UserName;
+            })
             .ToList();
             return DataResult<List<OpFileRes>>.Success(data, MultiLanguageConst.DataQuerySuccess);
         }
+
+        /// <summary>
+        /// 批量删除附件
+        /// </summary>
+        /// <param name="req"></param>
+        /// <returns></returns>
+        public async Task<DataResult<string>> BatchDelFiles(IdModel req)
+        {
+            var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+             
+            if (req.Ids.Length == 0)
+            {
+                return await Task.FromResult(DataResult<string>.Failed("请勾选要删除的附件!"));
+            }
+
+
+            var fileList = tenantDb.Queryable<OpFile>().Where(x => req.Ids.Contains(x.Id)).ToList();
+             
+            //删除文件
+            foreach (var item in fileList)
+            {
+                var filePath= Path.Combine(_environment.WebRootPath, item.FilePath);
+                if (File.Exists(filePath))
+                {
+                    File.Delete(filePath);  
+                }
+            } 
+            
+            await tenantDb.Deleteable(fileList).ExecuteCommandAsync();
+ 
+            return await Task.FromResult(DataResult<string>.Success("删除成功"));
+        }
+
+
     }
 }

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

@@ -16,6 +16,7 @@ using DS.WMS.Core.Sys.Dtos;
 using DS.WMS.Core.Sys.Entity;
 using DS.WMS.Core.Sys.Interface;
 using Mapster;
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.Extensions.DependencyInjection;
 using SqlSugar;
 using System.Collections.Generic;
@@ -338,7 +339,8 @@ public class ClientCommonService : IClientCommonService
                 Id = a.Id,
                 CodeName = a.CodeName,
                 ShortName = a.ShortName,
-                EnShortName = a.EnShortName
+                EnShortName = a.EnShortName,
+                BLContent = a.BLContent,
             }
             ).ToList();
         return DataResult<List<ClientSelectRes>>.Success("获取数据成功!", data, MultiLanguageConst.DataQuerySuccess);

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

@@ -1,4 +1,5 @@
 using DS.Module.Core;
+using DS.Module.Core.Data;
 using DS.WMS.Core.Code.Dtos;
 using DS.WMS.Core.Op.Dtos;
 using DS.WMS.Core.Op.Interface;
@@ -38,7 +39,19 @@ public class OpFileController : ApiController
         var res = _invokeService.AddFile( file, req);
         return await res;
     }
-
+    /// <summary>
+    ///  多附件上传
+    /// </summary>
+    /// <param name="formCollection">文件信息</param>
+    /// <param name="req">业务附件请求实体</param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("AddMultiFiles")]
+    public async Task<DataResult<string>> AddMultiFiles(IFormCollection formCollection, [FromForm] OpFileReq req)
+    {
+        var res = _invokeService.AddMultiFiles(formCollection, req);
+        return await res;
+    }
     /// <summary>
     /// 获取业务附件
     /// </summary>
@@ -51,5 +64,16 @@ public class OpFileController : ApiController
         var res = _invokeService.GetOpFileList(id);
         return res;
     }
-
+    /// <summary>
+    /// 批量删除附件
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("BatchDelFiles")]
+    public async Task<DataResult<string>> BatchDelFiles([FromBody]IdModel req)
+    {
+        var res = _invokeService.BatchDelFiles(req);
+        return await res;
+    }
 }

ds-wms-service/DS.WMS.MainApi/DS.WMS.MainApi.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <NameOfLastUsedPublishProfile>D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

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

@@ -1674,3 +1674,87 @@
 2024-05-31 17:50:06.8508 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Source\Repos\DS8\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
 2024-05-31 17:50:06.8659 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
 2024-05-31 17:50:06.8659 Info Configuration initialized.
+2024-06-07 10:46:57.4090 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 10:46:57.5262 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 10:46:57.5449 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 10:46:57.6079 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-06-07 10:46:57.6432 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Release\net8.0\nlog.config
+2024-06-07 10:46:57.6590 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 10:46:57.6875 Info Configuration initialized.
+2024-06-07 10:48:09.9321 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 10:48:09.9609 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 10:48:09.9609 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 10:48:09.9914 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-06-07 10:48:10.0113 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 10:48:10.0185 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 10:48:10.0368 Info Configuration initialized.
+2024-06-07 11:16:22.5705 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 11:16:22.6039 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 11:16:22.6039 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 11:16:22.6317 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-06-07 11:16:22.6571 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 11:16:22.6672 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 11:16:22.6863 Info Configuration initialized.
+2024-06-07 11:52:26.3207 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 11:52:26.3383 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 11:52:26.3383 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 11:52:26.3565 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-06-07 11:52:26.3657 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 11:52:26.3657 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 11:52:26.3788 Info Configuration initialized.
+2024-06-07 12:01:23.9310 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 12:01:23.9561 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 12:01:23.9561 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 12:01:23.9791 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-06-07 12:01:23.9904 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 12:01:23.9904 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 12:01:24.0095 Info Configuration initialized.
+2024-06-07 14:03:45.4139 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 14:03:45.4372 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 14:03:45.4437 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 14:03:45.4589 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-06-07 14:03:45.4589 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 14:03:45.4787 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 14:03:45.4887 Info Configuration initialized.
+2024-06-07 14:19:21.6431 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 14:19:21.6431 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 14:19:21.6628 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 14:19:21.6758 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-06-07 14:19:21.6758 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 14:19:21.6758 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 14:19:21.6994 Info Configuration initialized.
+2024-06-07 14:21:15.8959 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 14:21:15.9603 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 14:21:15.9794 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 14:21:16.0656 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-06-07 14:21:16.0978 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 14:21:16.1168 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 14:21:16.1643 Info Configuration initialized.
+2024-06-07 14:34:34.1590 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 14:34:34.1833 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 14:34:34.1916 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 14:34:34.2099 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-06-07 14:34:34.2236 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 14:34:34.2236 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 14:34:34.2411 Info Configuration initialized.
+2024-06-07 14:47:20.0085 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 14:47:20.0393 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 14:47:20.0393 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 14:47:20.0664 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-06-07 14:47:20.0664 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 14:47:20.0896 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 14:47:20.1025 Info Configuration initialized.
+2024-06-07 15:03:02.8823 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 15:03:02.9222 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 15:03:02.9375 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 15:03:02.9712 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-06-07 15:03:03.0354 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 15:03:03.0625 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 15:03:03.1050 Info Configuration initialized.
+2024-06-07 15:05:51.9750 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-06-07 15:05:52.0280 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-06-07 15:05:52.0466 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-06-07 15:05:52.0875 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-06-07 15:05:52.1200 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-06-07 15:05:52.1400 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-06-07 15:05:52.1721 Info Configuration initialized.

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-06-04T06:20:46.7742295Z||;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-06-07T07:23:11.1389680Z;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.MainApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>D:\Publish\DS8\Main</_PublishTargetUrl>
-    <History>True|2024-05-31T05:57:26.8256021Z||;True|2024-05-30T16:18:14.8047074+08:00||;True|2024-05-30T09:30:24.9756841+08:00||;True|2024-05-29T17:46:22.9869679+08:00||;True|2024-05-29T17:20:28.9621862+08:00||;True|2024-05-29T17:18:16.4688274+08:00||;True|2024-05-29T16:33:42.5152962+08:00||;False|2024-05-29T16:33:09.8393409+08:00||;False|2024-05-29T16:31:07.7569208+08:00||;True|2024-05-28T18:00:39.2399003+08:00||;True|2024-05-28T08:47:53.8630073+08:00||;True|2024-05-23T17:51:45.6784172+08:00||;True|2024-05-21T17:32:52.9294009+08:00||;</History>
+    <History>True|2024-06-07T07:21:06.7600490Z;True|2024-06-07T15:17:45.6855676+08:00;True|2024-05-31T13:57:26.8256021+08:00;True|2024-05-30T16:18:14.8047074+08:00;True|2024-05-30T09:30:24.9756841+08:00;True|2024-05-29T17:46:22.9869679+08:00;True|2024-05-29T17:20:28.9621862+08:00;True|2024-05-29T17:18:16.4688274+08:00;True|2024-05-29T16:33:42.5152962+08:00;False|2024-05-29T16:33:09.8393409+08:00;False|2024-05-29T16:31:07.7569208+08:00;True|2024-05-28T18:00:39.2399003+08:00;True|2024-05-28T08:47:53.8630073+08:00;True|2024-05-23T17:51:45.6784172+08:00;True|2024-05-21T17:32:52.9294009+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>

ds-wms-service/DS.WMS.MainApi/appsettings.json

@@ -47,7 +47,7 @@
     "FileSettings": {
         "BasePath": "", //基础路径，不配置则使用当前系统目录
         "RelativePath": "LinkAttach",
-        "FileType": [ ".xls", ".xlsx", ".pdf", ".txt", ".pms" ]
+        "FileType": [ ".xls", ".xlsx", ".pdf", ".jpg", ".png", ".txt", ".pms" ]
     },
     "PrintService": {
         "IP": "60.209.125.238",

ds-wms-service/DS.WMS.OpApi/appsettings.json

@@ -47,7 +47,7 @@
     "FileSettings": {
         "BasePath": "", //基础路径，不配置则使用当前系统目录
         "RelativePath": "LinkAttach",
-        "FileType": [ ".xls", ".xlsx", ".pdf", ".txt", ".pms" ]
+        "FileType": [ ".xls", ".xlsx", ".pdf", ".jpg", ".png", ".txt", ".pms" ]
     },
     //打印模板
     "PrintTemplate": {