fix(任务服务): 修复出库任务选择逻辑和货位分配问题

wanshenmean

3 天以前 4b483d9d06bead231b88ca212fd799196668a057

 Code/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/ApiLogMiddleware.cs

@@ -1,14 +1,8 @@
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Core.Helper;
using WIDESEA_Core.LogHelper;

@@ -20,7 +14,7 @@
    public class ApiLogMiddleware
    {
        /// <summary>
        /// 
        ///
        /// </summary>
        private readonly RequestDelegate _next;

@@ -51,7 +45,7 @@
                var json = new WebResponseContent();

                json.Message = HttpStatusCode.InternalServerError.ToString();//错误信息
                json.Code = 500;//500异常 
                json.Code = 500;//500异常

                StreamWriter streamWriter = new StreamWriter(context.Response.Body);
                await streamWriter.WriteAsync(json.Serialize());
@@ -74,7 +68,7 @@
                    try
                    {
                        // 存储请求数据
                        requestParam = RequestDataLog(context);
                        requestParam = await RequestDataLogAsync(context);
                        context.Request.Body.Position = 0;
                    }
                    catch { }
@@ -86,7 +80,7 @@
                    try
                    {
                        // 存储响应数据
                        responseParam = ResponseDataLog(context.Response);
                        responseParam = await ResponseDataLogAsync(context.Response);
                    }
                    catch { }

@@ -101,7 +95,6 @@
                catch (Exception ex)
                {
                    // 记录异常

                }
                finally
                {
@@ -114,20 +107,23 @@
            }
        }

        private string RequestDataLog(HttpContext context)
        private async Task<string> RequestDataLogAsync(HttpContext context)
        {
            var request = context.Request;
            //request.EnableBuffering();
            //request.Body.Position = 0;

            var sr = new StreamReader(request.Body);
            var sr = new StreamReader(request.Body, Encoding.UTF8);

            object obj;
            string bodyData = sr.ReadToEndAsync().Result;
            string bodyData = await sr.ReadToEndAsync();
            if (request.ContentLength <= 100000)
            {
                obj = new
                {
                    QueryString = request.QueryString.ToString(),
                    BodyData = bodyData
                    BodyData = JsonConvert.DeserializeObject(bodyData)
                    //BodyData = bodyData
                };
            }
            else
@@ -145,17 +141,17 @@
            return data; ;
        }

        private string ResponseDataLog(HttpResponse response)
        private async Task<string> ResponseDataLogAsync(HttpResponse response)
        {
            if (response.ContentLength <= 100000)
            {
                response.Body.Position = 0;
                using StreamReader stream = new StreamReader(response.Body, leaveOpen: true);
                string body = stream.ReadToEnd();
                using StreamReader stream = new StreamReader(response.Body, Encoding.UTF8, leaveOpen: true);
                string body = await stream.ReadToEndAsync();
                response.Body.Position = 0;
                return body;
            }
            return "";
        }
    }
}
}