发送委托书接口

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

@@ -182,4 +182,11 @@ public interface ISeaExportService
     /// <param name="request"></param>
     /// <returns></returns>
     public  Task<DataResult<List<BookingStatusLogRes>>> GetBookingStatusLogList(PageRequest request);
+
+    /// <summary>
+    /// 发送托书
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    public Task<DataResult<string>> SendShippingOrderEmail(SendShippingOrderReq req);
 }

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

@@ -127,6 +127,7 @@ namespace DS.WMS.Core.Op.Method
             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" });
+            var filesPath = new List<string>();
             foreach (IFormFile file in fileCollection)
             {
                 var originalFilename = file.FileName; // 文件原始名称
@@ -170,8 +171,9 @@ namespace DS.WMS.Core.Op.Method
                 {
                     await file.CopyToAsync(stream);
                 }
+                filesPath.Add(fileSaveName);
             }
-            return await Task.FromResult(DataResult<string>.Success("批量上传成功"));
+            return await Task.FromResult(DataResult<string>.Success("批量上传成功", filesPath.ToString()));
             //return await Task.FromResult(DataResult<string>.Success(fileRelaPath));
         }
         /// <summary>

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

@@ -61,15 +61,32 @@ namespace DS.WMS.Core.Op.Method
             var attPostArr = new List<dynamic>();
             foreach (var file in req.FileList)
             {
-                //var opt = App.GetOptions<TempFileOptions>().Path;
-                //var fileFullPath = Path.Combine(App.WebHostEnvironment.WebRootPath, opt);
-                //var fileFullName = Path.Combine(fileFullPath, file);
+                var basePath = AppSetting.app(new string[] { "FileSettings", "BasePath" });
+                var relativePath = AppSetting.app(new string[] { "FileSettings", "RelativePath" });
+                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);
+                } 
+                var fileFullName = Path.Combine(dirAbs, file);
+                fileFullName = fileFullName.Replace(".OpApi", ".MainApi");
 
-                //attPostArr.Add(new
-                //{
-                //    AttachName = Path.GetFileName(file),
-                //    AttachContent = Convert.ToBase64String(File.ReadAllBytes(fileFullName))
-                //});
+                if (!File.Exists(fileFullName))
+                {
+                    return await Task.FromResult(DataResult<string>.Failed("附件不存在,请检查"));
+                }
+
+                attPostArr.Add(new
+                {
+                    AttachName = Path.GetFileName(file),
+                    AttachContent = Convert.ToBase64String(File.ReadAllBytes(fileFullName))
+                });
             }
 
             var mailJson = new dynamic[]{

ds-wms-service/DS.WMS.OpApi/Controllers/SeaExportController.cs

@@ -416,4 +416,17 @@ public class SeaExportController : ApiController
         return  res;
     }
 
+
+    /// <summary>
+    /// 发送托书
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("SendShippingOrderEmail")]
+    public async Task<DataResult<string>> SendShippingOrderEmail([FromBody] SendShippingOrderReq req)
+    {
+        var res = await _invokeService.SendShippingOrderEmail(req);
+        return res;
+    }
 }

ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>