diff --git a/Myshipping.Application/Entity/BookingOrder.cs b/Myshipping.Application/Entity/BookingOrder.cs
index 09b07616..f3644a52 100644
--- a/Myshipping.Application/Entity/BookingOrder.cs
+++ b/Myshipping.Application/Entity/BookingOrder.cs
@@ -743,6 +743,18 @@ namespace Myshipping.Application.Entity
///
[Description("付款方")]
public string FREIGHTPAYER { get; set; }
+
+ ///
+ /// 品名代码
+ ///
+ [Description("品名代码")]
+ public string GOODSCODE { get; set; }
+
+ ///
+ /// 品名
+ ///
+ [Description("品名")]
+ public string GOODSNAME { get; set; }
///
/// 租户名称
///
diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index ceaea011..3758c834 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/Myshipping.Application/Myshipping.Application.xml
@@ -3327,6 +3327,16 @@
付款方
+
+
+ 品名代码
+
+
+
+
+ 品名
+
+
租户名称
@@ -9783,6 +9793,11 @@
分类名称
+
+
+ 类型：FastReport、Excel模板等
+
+
订舱模板服务
@@ -11801,6 +11816,31 @@
+
+
+ 提单纸计算
+
+
+
+
+ 顺序号
+
+
+
+
+ 主单号
+
+
+
+
+ DRAFT页数
+
+
+
+
+ 提单用纸数
+
+
我的任务查询
@@ -12723,6 +12763,13 @@
任务主键数组
返回结果
+
+
+ 提单纸页数计算
+
+ 任务主键数组
+ 返回结果
+
任务管理
@@ -12818,5 +12865,12 @@
任务主键数组
返回结果
+
+
+ 提单纸页数计算
+
+ 任务主键数组
+ 返回结果
+
diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/LaraPaperCalcInfo.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/LaraPaperCalcInfo.cs
new file mode 100644
index 00000000..9a70087b
--- /dev/null
+++ b/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
+{
+ ///
+ /// 提单纸计算
+ ///
+ public class LaraPaperCalcInfo
+ {
+ ///
+ /// 顺序号
+ ///
+ public int Indx { get; set; }
+
+ ///
+ /// 主单号
+ ///
+ public string MBLNo { get; set; }
+
+ ///
+ /// DRAFT页数
+ ///
+ public int DraftNum { get; set; }
+
+ ///
+ /// 提单用纸数
+ ///
+ public int PaperNum { get; set; }
+ }
+}
diff --git a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs
index feb5d743..66aa4739 100644
--- a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs
@@ -70,5 +70,13 @@ namespace Myshipping.Application
/// 返回结果
Task PendingTask(string[] PKIds);
+
+ ///
+ /// 提单纸页数计算
+ ///
+ /// 任务主键数组
+ /// 返回结果
+ Task> LaraPaperCalc(string[] PKIds);
+
}
}
diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
index 747089bd..feaf9761 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
@@ -1098,6 +1098,42 @@ namespace Myshipping.Application
return result;
}
#endregion
+
+
+ ///
+ /// 提单纸页数计算
+ ///
+ /// 任务主键数组
+ /// 返回结果
+ public async Task> LaraPaperCalc(string[] PKIds)
+ {
+ List list = new List();
+
+ 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;
+
+ }
}
}