Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/EDI/ESLEdiHelper.cs

@@ -744,7 +744,10 @@ namespace Myshipping.Application.EDI.ESL
                     + ":" + bill.CONTRACTNO//14	QUOTATION NO.	运费协议号	X(30)	MAERSK为必选	C
                     + ":"//15	CHARGE TYPE	费率本代码	X(1)	　	C
                     + ":" + bill.SERVICECONTRACTNO//16	S/C NO.	合约号	X(30)	　	C
+                    /* 2023-04-10 经过测试发现会吧这个订舱编号写到备注里，这里选择去掉填写订舱编号
                     + ":" + bill.ORDERNO//17	BOOKING NO.	船公司订舱编号	X(20)	船公司系统内部订舱编号	C
+                    */
+                    + ":"//17	BOOKING NO.	船公司订舱编号	X(20)	船公司系统内部订舱编号	C
                         + ":"//18	SLOT CHARTER ID	舱位互用标识	X(1)	　	C
                         + ":" + bill.EDIATTNEMAIL//21	AMS CODE	AMS代码	X(15)	　	C
                         + ":" + bill.EDIATTN//22	AMS CODE	AMS代码	X(15)	　	C

Myshipping.Application/Entity/BookingEDIExt.cs

@@ -15,7 +15,7 @@ namespace Myshipping.Application.Entity
         /// 订舱ID
         /// </summary>
  
-        public long? BookingId { get; set; }
+        public long BookingId { get; set; }
 
         /// <summary>
         /// 委托方

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -4694,6 +4694,24 @@ namespace Myshipping.Application
                 throw Oops.Bah("集装箱包装和订舱包装不一致，请修改");
             }
 
+            //增加件、重、尺比对
+            if (ctnList != null && ctnList.Count > 0)
+            {
+                if (ctnList.Sum(a => a.PKGS.HasValue ? a.PKGS.Value : 0) != (order.PKGS.HasValue ? order.PKGS.Value : 0))
+                {
+                    throw Oops.Bah("集装箱件数合计和订舱件数不一致，请修改");
+                }
+
+                if (ctnList.Sum(a => a.KGS.HasValue ? a.KGS.Value : 0) != (order.KGS.HasValue ? order.KGS.Value : 0))
+                {
+                    throw Oops.Bah("集装箱重量合计和订舱重量不一致，请修改");
+                }
+
+                if (ctnList.Sum(a => a.CBM.HasValue ? a.CBM.Value : 0) != (order.CBM.HasValue ? order.CBM.Value : 0))
+                {
+                    throw Oops.Bah("集装箱尺码合计和订舱尺码不一致，请修改");
+                }
+            }
         }
         #endregion