From 8c7c2c1aec1579a94c7a8368710bb31ff9518d73 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 27 六月 2024 16:03:19 +0800
Subject: [PATCH] 待检库不满足入库条件改为入库外协
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/BaseInfo/Partial/dt_geometry_dataService.cs | 47 +++++++++++++++++++++++++++--------------------
1 files changed, 27 insertions(+), 20 deletions(-)
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 2b5e72b..221c1b8 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"
@@ -39,30 +39,37 @@
}
public override WebResponseContent Add(SaveModel saveDataModel)
{
- return base.Add(saveDataModel);
+ WebResponseContent responseContent = new WebResponseContent();
+ var a = saveDataModel.MainData["a"].ToFloat();
+ var b = saveDataModel.MainData["b"].ToFloat();
+ var c = saveDataModel.MainData["c"].ToFloat();
+ var d = saveDataModel.MainData["d"].ToFloat();
+ var e = saveDataModel.MainData["e"].ToFloat();
+ var stackNoRange = saveDataModel.MainData["stackNoRange"].ToInt();
+ if (stackNoRange < 3) return responseContent.Error("鎵撳寘鏁伴噺涓嶈兘灏戜簬3涓紒");
+ if (stackNoRange > 6) return responseContent.Error("鎵撳寘鏁伴噺涓嶈兘澶氫簬6涓紒");
+ if (e > 1060 && stackNoRange > 5) return responseContent.Error("鎵撳寘鏁伴噺涓嶈兘瓒呰繃5涓紒");
+ var height = a + b + c + (stackNoRange - 1) * (a + b + c + d);
+ if (height > 1170) return responseContent.Error($"鎵撳寘鏁伴噺涓嶈兘瓒呰繃{stackNoRange}涓紒");
+ responseContent = base.Add(saveDataModel);
+ return responseContent;
}
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();
+ var a = saveModel.MainData["a"].ToFloat();
+ var b = saveModel.MainData["b"].ToFloat();
+ var c = saveModel.MainData["c"].ToFloat();
+ var d = saveModel.MainData["d"].ToFloat();
+ var e = saveModel.MainData["e"].ToFloat();
+ var stackNoRange = saveModel.MainData["stackNoRange"].ToInt();
+ if (stackNoRange < 3) return responseContent.Error("鎵撳寘鏁伴噺涓嶈兘灏戜簬3涓紒");
+ if (stackNoRange > 6) return responseContent.Error("鎵撳寘鏁伴噺涓嶈兘澶氫簬6涓紒");
+ if (e > 1060 && stackNoRange > 5) return responseContent.Error("鎵撳寘鏁伴噺涓嶈兘瓒呰繃5涓紒");
+ var height = a + b + c + (stackNoRange - 1) * (a + b + c + d);
+ if (height > 1170) return responseContent.Error($"鎵撳寘鏁伴噺涓嶈兘瓒呰繃{stackNoRange}涓紒");
+ responseContent = base.Update(saveModel);
+ return responseContent;
}
}
}
--
Gitblit v1.9.3