提交

pan

5 天以前 57e945d12bd6441ad8e01dcc68d0353635ec813e

提交

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs

@@ -139,7 +139,7 @@
                }

                List<string> lockLocationCodes = locationCaches.Select(x => x.LocationCode).ToList();
                

                //Dictionary<string, SqlSugar.OrderByType> orderBy = new Dictionary<string, OrderByType>()
                //{
                //    { nameof(Dt_LocationInfo.RoadwayNo),OrderByType.Asc },
@@ -164,10 +164,22 @@
                if (first != null)
                {
                    locationCaches.Add(new LocationCache { LocationCode = first?.LocationCode, DateTime = DateTime.Now });
                    Db.Updateable<Dt_LocationInfo>().SetColumns(x => new Dt_LocationInfo


                    using (var sugarClient = new SqlSugarClient(new ConnectionConfig
                    {
                        LocationStatus = (int)LocationStatusEnum.InStockLock,
                    }).Where(x => x.Id == first.Id).ExecuteCommand();
                        ConnectionString = DBContext.ConnectionString,
                        DbType = DBContext.DbType, 
                        IsAutoCloseConnection = true,  
                        InitKeyType = InitKeyType.Attribute 
                    }))
                    {
                        sugarClient.Updateable<Dt_LocationInfo>().SetColumns(x => new Dt_LocationInfo
                        {
                            LocationStatus = (int)LocationStatusEnum.InStockLock,
                        }).Where(x => x.Id == first.Id).ExecuteCommand();
                    }             
                   
                }

                return first;

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs

@@ -1,6 +1,7 @@
锘縰sing AutoMapper;
using SqlSugar;
using System.Dynamic;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Common.CommonEnum;
using WIDESEA_Common.OrderEnum;
@@ -770,6 +771,10 @@
        public override PageGridData<Dt_InboundOrder> GetPageData(PageDataOptions options)
        {
            string wheres = ValidatePageOptions(options);

            string pattern = @"inboundOrderNo like '[^']+'\s*and\s*";
            wheres = Regex.Replace(wheres, pattern, "", RegexOptions.IgnoreCase);

            //鑾峰彇鎺掑簭瀛楁
            Dictionary<string, SqlSugar.OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
            List<OrderByModel> orderByModels = new List<OrderByModel>();
@@ -789,7 +794,7 @@
            if (!string.IsNullOrEmpty(options.Wheres))
            {
                try
                {
                {                  
                    searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>();
                    if (searchParametersList.Count > 0)
                    {