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

Myshipping.Application/Myshipping.Application.xml

@@ -8226,6 +8226,26 @@
             返回校验明细
             </summary>
         </member>
+        <member name="P:Myshipping.Application.RemoteRulesEngineExcuteResultDto.IsSuccess">
+            <summary>
+            是否成功 true-成功 false-失败
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.RemoteRulesEngineExcuteResultDto.RequestId">
+            <summary>
+            请求报文HEAD的GID
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.RemoteRulesEngineExcuteResultDto.ExcuteDate">
+            <summary>
+            执行时间 格式（yyyy-MM-dd HH:mm:ss）
+            </summary>
+        </member>
+        <member name="P:Myshipping.Application.RemoteRulesEngineExcuteResultDto.DetailList">
+            <summary>
+            规则详情
+            </summary>
+        </member>
         <member name="T:Myshipping.Application.RulesEngineWebAPIHeadBase">
             <summary>
             规则平台请求报文头（HEAD）

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -1835,6 +1835,7 @@ namespace Myshipping.Application
         }
         #endregion
 
+        #region 上传FTP
         /// <summary>
         /// 上传FTP
         /// </summary>
@@ -1889,8 +1890,9 @@ namespace Myshipping.Application
 
             return true;
         }
+        #endregion
 
-
+        #region 触发订舱
         /// <summary>
         /// 触发订舱
         /// </summary>
@@ -2017,7 +2019,9 @@ namespace Myshipping.Application
 
             return result;
         }
+        #endregion
 
+        #region 检查订舱、截单EDI订单信息
         /// <summary>
         /// 检查订舱、截单EDI订单信息
         /// </summary>
@@ -2034,7 +2038,9 @@ namespace Myshipping.Application
             if (string.IsNullOrWhiteSpace(order.KINDPKGS))
                 throw Oops.Bah("包装种类未填写");
         }
+        #endregion
 
+        #region 根据船公司ID获取EDI的路由枚举
         /// <summary>
         /// 根据船公司ID获取EDI的路由枚举
         /// </summary>
@@ -2073,6 +2079,7 @@ namespace Myshipping.Application
 
             return routeEnum;
         }
+        #endregion
 
         #region 其他
         /// <summary>

Myshipping.Application/Service/RulesEngine/Dtos/RulesEngineExcuteResultDto.cs

@@ -31,4 +31,28 @@ namespace Myshipping.Application
         /// </summary>
         public List<RulesEngineExcuteResultDetailDto> rows { get; set; }
     }
+
+    public class RemoteRulesEngineExcuteResultDto
+    {
+        /// <summary>
+        /// 是否成功 true-成功 false-失败
+        /// </summary>
+
+        public bool IsSuccess { get; set; }
+
+        /// <summary>
+        /// 请求报文HEAD的GID
+        /// </summary>
+        public string RequestId { get; set; }
+
+        /// <summary>
+        /// 执行时间 格式（yyyy-MM-dd HH:mm:ss）
+        /// </summary>
+        public string ExcuteDate { get; set; }
+
+        /// <summary>
+        /// 规则详情
+        /// </summary>
+        public List<RulesEngineExcuteResultDetailDto> DetailList { get; set; }
+    }
 }

Myshipping.Application/Service/RulesEngine/RulesEngineClientService.cs

@@ -17,6 +17,8 @@ using Myshipping.Application.Entity;
 using Myshipping.Core;
 using Furion.DistributedIDGenerator;
 using Mapster;
+using Furion.DataValidation;
+using Newtonsoft.Json.Linq;
 
 namespace Myshipping.Application
 {
@@ -42,7 +44,7 @@ namespace Myshipping.Application
             _bookingOrderContaCargoRepository = bookingOrderContaCargoRepository;
         }
 
-
+        #region 海运订舱请求规则引擎校验
         /// <summary>
         /// 海运订舱请求规则引擎校验
         /// </summary>
@@ -58,7 +60,9 @@ namespace Myshipping.Application
             if (ruleResult == null)
                 throw Oops.Oh($"订舱请求规则失败，返回为空");
 
