内容模板建立文件夹

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

@@ -25,10 +25,15 @@
 
     <ItemGroup>
       <None Remove="Op\MailTemplate.cshtml" />
+      <None Remove="Op\Templates\入货通知.cshtml" />
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="Op\MailTemplate.cshtml">
+      <Content Include="Op\Templates\入货通知.cshtml">
+        <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+        <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      </Content>
+      <Content Include="Op\Templates\MailTemplate.cshtml">
         <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
         <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       </Content>

ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/Booking/MailActionExecutor.cs

@@ -69,7 +69,11 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction.ActionExecutor.Booking
                 return;
             }
 
-            var model = new MailTemplateModel<SeaExportRes>(result2.Data) { BusinessId = context.TaskInfo.BusinessId };
+            var model = new MailTemplateModel<SeaExportRes>(result2.Data)
+            {
+                BusinessId = context.TaskInfo.BusinessId,
+                BusinessType = context.TaskInfo.BusinessType,
+            };
             MailService mailService = new(context.ServiceProvider);
             result = await mailService.SendAsync(mailConfig, model);
             if (!result.Succeeded)

ds-wms-service/DS.WMS.Core/Op/Method/TaskInteraction/ActionExecutor/SpaceRelease/IncomingNotificationAction.cs

@@ -54,7 +54,11 @@ namespace DS.WMS.Core.Op.Method.TaskInteraction.ActionExecutor.SpaceRelease
             }
 
             result.Data.Order = result2.Data;
-            var model = new MailTemplateModel<OpBusinessYardRes>(result.Data) { BusinessId = context.TaskInfo.BusinessId };
+            var model = new MailTemplateModel<OpBusinessYardRes>(result.Data)
+            {
+                BusinessId = context.TaskInfo.BusinessId,
+                BusinessType = context.TaskInfo.BusinessType,
+            };
             MailService mailService = new(context.ServiceProvider);
             var result3 = await mailService.SendAsync(mailConfig, model);
             if (!result3.Succeeded)

ds-wms-service/DS.WMS.Core/Op/Templates/MailTemplate.cshtml

@@ -1,4 +1,4 @@
-@* @model DS.Module.Core.Data.MailTemplateModel<DS.WMS.Core.Op.Dtos.SeaExportRes> *@
+@* @model DS.WMS.Core.Op.Entity.MailTemplateModel<DS.WMS.Core.Op.Dtos.SeaExportRes> *@
 @{
     var item = Model.Primary;
 }

ds-wms-service/DS.WMS.Core/Op/Templates/入货通知.cshtml

@@ -0,0 +1,32 @@
+@model DS.WMS.Core.Op.Entity.MailTemplateModel<DS.WMS.Core.Op.Dtos.OpBusinessYardRes>
+@{
+    var item = Model.Primary;
+}
+
+<style>
+    .parent {
+        position: relative;
+        height: 300px;
+        width: 300px;
+    }
+
+    .child {
+        position: absolute;
+        bottom: 0;
+        right: 0;
+        width: 50px;
+        height: 50px;
+    }
+</style>
+
+<h1>测试邮件-@item.Order.MBLNO<span style="padding: 2px"></span>@item.Order.CustomerNo</h1>
+
+<div>
+    <span>预计开船日期：@item.Order.ETD</span>
+    <span>预计抵达日期：@item.Order.ETA</span>
+</div>
+<hr />
+
+<div class="parent">
+    <div id="sign" class="child"></div>
+</div>