diff --git a/.gitignore b/.gitignore
index 0e3773fe..23e17492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,4 @@ LinkAttach
/ds-wms-service/DS.WMS.TaskApi/TaskEmailTemplate
/ds-wms-service/DS.WMS.Core/TaskPlat.zip
/ds-wms-service/DS.WMS.OpApi/TempFiles/S24080087
+/ds-wms-service/DS.WMS.TaskApi/wwwroot/TaskEmailTemplate
diff --git a/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs
index 47f1202c..49dfa424 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Interface/TaskInteraction/ISeaExportTaskService.cs
@@ -28,6 +28,6 @@ namespace DS.WMS.Core.Op.Interface.TaskInteraction
///
///
///
- Task CreateSubTaskAsync(TaskFlowDataContext dataContext);
+ Task CreateSubTask(TaskFlowDataContext dataContext);
}
}
diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs
index 78bde8eb..e9723c0c 100644
--- a/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs
+++ b/ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/SeaExportTaskService.cs
@@ -145,7 +145,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
///
///
///
- public async Task CreateSubTaskAsync(TaskFlowDataContext dataContext)
+ public async Task CreateSubTask(TaskFlowDataContext dataContext)
{
ArgumentNullException.ThrowIfNull(dataContext, nameof(dataContext));
diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ITaskManageBCService.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ITaskManageBCService.cs
index 772f8626..af3f9a97 100644
--- a/ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ITaskManageBCService.cs
+++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ITaskManageBCService.cs
@@ -70,5 +70,6 @@ namespace DS.WMS.Core.TaskPlat.Interface
/// 通过BC任务匹配订单(任务台使用)
///
Task BcMatchSeaExportTask(TaskFlowDataContext dataContext);
+ Task> UploadBcThenRun(string carrierCode, IFormFile file);
}
}
diff --git a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs
index 42a1007c..88bbbb0f 100644
--- a/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs
+++ b/ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs
@@ -2457,5 +2457,11 @@ namespace DS.WMS.Core.TaskPlat.Method
return DataResult.Failed(result);
}
#endregion
+
+ public Task> UploadBcThenRun(string carrierCode, IFormFile file)
+ {
+
+ return default;
+ }
}
}
diff --git a/ds-wms-service/DS.WMS.TaskApi/Controllers/TaskManageBCController.cs b/ds-wms-service/DS.WMS.TaskApi/Controllers/TaskManageBCController.cs
index 8a3159ce..d7c15129 100644
--- a/ds-wms-service/DS.WMS.TaskApi/Controllers/TaskManageBCController.cs
+++ b/ds-wms-service/DS.WMS.TaskApi/Controllers/TaskManageBCController.cs
@@ -96,5 +96,23 @@ namespace DS.WMS.TaskApi.Controllers
return await _taskManageBCService.GetModifyBCFile(carrierCode, file);
}
#endregion
+
+ #region 上传BC并触发BC任务
+ ///
+ /// 上传BC并触发BC任务
+ ///
+ /// 船公司代码
+ /// BC文件
+ [HttpPost("UploadBcThenRun")]
+ public async Task> UploadBcThenRun(string carrierCode, IFormFile file)
+ {
+ // 生成擦写后的文件
+ // 保存文件和擦写后的文件
+ // 解析数据,保存数据
+ // 触发BC任务
+ //
+ return await _taskManageBCService.UploadBcThenRun(carrierCode, file);
+ }
+ #endregion
}
}
diff --git a/ds-wms-service/DS.WMS.TaskApi/appsettings.json b/ds-wms-service/DS.WMS.TaskApi/appsettings.json
index e42cf810..a527c74a 100644
--- a/ds-wms-service/DS.WMS.TaskApi/appsettings.json
+++ b/ds-wms-service/DS.WMS.TaskApi/appsettings.json
@@ -95,5 +95,12 @@
"EmailTemplate": {
"BasePath": "", //基础路径,不配置则使用当前系统目录
"RelativePath": "TaskEmailTemplate"
+ },
+ "TaskMail": {
+ "FileBaseUrl": "http://118.190.144.189:3008",
+ "JsonPrint": "/printApi/OpenPrint/GetOpenJsonPrintInfoAsync",
+ "JsonPrintByCode": "/printApi/OpenPrint/GetOpenJsonPrintInfoByTemplateCode",
+ "SQLPrint": "/printApi/OpenPrint/GetOpenSqlPrintInfo",
+ "MailApiUrl": "http://47.104.73.97:8801/mail/send"
}
}