订舱主表增加品名代码、品名字段

Myshipping.Application/Entity/BookingOrder.cs

@@ -743,6 +743,18 @@ namespace Myshipping.Application.Entity
         /// </summary>
         [Description("付款方")]
         public string FREIGHTPAYER { get; set; }
+
+        /// <summary>
+        /// 品名代码
+        /// </summary>
+        [Description("品名代码")]
+        public string GOODSCODE { get; set; }
+
+        /// <summary>
+        /// 品名
+        /// </summary>
+        [Description("品名")]
+        public string GOODSNAME { get; set; }
         /// <summary>
         /// 租户名称
         /// </summary>

Myshipping.Application/Myshipping.Application.xml

@@ -3327,6 +3327,16 @@
             付款方
             </summary>
         </member>
+        <member name="P:Myshipping.Application.Entity.BookingOrder.GOODSCODE">
+            <summary>
+            品名代码
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.Entity.BookingOrder.GOODSNAME">
+            <summary>
+            品名
+            </summary>
+        </member>
         <member name="P:Myshipping.Application.Entity.BookingOrder.TenantName">
             <summary>
             租户名称
@@ -9783,6 +9793,11 @@
             分类名称
             </summary>
         </member>
+        <member name="P:Myshipping.Application.QueryBookingPrintTemplateInput.Type">
+            <summary>
+            类型：FastReport、Excel模板等
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.BookingTemplateService">
             <summary>
             订舱模板服务
@@ -11801,6 +11816,31 @@
             <param name="BusinessMsg"></param>
             <returns></returns>
         </member>
+        <member name="T:Myshipping.Application.LaraPaperCalcInfo">
+            <summary>
+            提单纸计算
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.LaraPaperCalcInfo.Indx">
+            <summary>
+            顺序号
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.LaraPaperCalcInfo.MBLNo">
+            <summary>
+            主单号
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.LaraPaperCalcInfo.DraftNum">
+            <summary>
+            DRAFT页数
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.LaraPaperCalcInfo.PaperNum">
+            <summary>
+            提单用纸数
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.QueryTaskManageDto">
             <summary>
             我的任务查询
@@ -12723,6 +12763,13 @@
             <param name="PKIds">任务主键数组</param>
             <returns>返回结果</returns>
         </member>
+        <member name="M:Myshipping.Application.ITaskManageService.LaraPaperCalc(System.String[])">
+            <summary>
+            提单纸页数计算
+            </summary>
+            <param name="PKIds">任务主键数组</param>
+            <returns>返回结果</returns>
+        </member>
         <member name="T:Myshipping.Application.TaskManageService">
             <summary>
             任务管理
@@ -12818,5 +12865,12 @@
             <param name="PKIds">任务主键数组</param>
             <returns>返回结果</returns>
         </member>
+        <member name="M:Myshipping.Application.TaskManageService.LaraPaperCalc(System.String[])">
+            <summary>
+            提单纸页数计算
+            </summary>
+            <param name="PKIds">任务主键数组</param>
+            <returns>返回结果</returns>
+        </member>
     </members>
 </doc>

Myshipping.Application/Service/TaskManagePlat/Dtos/LaraPaperCalcInfo.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Myshipping.Application
+{
+    /// <summary>
+    /// 提单纸计算
+    /// </summary>
+    public class LaraPaperCalcInfo
+    {
+        /// <summary>
+        /// 顺序号
+        /// </summary>
+        public int Indx { get; set; }
+
+        /// <summary>
+        /// 主单号
+        /// </summary>
+        public string MBLNo { get; set; }
+
+        /// <summary>
+        /// DRAFT页数
+        /// </summary>
+        public int DraftNum { get; set; }
+
+        /// <summary>
+        /// 提单用纸数
+        /// </summary>
+        public int PaperNum { get; set; }
+    }
+}

Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs

@@ -70,5 +70,13 @@ namespace Myshipping.Application
         /// <returns>返回结果</returns>
         Task<TaskManageOrderResultDto> PendingTask(string[] PKIds);
 
+
+        /// <summary>
+        /// 提单纸页数计算
+        /// </summary>
+        /// <param name="PKIds">任务主键数组</param>
+        /// <returns>返回结果</returns>
+        Task<List<LaraPaperCalcInfo>> LaraPaperCalc(string[] PKIds);
+
     }
 }

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -1098,6 +1098,42 @@ namespace Myshipping.Application
             return result;
         }
         #endregion
+
+
+        /// <summary>
+        /// 提单纸页数计算
+        /// </summary>
+        /// <param name="PKIds">任务主键数组</param>
+        /// <returns>返回结果</returns>
+        public async Task<List<LaraPaperCalcInfo>> LaraPaperCalc(string[] PKIds)
+        {
+            List<LaraPaperCalcInfo> list = new List<LaraPaperCalcInfo>();
+
+            string batchNo = IDGen.NextID().ToString();
+
+            _logger.LogInformation("批次={no} ids={ids} 提单纸页数计算开始", batchNo, string.Join(",", PKIds));
+
+            try
+            {
+                //_taskBaseInfoRepository.AsQueryable().LeftJoin(_taskFileInfoRepository.AsQueryable(),)
+
+                //var taskList = _taskBaseInfoRepository.AsQueryable().Where(t => PKIds.Contains(t.PK_ID)).ToList();
+
+                //_logger.LogInformation("批次={no} 获取任务完成，Num={Num}", batchNo, taskList.Count);
+
+                //taskList.ForEach(async tsk => {
+
+                //    await InnerManualTask(batchNo, tsk, TaskOperTypeEnum.PENDING_TASK);
+                //});
+            }
+            catch (Exception ex)
+            {
+                throw Oops.Bah($"完成任务异常,{0}", ex.Message);
+            }
+
+            return list;
+
+        }
     }
 
 }