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

Myshipping.Application/Service/BookingCustomerOrder/BookingCustomerOrderService.cs

@@ -2766,6 +2766,25 @@ namespace Myshipping.Application
                 return;
             }
 
+            //扣费时记录订舱编号
+            var bookingNO = "";
+            if (!string.IsNullOrEmpty(model.ExtendData))
+            {
+                var extObj = JObject.Parse(model.ExtendData);
+                if (model.CARRIERID == "COSCO")
+                {
+                    bookingNO = extObj.GetStringValue("CustNO");
+                }
+                else if (model.CARRIERID == "EMC")
+                {
+                    var custNOArr = extObj.GetJArrayValue("CustNO");
+                    if (custNOArr != null && custNOArr.Count > 0)
+                    {
+                        bookingNO = string.Join(",", custNOArr.Select(x => x.ToString()));
+                    }
+                }
+            }
+
             //扣费dto
             var seconds = DateTime.Now.ToTimeStamp();
             var runId = Guid.NewGuid().ToString();
@@ -2791,7 +2810,8 @@ namespace Myshipping.Application
                     VESSEL = model.VESSEL,
                     VOYNO = model.VOYNO,
                     ETD = model.ETD,
-                    CARRIER = model.CARRIER
+                    CARRIER = model.CARRIER,
+                    BEIZHU = bookingNO
                 }
             };
 

Myshipping.Application/Service/DataSync/DataSyncService.cs

@@ -42,6 +42,7 @@ using Furion.JsonSerialization;
 using Microsoft.AspNetCore.SignalR;
 using Furion.EventBus;
 using Myshipping.Core.Const;
+using NPOI.Util;
 
 namespace Myshipping.Application
 {
@@ -2504,6 +2505,7 @@ namespace Myshipping.Application
                             bookingStatus.StaTime = item.OpTime;
                             bookingStatus.StaCate = "book_sta_cate_billtrace";
                             await _repBookingStatus.InsertAsync(bookingStatus);
+                            sendDsList.Add(item.BookingId);
 
                         }
                     }
@@ -2806,8 +2808,10 @@ namespace Myshipping.Application
                 saveDto.ChangedFields = changeFileds;
             }
 
-            #region 处理操作、单证等人员ID
+            #region 处理操作、单证、客户、订舱代理等ID
             var sysUserList = await _repUser.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID).ToListAsync();
+            var customerList = await _djycustomer.AsQueryable().Filter(null, true).Where(x => x.IsDeleted == false && x.TenantId == UserManager.TENANT_ID).ToListAsync();
+            var carrList = await _cache.GetAllCodeCarrier();
 
             //销售
             if (!string.IsNullOrEmpty(saveDto.SALE))
@@ -2868,6 +2872,36 @@ namespace Myshipping.Application
                     saveDto.LineManageID = lineManageUser.Id.ToString();
                 }
             }
+
+            //委托单位
+            if (!string.IsNullOrEmpty(saveDto.CUSTOMERNAME))
+            {
+                var customer = customerList.FirstOrDefault(x => x.ShortName == saveDto.CUSTOMERNAME);
+                if (customer != null)
+                {
+                    saveDto.CUSTOMERID = customer.Id;
+                }
+            }
+
+            //订舱代理
+            if (!string.IsNullOrEmpty(saveDto.FORWARDER))
+            {
+                var forwarder = customerList.FirstOrDefault(x => x.ShortName == saveDto.FORWARDER);
+                if (forwarder != null)
+                {
+                    saveDto.FORWARDERID = forwarder.CodeName;
+                }
+            }
+
+            //船司
+            if (!string.IsNullOrEmpty(saveDto.CARRIER))
+            {
+                var carrier = carrList.FirstOrDefault(x => x.EnName == saveDto.CARRIER || x.CnName == saveDto.CARRIER);
+                if (carrier != null)
+                {
+                    saveDto.CARRIERID = carrier.Code;
+                }
+            }
             #endregion
 
             await _bookingorderservice.Save(saveDto);