修改EDI的签单方式校验

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -4312,6 +4312,8 @@ namespace Myshipping.Application
                 }
             }
 
+            if (!string.IsNullOrWhiteSpace(order.SERVICE))
+            {
                 //运输条款EDI
                 var baseServiceList = _cache.GetAllCodeService().GetAwaiter().GetResult();
 
@@ -4327,8 +4329,6 @@ namespace Myshipping.Application
                 && !string.IsNullOrWhiteSpace(t.CarrierCode) && t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)
                 ).ToList();
 
-            if (!string.IsNullOrWhiteSpace(order.SERVICE))
-            {
                 var currServiceInfo = ediServiceList.FirstOrDefault(t => t.Code.Equals(baseServiceInfo.Code, StringComparison.OrdinalIgnoreCase));
 
                 if (currServiceInfo == null)
@@ -4337,6 +4337,9 @@ namespace Myshipping.Application
                 primaryModel.SERVICEEDICODE = currServiceInfo.MapCode?.Trim();
             }
 
+
+            if (!string.IsNullOrWhiteSpace(order.ISSUETYPE))
+            {
                 //签单方式EDI
                 var baseIssueTypeList = _cache.GetAllCodeIssueType().GetAwaiter().GetResult();
 
@@ -4351,8 +4354,6 @@ namespace Myshipping.Application
                 .Where(t => t.Module.Equals(CONST_MAPPING_MODULE, StringComparison.OrdinalIgnoreCase)
                 ).ToList();
 
-            if (!string.IsNullOrWhiteSpace(order.ISSUETYPE))
-            {
                 var currIssueTypeInfo = ediIssueTypeList.FirstOrDefault(t => !string.IsNullOrWhiteSpace(t.CarrierCode)
                 && t.CarrierCode.Equals(order.CARRIERID, StringComparison.OrdinalIgnoreCase)
                 && t.Code.Equals(baseIssueTypeInfo.Code, StringComparison.OrdinalIgnoreCase));