修改

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

@@ -905,7 +905,7 @@ namespace DS.WMS.Core.Op.Method
             var mappingCarrierLetterYard = mappingCarrierAll.Where(x => x.Module == "LetterYardCarrier").ToList(); //针对和川这种公共库不同的船司代码，需要匹配
 
             var yardArr = yardCodeSetList.Select(x => x.Value).ToArray();
-            if (!yardArr.Contains(order.Yard))
+            if (!yardArr.Contains(yardCode))
             {
                 return DataResult.Failed("不支持的场站");
             }
@@ -1008,7 +1008,7 @@ namespace DS.WMS.Core.Op.Method
             {
                 hlcCode = mapCodeHLC.Code;
             }
-
+            //var carrCode = seaComService.GetClientCode(order.CarrierId, tenantDb);
             #region 港联捷场站
 
             if (yardCode == yardCodeGLJ.Value)
@@ -1020,13 +1020,13 @@ namespace DS.WMS.Core.Op.Method
                 }
 
                 //通过EDI发送下货纸的船司
-                if (gljEdiCarrierSetList.Select(x => x.Value).ToList().Contains(order.Carrier))
+                if (gljEdiCarrierSetList.Select(x => x.Value).ToList().Contains(carrierCode))
                 {
                     //租户参数-港联捷下货纸代号
                     var paraXHZ = db.Queryable<SysConfig>().Where(v => v.Status == StatusEnum.Enable && v.TenantId == long.Parse(user.TenantId) && v.Code == "CODE_GLJ_XHZ").First();
                     if (paraXHZ == null || string.IsNullOrEmpty(paraXHZ.Value))
                     {
-                        return DataResult.Failed($"港联捷场站 下货纸代号未找到或配置有误");
+                        return DataResult.Failed($"港联捷场站 下货纸代号[CODE_GLJ_XHZ]未找到或配置有误");
                     }
 
                     var ediFileName = $"{paraXHZ.Value}_{order.MBLNO}_{DateTime.Now.Ticks}.txt";
@@ -1650,7 +1650,7 @@ namespace DS.WMS.Core.Op.Method
                     //tenantParam.FirstOrDefault(p => p.TenantId == order.TenantId && p.ParaCode == "CODE_GLX_XHZ");
                     if (paraXHZ == null || string.IsNullOrEmpty(paraXHZ.Value))
                     {
-                        return DataResult.Failed($"下货纸代号未找到或配置有误");
+                        return DataResult.Failed($"下货纸代号[CODE_GLX_XHZ]未找到或配置有误");
                     }
 
                     var ediFileName = $"{paraXHZ.Value}_{order.MBLNO}_{DateTime.Now.Ticks}.txt";