chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务附件相关

Browse Source
usertest
zhangxiaofeng 4 months ago
parent 98a8c5c940
commit 5d00ad6fdd
14 changed files with 152 additions and 39 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape Escape View File

@ -63,3 +63,4 @@ bin-release/
/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user
/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt
/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj.user
LinkAttach

9
ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs
Unescape Escape View File

@ -1454,6 +1454,15 @@ public static class MultiLanguageConst
[Description("未能获取到相应BC业务数据")]
public const string TaskBCInfoEmpty = "TaskBCInfoEmpty";
[Description("附件分类代码错误，请提供正确的分类代码")]
public const string TaskFileCategoryError = "TaskFileCategoryError";
[Description("任务主键{0}没有可下载的附件")]
public const string TaskFileEmpty = "TaskFileEmpty";
[Description("任务主键{0} 附件下载请求失败，请确认文件是否存在")]
public const string TaskFileNotExists = "TaskFileNotExists";
#endregion
#region 邮件解析配置

7
ds-wms-service/DS.Module.Core/Enums/TaskPlat/TaskFileCategoryEnum.cs
Unescape Escape View File

@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.ComponentModel;
namespace DS.Module.Core
{

6
ds-wms-service/DS.Module.Core/Filters/OperationLogFilter.cs
Unescape Escape View File

@ -16,7 +16,7 @@ namespace DS.Module.Core.Filters;
/// <summary>
/// 操作日志 过滤器
/// </summary>
public class OperationLogFilter: IAsyncActionFilter
public class OperationLogFilter : IAsyncActionFilter
{
private readonly IServiceProvider _serviceProvider;
private readonly SqlSugarScope db;
@ -50,7 +50,7 @@ public class OperationLogFilter: IAsyncActionFilter
isWriteLog = true;
}
var res = actionContext.Result?.GetType() == typeof(DataResult) ? actionContext.Result.ToJsonString() : "";
//var res = actionContext.Result?.GetType() == typeof(DataResult) ? actionContext.Result.ToJsonString() : "";
if (isWriteLog)
{
var log = new SysLogOperation()
@ -66,7 +66,7 @@ public class OperationLogFilter: IAsyncActionFilter
MethodName = actionDescriptor?.ActionName,
ReqMethod = httpRequest.Method,
Param = context.ActionArguments.Count < 1 ? "" : context.ActionArguments.ToJsonString(),
Result = actionContext.Result.ToJsonString(),
Result = actionContext?.Result is FileResult ? "(FileResult)" : actionContext.Result.ToJsonString(),
ElapsedTime = sw.ElapsedMilliseconds,
OpTime = DateTime.Now,
};

1
ds-wms-service/DS.Module.MultiLanguage/MultiLanguageMiddleware.cs
Unescape Escape View File

@ -50,6 +50,7 @@ public class MultiLanguageMiddleware
|| context.Request.Path.Value.IndexOf("PrintTempFile", StringComparison.InvariantCultureIgnoreCase) > -1
|| context.Request.Path.Value.IndexOf("GetOcrImg", StringComparison.InvariantCultureIgnoreCase) > -1
|| context.Request.Path.Value.IndexOf("DownloadBookingOrClosingEDI", StringComparison.InvariantCultureIgnoreCase) > -1
|| context.Request.Path.Value.IndexOf("DownloadFile", StringComparison.InvariantCultureIgnoreCase) > -1
)
)
{

7
ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ITaskManageBaseService.cs
Unescape Escape View File

@ -22,5 +22,12 @@ namespace DS.WMS.Core.TaskPlat.Interface
/// <param name="taskIds">任务主键数组</param>
/// <param name="userInfo">人员信息列表</param>
Task SetTaskOwner(long[] taskIds, List<RecvUserInfo> userInfo);
/// <summary>
/// 根据任务ID获取附件信息
/// </summary>
/// <param name="taskId">任务Id</param>
/// <param name="fileCategory">附件分类代码</param>
Task<(string fileFullPath, string fileName)> GetTaskFileInfo(long taskId, string fileCategory);
}
}

1
ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ITaskManageService.cs
Unescape Escape View File

@ -58,5 +58,6 @@ namespace DS.WMS.Core.TaskPlat.Interface
/// <param name="taskBaseTypeEnum">业务类型</param>
/// <param name="userInfos">要转交的人员信息列表</param>
Task<DataResult> TransferTask(long bsno, TaskBaseTypeEnum taskBaseTypeEnum, List<RecvUserInfo> userInfos);
}
}

10
ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs
Unescape Escape View File

