ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js
@@ -383,8 +383,6 @@ searchBefore(param) { //çé¢æ¥è¯¢å,å¯ä»¥ç»param.wheresæ·»å æ¥è¯¢åæ° //è¿åfalseï¼åä¸ä¼æ§è¡æ¥è¯¢ return true; }, searchAfter(result) { ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/CodeChunks.db-shmBinary files differ
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.878.3237/SemanticSymbols.db-shmBinary files differ
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/ErpApiService.cs
@@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Net; using System.Reflection.Emit; using System.Text; using System.Threading.Tasks; @@ -355,11 +356,13 @@ json = JsonConvert.SerializeObject(request); } var content = new StringContent(json, Encoding.UTF8, "application/json"); var _client = _httpClientFactory.CreateClient("ERPUrl"); _client.DefaultRequestHeaders.Clear(); string timestamp = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); string base64Header = Convert.ToBase64String(Encoding.UTF8.GetBytes(timestamp)); _client.DefaultRequestHeaders.Add("X-Custom-Header", base64Header); ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs
@@ -705,7 +705,7 @@ }; orderByModels.Add(orderByModel); } ISugarQueryable<Dt_InboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_InboundOrder>(); int totalCount = 0; List<SearchParameters> searchParametersList = new List<SearchParameters>(); @@ -714,16 +714,68 @@ try { searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>(); if (searchParametersList.Count > 0) { SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.InboundOrderNo).FirstLetterToLower()); if (searchParameters != null) { sugarQueryable1 = sugarQueryable1.Where(x => x.InboundOrderNo.Contains(searchParameters.Value.ToString()) || x.UpperOrderNo.Contains(searchParameters.Value.ToString()) || x.Details.Any(d => d.Barcode == searchParameters.Value.ToString())); } searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.OrderType).FirstLetterToLower()); if (searchParameters != null) { sugarQueryable1 = sugarQueryable1.Where(x => x.OrderType.Equals(searchParameters.Value.ToString())); } //var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount); //return new PageGridData<Dt_InboundOrder>(totalCount, dataList); } options.Filter = searchParametersList; } catch { } } var data = BaseDal.Db.Queryable<Dt_InboundOrder>() var data = sugarQueryable1 .WhereIF(!wheres.IsNullOrEmpty(), wheres) .OrderBy(orderByModels).Includes(x=>x.Details) .Where(x => x.OrderType == 0) .OrderBy(orderByModels).Includes(x => x.Details) .ToPageList(options.Page, options.Rows, ref totalCount); return new PageGridData<Dt_InboundOrder>(totalCount, data); } //public override PageGridData<Dt_InboundOrder> GetPageData(PageDataOptions options) //{ // //var pageGridData = base.GetPageData(options); // ISugarQueryable<Dt_InboundOrder> sugarQueryable1 = BaseDal.Db.Queryable<Dt_InboundOrder>(); // if (!string.IsNullOrEmpty(options.Wheres)) // { // List<SearchParameters> searchParametersList = options.Wheres.DeserializeObject<List<SearchParameters>>(); // int totalCount = 0; // if (searchParametersList.Count > 0) // { // SearchParameters? searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.InboundOrderNo).FirstLetterToLower()); // if (searchParameters != null) // { // sugarQueryable1 = sugarQueryable1.Where(x => x.InboundOrderNo.Contains(searchParameters.Value.ToString()) // || x.UpperOrderNo.Contains(searchParameters.Value.ToString()) || // x.Details.Any(d => d.Barcode == searchParameters.Value.ToString())); // } // searchParameters = searchParametersList.FirstOrDefault(x => x.Name == nameof(Dt_InboundOrder.OrderType).FirstLetterToLower()); // if (searchParameters != null) // { // sugarQueryable1 = sugarQueryable1.Where(x => x.OrderType.Equals(searchParameters.Value.ToString())); // } // var dataList = sugarQueryable1.ToPageList(options.Page, options.Rows, ref totalCount); // return new PageGridData<Dt_InboundOrder>(totalCount, dataList); // } // } // return new PageGridData<Dt_InboundOrder>(); //} } } ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs
@@ -334,7 +334,7 @@ } var data = BaseDal.Db.Queryable<Dt_OutboundOrder>() .WhereIF(!wheres.IsNullOrEmpty(), wheres) .Where(x => x.OrderType == 0 || x.OrderType == 116) .Where(x => x.OrderType == 0) .OrderBy(orderByModels) .ToPageList(options.Page, options.Rows, ref totalCount);
@@ -93,21 +93,21 @@ erpApiService.GetMaterialUnitAsync(); var sss = await _invokeMESService.NewMaterielToMes(new WIDESEA_DTO.Basic.MaterielToMesDTO { reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), reqCode = Guid.NewGuid().ToString(), oldmaterialCode = "b001", newmaterialCode = "Bar01", unit = "A01", operationType = 1, supplyCode = "A0001", batchNo = "A0002", materialCode = "FC00001", warehouseCode = "", factoryArea = "A01", qty =20, }); //var sss = await _invokeMESService.NewMaterielToMes(new WIDESEA_DTO.Basic.MaterielToMesDTO //{ // reqTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"), // reqCode = Guid.NewGuid().ToString(), // oldmaterialCode = "b001", // newmaterialCode = "Bar01", // unit = "A01", // operationType = 1, // supplyCode = "A0001", // batchNo = "A0002", // materialCode = "FC00001", // warehouseCode = "", // factoryArea = "A01", // qty =20, //}); //await _eSSApiService.MoveContainerAsync(new WIDESEA_DTO.Basic.MoveContainerRequest //{ ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs
@@ -1,5 +1,3 @@ using System.Reflection; using System.Text; using Autofac; using Autofac.Core; using Autofac.Extensions.DependencyInjection; @@ -11,7 +9,12 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Newtonsoft.Json.Serialization; using Quartz; using Serilog; using System.Net.Security; using System.Reflection; using System.Runtime.ConstrainedExecution; using System.Text; using WIDESEA_Core; using WIDESEA_Core.Authorization; using WIDESEA_Core.BaseServices; @@ -22,7 +25,6 @@ //using WIDESEA_Core.HostedService; using WIDESEA_Core.Middlewares; using WIDESEA_WMSServer.Filter; using Quartz; using WIDESEA_WMSServer.Jobs; var builder = WebApplication.CreateBuilder(args); @@ -147,7 +149,7 @@ client.BaseAddress = new Uri(erpurl!); client.Timeout = TimeSpan.FromSeconds(30); }); }) ; builder.Services.AddQuartz(q => {
