Merge branch 'dev' of http://60.209.125.238:20010/chenjingyong/ds8-solution-pro into dev

ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportReq.cs

@@ -22,7 +22,7 @@ public class SeaExportReq
     /// <summary>
     /// 订单业务联系人
     /// </summary>
-    public List<BusinessOrderContactReq> OrderContacts { get; set; }
+    public List<BusinessOrderContactReq> OrderContactList { get; set; }
     /// <summary>
     /// <summary>
     /// 箱型报价信息

ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs

@@ -411,12 +411,12 @@ public partial class SeaExportService : ISeaExportService
 
                 //处理订单联系人信息 2024-11-18 联系人信息改为可以直接修改，不用弹出窗体
                 //DealBusinessOrderContact(info, tenantDb);
-                if (req.OrderContacts.IsNotNull() && req.OrderContacts.Count > 0)
+                if (req.OrderContactList.IsNotNull() && req.OrderContactList.Count > 0)
                 {
                     var contacts = await tenantDb.Queryable<BusinessOrderContact>().Where(x => x.BusinessId == req.Id).ToListAsync();
 
                     var existContacts = contacts.Select(x => x.Id);
-                    var reqContacts = req.OrderContacts.Where(x => x.Id != 0).Select(x => x.Id);
+                    var reqContacts = req.OrderContactList.Where(x => x.Id != 0).Select(x => x.Id);
                     //删除
                     IEnumerable<long> delContacts = existContacts.AsQueryable().Except(reqContacts);
                     if (delContacts.Count() > 0)
@@ -426,7 +426,7 @@ public partial class SeaExportService : ISeaExportService
                              .ExecuteCommandAsync();
                     }
 
-                    foreach (var item in req.OrderContacts)
+                    foreach (var item in req.OrderContactList)
                     {
                         if (item.Id == 0)
                         {
@@ -758,9 +758,9 @@ public partial class SeaExportService : ISeaExportService
              
             //处理订单联系人信息 2024-11-18 联系人信息改为可以直接修改，不用弹出窗体
             //DealBusinessOrderContact(info, tenantDb);
-            if (req.OrderContacts.IsNotNull() && req.OrderContacts.Count > 0)
+            if (req.OrderContactList.IsNotNull() && req.OrderContactList.Count > 0)
             { 
-                foreach (var item in req.OrderContacts)
+                foreach (var item in req.OrderContactList)
                 { 
                     var contact = item.Adapt<BusinessOrderContact>();
                     contact.BusinessId = entity.Id;