@ -25,8 +25,6 @@ namespace DS.WMS.Core.TaskPlat.Method
{
}
/// <summary>
/// 通过任务主键获取BC详情
/// </summary>
@ -125,9 +123,9 @@ namespace DS.WMS.Core.TaskPlat.Method
return DataResult<TaskManageOrderResultDto>.Success(result);
}
public virtual async Task<(bool canCompelete, string? msg)> CompleteAsync(long taskId)
{
return (true, null);
}
//public virtual async Task<(bool canCompelete, string? msg)> CompleteAsync(long taskId)
//{
// return (true, null);
//}
}
}

78
ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBaseService.cs
Unescape Escape View File

@ -9,6 +9,8 @@ using Microsoft.Extensions.Logging;
using SqlSugar;
using System.Linq.Expressions;
using System.Runtime.InteropServices;
using System.Text;
using System.Web;
namespace DS.WMS.Core.TaskPlat.Method
{
@ -102,12 +104,14 @@ namespace DS.WMS.Core.TaskPlat.Method
/// <summary>
/// 保存文件并返回文件完整路径
/// </summary>
/// <param name="fileDictKey">追加文件夹</param>
/// <param name="fileBytes">文件二进制流</param>
/// <param name="batchNo">批次号</param>
/// <param name="fileNameNoSuffix">无拓展名的文件名</param>
/// <param name="printFileType">文件类型</param>
/// <param name="attachFileType">附件类型 bcfiles-BC文件 sofile-订舱附件</param>
/// <returns>返回文件完整路径</returns>
protected async Task<string> SaveFile(byte[] fileBytes, string batchNo,
protected async Task<string> SaveFile(string fileDictKey, byte[] fileBytes, string batchNo, string fileNameNoSuffix,
PrintFileTypeEnum printFileType, string attachFileType = "sofiles")
{
var basePath = AppSetting.app(new string[] { "FileSettings", "BasePath" });
@ -116,6 +120,9 @@ namespace DS.WMS.Core.TaskPlat.Method
if (!string.IsNullOrWhiteSpace(attachFileType))
relativePath += $"\\{attachFileType}";
if (!string.IsNullOrWhiteSpace(fileDictKey))
relativePath += $"\\{fileDictKey}";
string? dirAbs;
if (string.IsNullOrEmpty(basePath))
{
@ -151,11 +158,13 @@ namespace DS.WMS.Core.TaskPlat.Method
fileType = ".doc";
}
var id = SnowFlakeSingle.Instance.NextId();
var fileSaveName = $"{id}{fileType}".ToLower();
string curFileName = fileNameNoSuffix;
//var id = SnowFlakeSingle.Instance.NextId();
var fileSaveName = $"{curFileName}{fileType}";
string fileRelaPath = Path.Combine(relativePath, fileSaveName).ToLower();
string fileAbsPath = Path.Combine(dirAbs, fileSaveName).ToLower();
string fileRelaPath = Path.Combine(relativePath, fileSaveName);
string fileAbsPath = Path.Combine(dirAbs, fileSaveName);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
@ -214,6 +223,65 @@ namespace DS.WMS.Core.TaskPlat.Method
}
#endregion
/// <summary>
/// 根据任务ID获取附件信息
/// </summary>
/// <param name="taskId">任务Id</param>
/// <param name="fileCategory">附件分类代码</param>
public async Task<(string fileFullPath, string fileName)> GetTaskFileInfo(long taskId, string fileCategory)
{
var tenantDb = saasDbService.GetBizDbScopeById(user.TenantId);
var bcTaskInfo = await tenantDb.Queryable<TaskBaseInfo>().Where(u => u.Id == taskId).FirstAsync();
if (bcTaskInfo == null)
{
throw new Exception(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.DataQueryNoData)));
}
TaskFileCategoryEnum fileCategoryEnum = TaskFileCategoryEnum.NONE;
System.Enum.TryParse(fileCategory, out fileCategoryEnum);
if (fileCategoryEnum == TaskFileCategoryEnum.NONE)
{
// 附件分类代码错误，请提供正确的分类代码
throw new Exception(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.TaskFileCategoryError)));
}
string name = fileCategoryEnum.ToString();
var fileInfo = await tenantDb.Queryable<TaskFileInfo>().Where(u => u.TASK_PKID == taskId && u.FILE_CATEGORY == name).OrderByDescending(x => x.Id).FirstAsync();
if (fileInfo == null)
{
// 附件分类代码错误，请提供正确的分类代码
throw new Exception(
string.Format(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.TaskFileCategoryError)), taskId)
);
}
var basePath = AppSetting.app(new string[] { "FileSettings", "BasePath" });
string fileFullPath;
if (string.IsNullOrEmpty(basePath))
{
fileFullPath = Path.Combine(environment.WebRootPath ?? "", fileInfo.FILE_PATH);
}
else
{
fileFullPath = Path.Combine(basePath, fileInfo.FILE_PATH);
}
if (!File.Exists(fileFullPath))
{
//任务主键{0} 附件下载请求失败，请确认文件是否存在
throw new Exception(
string.Format(MultiLanguageConst.GetDescription(nameof(MultiLanguageConst.TaskFileNotExists)), taskId)
);
}
var fileName = HttpUtility.UrlEncode(fileInfo.FILE_NAME, Encoding.GetEncoding("UTF-8"))!;
return (fileFullPath, fileName);
//return (new FileStream(fileFullPath, FileMode.Open), fileName);
}
}
}

