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

ds-wms-service/DS.WMS.Core/TaskPlat/Method/Draft/TaskDraftCompareService.cs

@@ -674,19 +674,19 @@ namespace DS.WMS.Core.TaskPlat.Method
                 //    .SetContentEncoding(Encoding.UTF8)
                 //.PostAsync();
 
-                //var jsonBody = JsonConvert.SerializeObject(info);
-                //var res = RequestHelper.Post(jsonBody, shippingOrderCompareUrl);
+                var jsonBody = JsonConvert.SerializeObject(info);
+                var res = RequestHelper.Post(jsonBody, draftResultUrl);
 
-                //Logger.Log(NLog.LogLevel.Info, "批次={no} 对应请求报文完成 res={res}", info.Head.GID, JSON.Serialize(res));
+                Logger.Log(NLog.LogLevel.Info, "批次={no} 对应请求报文完成 res={res}", info.Head.GID, res);
 
-                //if (res.StatusCode == System.Net.HttpStatusCode.OK)
-                //{
-                //    var userResult = await res.Content.ReadAsStringAsync();
+                if (!string.IsNullOrWhiteSpace(res))
+                {
+                    //var userResult = await res.Content.ReadAsStringAsync();
 
-                //    _logger.LogInformation("对应请求报文 userResult={userResult}", userResult);
+                    //_logger.LogInformation("对应请求报文 userResult={userResult}", userResult);
 
-                //    model = JSON.Deserialize<TaskManageExcuteResultDto>(userResult);
-                //}
+                    model = JsonConvert.DeserializeObject<TaskManageExcuteResultDto>(res);
+                }
             }
             catch (Exception ex)
             {