创建服务项目子任务调整

.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

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

@@ -28,6 +28,6 @@ namespace DS.WMS.Core.Op.Interface.TaskInteraction
         /// </summary>
         /// <param name="dataContext"></param>
         /// <returns></returns>
-        Task CreateSubTaskAsync(TaskFlowDataContext dataContext);
+        Task CreateSubTask(TaskFlowDataContext dataContext);
     }
 }

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

@@ -145,7 +145,7 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction
         /// </summary>
         /// <param name="dataContext"></param>
         /// <returns></returns>
-        public async Task CreateSubTaskAsync(TaskFlowDataContext dataContext)
+        public async Task CreateSubTask(TaskFlowDataContext dataContext)
         {
             ArgumentNullException.ThrowIfNull(dataContext, nameof(dataContext));
 

ds-wms-service/DS.WMS.Core/TaskPlat/Interface/ITaskManageBCService.cs

@@ -70,5 +70,6 @@ namespace DS.WMS.Core.TaskPlat.Interface
         /// 通过BC任务匹配订单（任务台使用）
         /// </summary>
         Task<DataResult> BcMatchSeaExportTask(TaskFlowDataContext dataContext);
+        Task<DataResult<ParserBCInfoDto>> UploadBcThenRun(string carrierCode, IFormFile file);
     }
 }

ds-wms-service/DS.WMS.Core/TaskPlat/Method/TaskManageBCService.cs

@@ -2457,5 +2457,11 @@ namespace DS.WMS.Core.TaskPlat.Method
             return DataResult<byte[]>.Failed(result);
         }
         #endregion
+
+        public Task<DataResult<ParserBCInfoDto>> UploadBcThenRun(string carrierCode, IFormFile file)
+        {
+
+            return default;
+        }
     }
 }

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任务
+        /// <summary>
+        /// 上传BC并触发BC任务
+        /// </summary>
+        /// <param name="carrierCode">船公司代码</param>
+        /// <param name="file">BC文件</param>
+        [HttpPost("UploadBcThenRun")]
+        public async Task<DataResult<ParserBCInfoDto>> UploadBcThenRun(string carrierCode, IFormFile file)
+        {
+            // 生成擦写后的文件
+            // 保存文件和擦写后的文件
+            // 解析数据，保存数据
+            // 触发BC任务
+            // 
+            return await _taskManageBCService.UploadBcThenRun(carrierCode, file);
+        }
+        #endregion
     }
 }

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"
   }
 }