From d742209b3ff6c7f49e70c97dc12bc1c433abdb05 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing123>
Date: Fri, 6 Jan 2023 14:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A2=9E=E5=8A=A0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Myshipping.Application.xml                | 95 +++++++++++++++----
 .../Service/Para/ParaService.cs               | 10 ++
 2 files changed, 87 insertions(+), 18 deletions(-)

diff --git a/Myshipping.Application/Myshipping.Application.xml b/Myshipping.Application/Myshipping.Application.xml
index 67450e77..9cd8a635 100644
--- a/Myshipping.Application/Myshipping.Application.xml
+++ b/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>
             租户名称
@@ -8483,6 +8493,16 @@
             EDI扩展信息
             </summary>
         </member>
+        <member name="P:Myshipping.Application.BookingOrderDto.GOODSCODE">
+            <summary>
+            品名代码
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.BookingOrderDto.GOODSNAME">
+            <summary>
+            品名
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.BookingOrderInput">
             <summary>
             订舱主表输入参数
@@ -9967,32 +9987,32 @@
             </summary>
              <example>测试1</example>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.CreateTime">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.UpdateTime">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.UpdateTime">
             <summary>
             更新时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.CreateUserId">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.CreateUserId">
             <summary>
             创建者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.CreateUserName">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.CreateUserName">
             <summary>
             创建者名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.UpdateUserId">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.UpdateUserId">
             <summary>
             修改者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaContractNoDto.UpdateUserName">
+        <member name="P:Myshipping.Application.ParaContractNoShowDto.UpdateUserName">
             <summary>
             修改者名称
             </summary>
@@ -10012,32 +10032,32 @@
             品名分类名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.CreateTime">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.UpdateTime">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.UpdateTime">
             <summary>
             更新时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.CreateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.CreateUserId">
             <summary>
             创建者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.CreateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.CreateUserName">
             <summary>
             创建者名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.UpdateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.UpdateUserId">
             <summary>
             修改者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsCategoryDto.UpdateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsCategoryShowDto.UpdateUserName">
             <summary>
             修改者名称
             </summary>
@@ -10084,32 +10104,32 @@
             </summary>
             <example>红酒</example>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.CreateTime">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.CreateTime">
             <summary>
             创建时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.UpdateTime">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.UpdateTime">
             <summary>
             更新时间
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.CreateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.CreateUserId">
             <summary>
             创建者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.CreateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.CreateUserName">
             <summary>
             创建者名称
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.UpdateUserId">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.UpdateUserId">
             <summary>
             修改者Id
             </summary>
         </member>
-        <member name="P:Myshipping.Application.ParaGoodsDto.UpdateUserName">
+        <member name="P:Myshipping.Application.ParaGoodsShowDto.UpdateUserName">
             <summary>
             修改者名称
             </summary>
@@ -11806,6 +11826,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>
             我的任务查询
@@ -12728,6 +12773,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>
             任务管理
@@ -12823,5 +12875,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>
diff --git a/Myshipping.Application/Service/Para/ParaService.cs b/Myshipping.Application/Service/Para/ParaService.cs
index c0b3bf1a..331ca0cf 100644
--- a/Myshipping.Application/Service/Para/ParaService.cs
+++ b/Myshipping.Application/Service/Para/ParaService.cs
@@ -79,6 +79,9 @@ namespace Myshipping.Application
                 {
                     info = await _paraGoodsInfoRepository.AsQueryable().FirstAsync(t => t.Id == long.Parse(model.Id));
 
+                    if(info == null)
+                        throw Oops.Oh($"品名信息获取失败，请确认{model.Id}对应记录是否存在");
+
                     info.GOODS_CODE = model.GoodsCode;
                     info.GOODS_NAME_CN = model.GoodsNameCN;
                     info.GOODS_NAME_EN = model.GoodsNameEN;
@@ -330,6 +333,9 @@ namespace Myshipping.Application
                 {
                     info = await _paraGoodsCategoryInfoRepository.AsQueryable().FirstAsync(t => t.Id == long.Parse(model.Id));
 
+                    if (info == null)
+                        throw Oops.Oh($"品名分类获取失败，请确认{model.Id}对应记录是否存在");
+
                     //如果填写了品名分配需要确认根据库中数据一致
                     if (!info.GOODS_CATEGORY.Equals(model.GoodsCategory, StringComparison.OrdinalIgnoreCase))
                     {
@@ -596,6 +602,10 @@ namespace Myshipping.Application
                 {
                     info = await _paraContractNoInfoRepository.AsQueryable().FirstAsync(t => t.Id == long.Parse(model.Id));
 
+                    if (info == null)
+                        throw Oops.Oh($"约号获取失败，请确认{model.Id}对应记录是否存在");
+
+
                     info.CONTRACT_NO = model.ContractNo;
                     info.CONTRACT_NAME = model.ContractName;
                     info.CONTRACT_NAME = model.ContractName;