-            var ruleDetailList = ruleResult.rows as List<RulesEngineExcuteResultDetailDto>;
+            var innerRlt = JSON.Deserialize<RemoteRulesEngineExcuteResultDto>(ruleResult.extra.ToString());
+
+            var ruleDetailList = innerRlt.DetailList;
 
             result.succ = ruleResult.succ;
             result.msg = ruleResult.msg;
@@ -70,8 +74,9 @@ namespace Myshipping.Application
 
             return result;
         }
+        #endregion
 
-
+        #region 海运订舱请求规则引擎校验
         /// <summary>
         /// 海运订舱请求规则引擎校验
         /// </summary>
@@ -128,8 +133,10 @@ namespace Myshipping.Application
                 {
                     msgModel.Main.BusinessInfo.ContaList = contaList.Adapt<List<RulesEngineOrderBookingContaInfo>>();
 
+                    var ctnArg = contaList.Select(t => t.Id).ToArray();
+
                    var cargoList = await _bookingOrderContaCargoRepository.AsQueryable()
-                        .Where(x=> contaList.Any(a=>a.Id == x.CTNID)).ToListAsync();
+                        .Where(x=> ctnArg.Contains(x.CTNID.Value)).ToListAsync();
 
                     if(cargoList.Count > 0)
                     {
@@ -160,12 +167,14 @@ namespace Myshipping.Application
                 if(ruleResult == null)
                     throw Oops.Oh($"订舱主键{bookingId}请求规则失败，返回为空");
 
-                var ruleDetailList = ruleResult.rows as List<RulesEngineExcuteResultDetailDto>;
+                var innerRlt = JSON.Deserialize<RemoteRulesEngineExcuteResultDto>(ruleResult.extra.ToString());
+
+                var ruleDetailList = innerRlt.DetailList;
 
                 result.succ = ruleResult.succ;
                 result.msg = ruleResult.msg;
 
-                if (ruleDetailList.Count > 0)
+                if (ruleDetailList != null && ruleDetailList.Count > 0)
                 {
                     result.rows = ruleDetailList;
                 }
@@ -178,8 +187,9 @@ namespace Myshipping.Application
 
             return result;
         }
+        #endregion
 
-
+        #region 海运订舱请求规则引擎校验
         /// <summary>
         /// 海运订舱请求规则引擎校验
         /// </summary>
@@ -272,7 +282,9 @@ namespace Myshipping.Application
                 if (ruleResult == null)
                     throw Oops.Oh($"订舱主键{model.BOOKINGNO}请求规则失败，返回为空");
 
-                var ruleDetailList = ruleResult.rows as List<RulesEngineExcuteResultDetailDto>;
+                var innerRlt = JSON.Deserialize<RemoteRulesEngineExcuteResultDto>(ruleResult.extra.ToString());
+
+                var ruleDetailList = innerRlt.DetailList;
 
                 result.succ = ruleResult.succ;
                 result.msg = ruleResult.msg;
@@ -290,7 +302,9 @@ namespace Myshipping.Application
 
             return result;
         }
+        #endregion
 
+        #region 请求规则平台
         /// <summary>
         /// 请求规则平台
         /// </summary>
@@ -331,5 +345,6 @@ namespace Myshipping.Application
 
             return model;
         }
+        #endregion
     }
 }

Myshipping.Web.Core/applicationconfig.json

@@ -106,7 +106,7 @@
       "contentType": [ "image/jpg", "image/png", "image/jpeg", "image/gif", "image/bmp", "text/plain", "application/pdf", "application/msword", "application/vnd.ms-excel", "application/vnd.openxmlformats-officedocument.presentationml.presentation" ]
     }
   },
-  "RulesEngineUrl": "http://192.168.0.181:8088/api/RulesEngineManage/ExcuteWorkFlow",
+  "RulesEngineUrl": "http://60.209.125.238:35210/api/RulesEngineManage/ExcuteWorkFlow",
   "RulesEngineAuthKey": "clova3dXNnBldkM4bzVyUkxNcjVIS0lhUTNja2xmRVI4SDZDMkIzRURBMitKamJPb0tIRkMxemF5VlZOQ0wxUDdNeGNuTzF1NnEyOS9FS1VpeDBDZWFya0VucFR4ZE1Ca1JaUXZVb3lhdGs9",
   "RulesEngineSender": "NewOceanBooking",
   "RulesEngineSenderName": "新海运订舱平台",