29
ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageService.cs
Unescape Escape View File

@ -1,6 +1,8 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using DS.Module.Core.Extensions;
using DS.Module.Core.Helpers;
using DS.Module.DjyServiceStatus;
using DS.Module.SqlSugar;
using DS.Module.UserModule;
using DS.WMS.Core.TaskPlat.Dtos;
@ -12,9 +14,6 @@ using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using SqlSugar;
using System.Runtime.InteropServices;
using DS.Module.Core.Extensions;
using DS.Module.DjyServiceStatus;
namespace DS.WMS.Core.TaskPlat.Method
@ -371,8 +370,11 @@ namespace DS.WMS.Core.TaskPlat.Method
fileCategory = TaskFileCategoryEnum.ADVISORY.ToString();
}
var fileFullName = await SaveFile(bytes,
var noExtensionFileName = Path.GetFileNameWithoutExtension(file.FileName);
var fileFullName = await SaveFile(taskInfo.Id.ToString(),
bytes,
batchNo,
noExtensionFileName,
GetFileType(file.FileName),
attachFileType);
@ -460,8 +462,10 @@ namespace DS.WMS.Core.TaskPlat.Method
}
var noExtensionFileName = Path.GetFileNameWithoutExtension(modifyFile.FileName);
var fileFullName = await SaveFile(bytes,
var fileFullName = await SaveFile(taskInfo.Id.ToString(),
bytes,
batchNo,
noExtensionFileName,
GetFileType(modifyFile.FileName),
attachFileType);
@ -488,7 +492,7 @@ namespace DS.WMS.Core.TaskPlat.Method
//附件
if (info.Main.FileList != null && info.Main.FileList.Count > 0)
{
info.Main.FileList.ForEach(async file =>
var fileList = info.Main.FileList.Select(file =>
{
var fileInfo = new TaskFileInfo();
@ -536,9 +540,9 @@ namespace DS.WMS.Core.TaskPlat.Method
fileInfo.FILE_NAME = fileModel.Name;
fileInfo.FILE_TYPE = fileModel.Extension?.Replace(".", "");
}
await tenantDb.Insertable(fileInfo).ExecuteCommandAsync();
});
return fileInfo;
}).ToList();
await tenantDb.Insertable(fileList).ExecuteCommandAsync();
}
#endregion
@ -546,7 +550,7 @@ namespace DS.WMS.Core.TaskPlat.Method
//邮件
if (info.Main.EmailList != null && info.Main.EmailList.Count > 0)
{
info.Main.EmailList.ForEach(async email =>
var emailList = info.Main.EmailList.Select(email =>
{
var emailInfo = new TaskEmail();
@ -558,8 +562,9 @@ namespace DS.WMS.Core.TaskPlat.Method
emailInfo.MAIL_PATH = email.MailPath;
await tenantDb.Insertable(emailInfo).ExecuteCommandAsync();
});
return emailInfo;
}).ToList();
await tenantDb.Insertable(emailList).ExecuteCommandAsync();
}
#endregion

11
ds-wms-service/DS.WMS.Core/TaskPlat/Other/TaskFlowRuner.cs
Unescape Escape View File

