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

Myshipping.Application/Helper/YardDataHelper.cs

@@ -40,7 +40,7 @@ namespace Myshipping.Application.Helper
 
                 if (tenantUserName == null || tenantPwd == null)
                 {
-                    return new KeyValuePair<bool, string>(false, "未找到青岛港用户名、密码配置");
+                    return new KeyValuePair<bool, string>(false, "未找到青岛港用户名、密码配置,请通过租户参数配置");
                 }
 
                 qduname = tenantUserName.ItemCode;

Myshipping.Application/Service/TaskManagePlat/TaskManageTruckService.cs

@@ -699,7 +699,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="pkId">派车主键</param>
         /// <returns>返回回执</returns>
-        [HttpPost("/TaskManageTruck/SendDispatch")]
+        [HttpGet("/TaskManageTruck/SendDispatch")]
         public async Task<TaskManageOrderResultDto> SendDispatch(string pkId)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
@@ -799,7 +799,7 @@ namespace Myshipping.Application
         /// <param name="taskPkIds">Task任务主键组</param>
         /// <returns>返回回执</returns>
         [HttpPost("/TaskManageTruck/SendDispatchBatchByTask")]
-        public async Task<TaskManageOrderResultDto> SendDispatchBatchByTask(string[] taskPkIds)
+        public async Task<TaskManageOrderResultDto> SendDispatchBatchByTask([FromBody] string[] taskPkIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
@@ -832,7 +832,7 @@ namespace Myshipping.Application
 
                 List<string> msgList = new List<string>();
 
-                taskList.ForEach(async a => {
+                taskList.ForEach(a => {
                     var rlt = a.Result;
 
                     if (!rlt.succ)
@@ -1097,7 +1097,7 @@ namespace Myshipping.Application
         /// <param name="taskPkIds">Task任务主键组</param>
         /// <returns>返回回执</returns>
         [HttpPost("/TaskManageTruck/CancelDispatchBatchByTask")]
-        public async Task<TaskManageOrderResultDto> CancelDispatchBatchByTask(string[] taskPkIds)
+        public async Task<TaskManageOrderResultDto> CancelDispatchBatchByTask([FromBody] string[] taskPkIds)
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
@@ -1130,7 +1130,7 @@ namespace Myshipping.Application
 
                 List<string> msgList = new List<string>();
 
-                taskList.ForEach(async a => {
+                taskList.ForEach(a => {
                     var rlt = a.Result;
 
                     if (!rlt.succ)

Myshipping.Core/Entity/CommonDB/CodeIssueType.cs

@@ -62,7 +62,10 @@ namespace Myshipping.Core.Entity.CommonDB
         /// </summary>
         public string MapName { get; set; }
 
- 
+        /// <summary>
+        /// 映射代码
+        /// </summary>
+        public string MapCode { get; set; }
 
         /// <summary>
         /// 备注

Myshipping.Core/Myshipping.Core.xml

@@ -1102,6 +1102,11 @@
             映射名称
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Entity.CommonDB.MappingIssueType.MapCode">
+            <summary>
+            映射代码
+            </summary>
+        </member>
         <member name="P:Myshipping.Core.Entity.CommonDB.MappingIssueType.Remark">
             <summary>
             备注