´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Services/BaseInfo/Partial/dt_geometry_dataService.cs
@@ -37,5 +37,28 @@ //å¤ç§æ·ä¼ç¨å°è¿init代ç ï¼å ¶ä»æ åµå¯ä»¥ä¸ç¨ //base.Init(dbRepository); } } public override WebResponseContent Update(SaveModel saveModel) { WebResponseContent responseContent = new WebResponseContent(); var id = saveModel.MainData["ID"].ToInt(); var geometry_Data = repository.Find(x => x.ID == id).FirstOrDefault(); geometry_Data.a = saveModel.MainData["a"].ToFloat(); geometry_Data.b = saveModel.MainData["b"].ToFloat(); geometry_Data.c = saveModel.MainData["c"].ToFloat(); geometry_Data.d = saveModel.MainData["d"].ToFloat(); geometry_Data.e = saveModel.MainData["e"].ToFloat(); geometry_Data.f = saveModel.MainData["f"].ToFloat(); geometry_Data.g = saveModel.MainData["g"].ToFloat(); geometry_Data.h = saveModel.MainData["h"].ToFloat(); geometry_Data.stackNoRange = saveModel.MainData["stackNoRange"].ToInt(); geometry_Data.weight = saveModel.MainData["weight"].ToFloat(); if (geometry_Data.stackNoRange < 3) return responseContent.Error("æå æ°éä¸è½å°äº3个ï¼"); if (geometry_Data.stackNoRange > 6) return responseContent.Error("æå æ°éä¸è½å¤äº6个ï¼"); if (geometry_Data.e > 1060 && geometry_Data.stackNoRange > 5) return responseContent.Error("æå æ°éä¸è½è¶ è¿5个ï¼"); var height = geometry_Data.a + geometry_Data.b + geometry_Data.c + (geometry_Data.stackNoRange - 1) * (geometry_Data.a + geometry_Data.b + geometry_Data.c + geometry_Data.d); if (height > 1170) return responseContent.Error($"æå æ°éä¸è½è¶ è¿{geometry_Data.stackNoRange}个ï¼"); repository.Update(geometry_Data,true); return responseContent.OK(); } } } ´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WMS/Services/BaseInfo/Partial/dt_geometry_dataService.cs
@@ -43,7 +43,26 @@ } public override WebResponseContent Update(SaveModel saveModel) { return base.Update(saveModel); WebResponseContent responseContent = new WebResponseContent(); var id = saveModel.MainData["ID"].ToInt(); var geometry_Data = repository.Find(x => x.ID == id).FirstOrDefault(); geometry_Data.a = saveModel.MainData["a"].ToFloat(); geometry_Data.b = saveModel.MainData["b"].ToFloat(); geometry_Data.c = saveModel.MainData["c"].ToFloat(); geometry_Data.d = saveModel.MainData["d"].ToFloat(); geometry_Data.e = saveModel.MainData["e"].ToFloat(); geometry_Data.f = saveModel.MainData["f"].ToFloat(); geometry_Data.g = saveModel.MainData["g"].ToFloat(); geometry_Data.h = saveModel.MainData["h"].ToFloat(); geometry_Data.stackNoRange = saveModel.MainData["stackNoRange"].ToInt(); geometry_Data.weight = saveModel.MainData["weight"].ToFloat(); if (geometry_Data.stackNoRange < 3) return responseContent.Error("æå æ°éä¸è½å°äº3个ï¼"); if (geometry_Data.stackNoRange > 6) return responseContent.Error("æå æ°éä¸è½å¤äº6个ï¼"); if (geometry_Data.e > 1060 && geometry_Data.stackNoRange > 5) return responseContent.Error("æå æ°éä¸è½è¶ è¿5个ï¼"); var height = geometry_Data.a + geometry_Data.b + geometry_Data.c + (geometry_Data.stackNoRange - 1) * (geometry_Data.a + geometry_Data.b + geometry_Data.c + geometry_Data.d); if (height > 1170) return responseContent.Error($"æå æ°éä¸è½è¶ è¿{geometry_Data.stackNoRange}个ï¼"); repository.Update(geometry_Data, true); return responseContent.OK(); } } } ´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobQueueTask.cs
@@ -5,7 +5,7 @@ { public class JobQueueTask : Job { [Invoke(Begin = "2024-01-01 00:00", Interval = 1000 * 2, /*IsEnabled = true,*/ SkipWhileExecuting = true)] [Invoke(Begin = "2024-01-01 00:00", Interval = 1000 * 2, IsEnabled = true, SkipWhileExecuting = true)] public void QueueTaskTiem() { QueueTask.ReplaceTrayTask(); ´úÂë¹ÜÀí/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobSendTask.cs
@@ -9,7 +9,7 @@ { public class JobSendTask : Job { [Invoke(Begin = "2024-01-01 00:00", Interval = 1000 * 5, /*IsEnabled = true,*/ SkipWhileExecuting = true)] [Invoke(Begin = "2024-01-01 00:00", Interval = 1000 * 5, IsEnabled = true, SkipWhileExecuting = true)] public void SendTaskTime() { AGVServer.SendFromaddress();