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

Myshipping.Application/EDI/PILEdiHelper.cs

@@ -1875,7 +1875,9 @@ namespace Myshipping.Application.EDI.PIL
         {
             if (inttrEdi.filetype.Equals("B", StringComparison.OrdinalIgnoreCase))
             {
-                return inttrEdi.BSLIST.FirstOrDefault().VOYNO?.Trim() + " " + inttrEdi.BSLIST.FirstOrDefault().MBLNO?.Trim() + " IBOOKING";
+                //return inttrEdi.BSLIST.FirstOrDefault().VOYNO?.Trim() + " " + inttrEdi.BSLIST.FirstOrDefault().MBLNO?.Trim() + " IBOOKING";
+                //2023-05-31 查看东胜7的PIL EDI最后改成这个主题
+                return inttrEdi.BSLIST.FirstOrDefault().MBLNO?.Trim() + " " + "EDI";
             }
             else if (inttrEdi.filetype.Equals("E", StringComparison.OrdinalIgnoreCase))
             {

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -514,7 +514,7 @@ namespace Myshipping.Application
                 throw Oops.Bah(ms);
             }
 
-            JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME");
+            JsonUtil.PropToUpper(input, "ORDNO", "BSSTATUS", "YARDID", "YardContract", "YardContractTel", "YardContractEmail", "MARKS", "DESCRIPTION", "CONSIGNEENAME", "SHIPPERNAME", "NOTIFYPARTYNAME", "DZRemark", "CZRemark");
             if (input.ctnInputs != null)
             {
                 var groupList = input.ctnInputs.Where(x => x.CTNNUM > 0).GroupBy(c => c.CTNALL).Select(g => $"{g.Key}*{g.Sum(gg => gg.CTNNUM)}");

Myshipping.Application/Service/BookingOrder/Dto/PageBookingOrder.cs

@@ -918,5 +918,10 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         public string ATA { get; set; }
 
         #endregion
+
+        /// <summary>
+        /// 申请箱使
+        /// </summary>
+        public string ShenQingXiangShi { get; set; }
     }
 }