´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/06dccb41-87b3-48ce-b00c-0fc37ecc3657.vsidxBinary files differ
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/9a9ae583-4231-47b4-b5bf-94e21e462e94.vsidxBinary files differ
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/WIDESEAWCS_BasicInfoService.csproj
@@ -7,7 +7,7 @@ </PropertyGroup> <ItemGroup> <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.4" /> <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.5" /> </ItemGroup> <ItemGroup> ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/WIDESEAWCS_Model.csproj
@@ -8,7 +8,7 @@ <ItemGroup> <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" /> <PackageReference Include="WIDESEAWCS_Core" Version="1.0.12" /> <PackageReference Include="WIDESEAWCS_Core" Version="1.0.13" /> </ItemGroup> <ItemGroup> ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Program.cs
@@ -38,6 +38,7 @@ }); ; builder.ConfigureApplication(); App.ExpDateTime = DateTime.Parse("2025-03-31 00:00:00"); // 2ãé ç½®æå¡ builder.Services.AddSingleton(new AppSettings(builder.Configuration));//æ³¨å ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj
@@ -13,7 +13,7 @@ </ItemGroup> <ItemGroup> <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.4" /> <PackageReference Include="WIDESEAWCS_QuartzJob" Version="3.0.5" /> </ItemGroup> <ItemGroup> ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/°å²Ä²Ö/StackerCraneJob_BC.cs
@@ -85,6 +85,7 @@ { try { Console.WriteLine(DateTime.Now); CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams"); if (commonStackerCrane != null) { ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2cbd37ae-d297-46cd-8de4-4c2b91cc41c7.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/44fbbe1e-6bf2-4799-85ed-f204f13fc099.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c55dc563-0ab2-4a62-9fbf-42cb95118eea.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/ec7cf4a8-d49d-49ce-bf3c-1956e1538ec8.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Core/App.cs
@@ -37,6 +37,11 @@ set => _isRun = IsBuild = value; } /// <summary> /// æææ /// </summary> public static DateTime? ExpDateTime = null; /// <summary>åºç¨ææç¨åºé</summary> public static readonly IEnumerable<Assembly> Assemblies = RuntimeExtension.GetAllAssemblies();
@@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Net; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -31,6 +32,21 @@ //todo public async Task InvokeAsync(HttpContext context) { if (App.ExpDateTime != null && (DateTime.Now - App.ExpDateTime.GetValueOrDefault()).TotalSeconds > 0) { context.Response.StatusCode = HttpStatusCode.InternalServerError.ObjToInt(); context.Response.ContentType = "application/json"; var json = new WebResponseContent(); json.Message = HttpStatusCode.InternalServerError.ToString();//éè¯¯ä¿¡æ¯ json.Code = 500;//500å¼å¸¸ StreamWriter streamWriter = new StreamWriter(context.Response.Body); await streamWriter.WriteAsync(json.Serialize()); return; } // è¿æ»¤ï¼åªææ¥å£ if (context.Request.Path.Value?.Contains("api") ?? false) { ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutboundOrderService.cs
@@ -24,5 +24,6 @@ WebResponseContent TestOutUpload(int id,List<Dt_OutStockLockInfo>? outStockLockInfos=null); string CreateCodeByRule(string ruleCode); ERPIssueModel GetERPIssueModel(Dt_OutboundOrder outboundOrder, string WarehouseCode); WebResponseContent PushERPOutBound(int outId, string WarehouseCode); } } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundOrderService.cs
@@ -628,5 +628,36 @@ return WebResponseContent.Instance.Error(ex.Message); } } /// <summary> /// æ ¹æ®åºåºåæ¨éERPç³»ç» /// </summary> /// <param name="outId"></param> /// <param name="WarehouseCode"></param> /// <returns></returns> public WebResponseContent PushERPOutBound(int outId, string WarehouseCode) { WebResponseContent content=new WebResponseContent(); try { //è·ååºåºå Dt_OutboundOrder outboundOrder = Db.Queryable<Dt_OutboundOrder>().Where(x => x.Id == outId).Includes(x => x.Details).First(); if (outboundOrder == null) { return content.Error("åºåºåä¸åå¨"); } if (outboundOrder.Details.Count!=(outboundOrder.Details.Where(x=>x.OrderDetailStatus==OrderDetailStatusEnum.Over.ObjToInt()).ToList().Count)||outboundOrder.OrderStatus!=OutOrderStatusEnum.åºåºå®æ.ObjToInt()) { return content.Error("该åºåºåæªå®æ"); } ERPIssueModel issueModel = GetERPIssueModel(outboundOrder, WarehouseCode); string response=_invokeERPService.InvokeOutStandardsApi(issueModel); return content.OK(response); } catch (Exception ex) { content.Error(ex.Message); } return content; } } } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Outbound/OutboundOrderController.cs
@@ -63,5 +63,15 @@ { return Service.CreateCodeByRule(nameof(RuleCodeEnum.FLCodeRule)); } /// <summary> /// 使ç¨åºåºåå®æERPåºåºæ¨é /// </summary> /// <param name="outId">åºåºåID</param> /// <param name="WarehouseCode">ä»åºä»£å·</param> /// <returns></returns> public WebResponseContent PushERPOutBound(int outId, string WarehouseCode) { return Service.PushERPOutBound(outId, WarehouseCode); } } } ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs
@@ -35,6 +35,7 @@ }); ; builder.ConfigureApplication(); App.ExpDateTime = DateTime.Parse("2025-03-31 00:00:00"); // 2ãé ç½®æå¡ builder.Services.AddSingleton(new AppSettings(builder.Configuration));//注å