@ -1,6 +1,8 @@
using DS.Module.Core;
using DS.Module.Core.Data;
using DS.WMS.Core.TaskPlat.Entity;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using SqlSugar;
using System.Diagnostics;
@ -15,7 +17,7 @@ namespace DS.WMS.Core.TaskPlat
{
private readonly SqlSugarScopeProvider tenantDb = null!;
private readonly IServiceProvider serviceProvider = null!;
private readonly ILogger<TaskFlowRuner> logger = null!;
private TaskFlowRuner() { }
/// <summary>
@ -27,6 +29,7 @@ namespace DS.WMS.Core.TaskPlat
{
this.tenantDb = tenantDb;
this.serviceProvider = serviceProvider;
this.logger = serviceProvider.GetRequiredService<ILogger<TaskFlowRuner>>();
}
/// <summary>
/// 执行
@ -35,7 +38,7 @@ namespace DS.WMS.Core.TaskPlat
/// <param name="taskId">任务Id</param>
/// <param name="dataContext">起始入参数据上下文</param>
/// <returns>(执行日志Id,模块是否全部执行完成,模块执行结果是否全部为success)</returns>
public async Task<(long flowLogId, bool isAllComplete, bool isAllSuccess)> Run(TaskBaseTypeEnum taskBaseType, long taskId, TaskFlowDataContext dataContext)
public async Task<(long? flowLogId, bool isAllComplete, bool isAllSuccess)> Run(TaskBaseTypeEnum taskBaseType, long taskId, TaskFlowDataContext dataContext)
{
if (dataContext == null)
{
@ -59,7 +62,9 @@ namespace DS.WMS.Core.TaskPlat
IsSuccess = false,
};
await tenantDb.Insertable(log).ExecuteCommandAsync();
throw new Exception(msg);
logger.LogInformation(msg);
return (null, false, false);
//throw new Exception(msg);
}
var allConfigIdList = allConfigList.Select(x => x.Id);

15
ds-wms-service/DS.WMS.TaskApi/Controllers/TaskManageController.cs
Unescape Escape View File

@ -183,6 +183,21 @@ public class TaskManageController : ApiController
return DataResult.SuccessedWithDesc(nameof(MultiLanguageConst.OperationSuccess));
}
/// <summary>
/// 根据任务ID下载附件
/// </summary>
/// <param name="taskId">任务主键</param>
/// <param name="fileCategory">附件分类代码</param>
/// <returns>返回数据流</returns>
[HttpGet("DownloadFile")]
public async Task<IActionResult> DownloadFile([FromQuery] long taskId, [FromQuery] string fileCategory = "BC")
{
(string fileFullPath, string fileName) = await taskManageService.GetTaskFileInfo(taskId, fileCategory);
return PhysicalFile(fileFullPath, "application/octet-stream", fileName);
}
// /TaskManage/CreateBCTaskJob
// /TaskManage/CreateDRAFTTaskJob
// /TaskManage/CreateAdvisoryTaskJob

5
ds-wms-service/DS.WMS.TaskApi/DS.WMS.TaskApi.csproj
Unescape Escape View File

@ -15,6 +15,7 @@
<ProjectReference Include="..\DS.Module.DjyRulesEngine\DS.Module.DjyRulesEngine.csproj" />
<ProjectReference Include="..\DS.Module.ExcelModule\DS.Module.ExcelModule.csproj" />
<ProjectReference Include="..\DS.Module.Jwt\DS.Module.Jwt.csproj" />
<ProjectReference Include="..\DS.Module.Middleware\DS.Module.Middleware.csproj" />
<ProjectReference Include="..\DS.Module.MultiLanguage\DS.Module.MultiLanguage.csproj" />
<ProjectReference Include="..\DS.Module.Nuget\DS.Module.Nuget.csproj" />
<ProjectReference Include="..\DS.Module.SqlSugar\DS.Module.SqlSugar.csproj" />
@ -23,4 +24,8 @@
<ProjectReference Include="..\DS.WMS.Core\DS.WMS.Core.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="wwwroot\" />
</ItemGroup>
</Project>

7
ds-wms-service/ds-wms-service.sln
Unescape Escape View File

@ -60,14 +60,17 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.FinanceApi", "DS.WMS.FinanceApi\DS.WMS.FinanceApi.csproj", "{32B97A3A-C361-44F3-B417-5D08E9FD9624}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.TaskApi", "DS.WMS.TaskApi\DS.WMS.TaskApi.csproj", "{8DAE16A3-E249-4C86-BEEC-DA8429FD837C}"
ProjectSection(ProjectDependencies) = postProject
{B0351554-748F-4DF8-8C22-152646937EFE} = {B0351554-748F-4DF8-8C22-152646937EFE}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.EmailModule", "DS.Module.EmailModule\DS.Module.EmailModule.csproj", "{4B51DCC1-62A5-49C5-978B-798E6B48F3C0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.PrintApi", "DS.WMS.PrintApi\DS.WMS.PrintApi.csproj", "{274B1D18-A15A-4917-A567-6FDCD090D5B0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.Module.OcrModule", "DS.Module.OcrModule\DS.Module.OcrModule.csproj", "{3EB9CA1E-5910-42A5-A64D-0CB435F6A64A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.Module.OcrModule", "DS.Module.OcrModule\DS.Module.OcrModule.csproj", "{3EB9CA1E-5910-42A5-A64D-0CB435F6A64A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DS.WMS.ContainerManagementApi", "DS.WMS.ContainerManagementApi\DS.WMS.ContainerManagementApi.csproj", "{7C3E248A-DF40-46AC-A8DF-224DD7C4EEF7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DS.WMS.ContainerManagementApi", "DS.WMS.ContainerManagementApi\DS.WMS.ContainerManagementApi.csproj", "{7C3E248A-DF40-46AC-A8DF-224DD7C4EEF7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Write Preview
Loading…
Cancel
Save