From 1a7f388092c07cba07a4948a82509b23222f7865 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 05 六月 2024 10:30:19 +0800
Subject: [PATCH] 添加修改托盘打包数量条件
---
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobQueueTask.cs | 2 +-
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/BaseInfo/Partial/dt_geometry_dataService.cs | 21 ++++++++++++++++++++-
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobSendTask.cs | 2 +-
代码管理/PCS/WCS_Server/WIDESEA_WCS/Services/BaseInfo/Partial/dt_geometry_dataService.cs | 25 ++++++++++++++++++++++++-
4 files changed, 46 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/BaseInfo/Partial/dt_geometry_dataService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/BaseInfo/Partial/dt_geometry_dataService.cs"
index 5104dfb..8e38de7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/BaseInfo/Partial/dt_geometry_dataService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Services/BaseInfo/Partial/dt_geometry_dataService.cs"
@@ -37,5 +37,28 @@
//澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
//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();
+ }
+ }
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/BaseInfo/Partial/dt_geometry_dataService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/BaseInfo/Partial/dt_geometry_dataService.cs"
index cbc4836..2b5e72b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/BaseInfo/Partial/dt_geometry_dataService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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();
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobQueueTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobQueueTask.cs"
index 21f3cb6..351e8bd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobQueueTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobSendTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobSendTask.cs"
index 821dbcf..5a76bf7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/JobSendTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/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();
--
Gitblit v1.9.3