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

Myshipping.Application/EDI/BookingHelper/ONESoApiHelper.cs

@@ -202,7 +202,7 @@ namespace Myshipping.Application.EDI
                         _ => throw Oops.Oh("暂不支持的货物类型")
                     },
                     boxSize = mapCtn.MapCode,
-                    quantity = ctn.KGS.Value,
+                    quantity = ctn.CTNNUM.Value,
                 };
                 postModel.boxInfos.Add(apiBox);
             }

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -5506,8 +5506,7 @@ namespace Myshipping.Application
                         ChuanMing = order.VESSEL,
                         HangCi = order.VOYNO,
                         BeiZhu = order.CZRemark,
-                        ZhuangHuoGang = order.PORTLOAD,
+
-                        ZhuangHuoGangDaiMa = order.PORTLOADID,
                         YARD = mappingYard,
                         ORDERNO = order.CUSTNO,
                         VGMCLOSETIME = order.CLOSEVGMDATE,
@@ -5527,6 +5526,22 @@ namespace Myshipping.Application
                             SendFlag = true
                         }).ToList()
                     };
+                    string[] supportPortPassageArr = null;
+                    var vgmSupportPortPassages = sysconfig.FirstOrDefault(x => x.GroupCode == "DJY_CONST" && x.Code == "VgmSupportPortPassages");
+                    if (!string.IsNullOrEmpty(vgmSupportPortPassages?.Value))
+                    {
+                        supportPortPassageArr = vgmSupportPortPassages.Value.Split(',');
+                    }
+                    if (supportPortPassageArr != null && supportPortPassageArr.Length > 0 && supportPortPassageArr.Contains(order.PORTLOADID))
+                    {
+                        sendObj.ZhuangHuoGang = order.PORTLOAD;
+                        sendObj.ZhuangHuoGangDaiMa = order.PORTLOADID;
+                    }
+                    else
+                    {
+                        sendObj.ZhuangHuoGang = "OTHER";
+                        sendObj.ZhuangHuoGangDaiMa = "OTHER";
+                    }
 
                     _logger.LogInformation($"调用VGM平台的发送接口：{urlConfig.Value}，参数：{JsonConvert.SerializeObject(sendObj)}");
 
@@ -10908,7 +10923,7 @@ namespace Myshipping.Application
         /// <param name="syncTypeEnum"></param>
         /// <returns></returns>
         [NonAction]
-        public async Task<dynamic> SendBookingOrder(long[] ids, BookingOrderSyncTypeEnum? syncTypeEnum = null,string oddCode = "")
+        public async Task<dynamic> SendBookingOrder(long[] ids, BookingOrderSyncTypeEnum? syncTypeEnum = null, string oddCode = "")
         {
             if (App.Configuration["RunType"] is CommonConst.RUN_TYPE_DJY)
             {
@@ -11039,7 +11054,7 @@ namespace Myshipping.Application
                             {
                                 List<BookingOrder> allOrderList = new List<BookingOrder>();
 
-                                if(!string.IsNullOrWhiteSpace(oddCode) &&  oddCode.Equals("SIReceipt",StringComparison.OrdinalIgnoreCase))
+                                if (!string.IsNullOrWhiteSpace(oddCode) && oddCode.Equals("SIReceipt", StringComparison.OrdinalIgnoreCase))
                                 {
                                     allOrderList = await _rep.AsQueryable().Filter(null, true).Where(x => x.Id == item.Id
                                     && x.TenantId == UserManager.TENANT_ID && x.IsDeleted == false).ToListAsync();