From 11ff4d231e12aa7f7cd2627df5f79b6d2bed5906 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 21 六月 2024 16:17:29 +0800
Subject: [PATCH] 车轮参数信息添加、修改增加条件判断
---
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs | 45 +++++-----
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/BaseInfo/Partial/dt_geometry_dataService.cs | 47 ++++++-----
代码管理/PCS/WCS_Server/WIDESEA_WCS/Services/BaseInfo/Partial/dt_geometry_dataService.cs | 50 +++++++----
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs | 43 +++++-----
4 files changed, 103 insertions(+), 82 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs"
index d1c4899..50c4f1d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs"
@@ -17,7 +17,16 @@
public partial class dt_geometry_data:BaseEntity
{
/// <summary>
- ///
+ ///涓婚敭
+ /// </summary>
+ [Key]
+ [Display(Name ="涓婚敭")]
+ [Column(TypeName="int")]
+ [Required(AllowEmptyStrings=false)]
+ public int ID { get; set; }
+
+ /// <summary>
+ ///TypeId
/// </summary>
[Display(Name ="TypeId")]
[Column(TypeName="int")]
@@ -108,30 +117,22 @@
public float h { get; set; }
/// <summary>
- ///
+ ///鎵撳寘鏁伴噺
/// </summary>
- [Key]
- [Display(Name ="ID")]
+ [Display(Name ="鎵撳寘鏁伴噺")]
[Column(TypeName="int")]
+ [Editable(true)]
[Required(AllowEmptyStrings=false)]
- public int ID { get; set; }
+ public int stackNoRange { get; set; }
- /// <summary>
- /// 鎵撳寘鏁伴噺
- /// </summary>
- [Display(Name = "stackNoRange")]
- [Column(TypeName = "int")]
- //[Editable(true)]
- //[Required(AllowEmptyStrings = false)]
- public int stackNoRange { get; set; }
+ /// <summary>
+ ///閲嶉噺
+ /// </summary>
+ [Display(Name ="閲嶉噺")]
+ [Column(TypeName="float")]
+ [Editable(true)]
+ public float? weight { get; set; }
- /// <summary>
- ///閲嶉噺
- /// </summary>
- [Display(Name = "weight")]
- [Column(TypeName = "float")]
- //[Editable(true)]
- //[Required(AllowEmptyStrings = false)]
- public float? weight { get; set; }
+
}
}
\ No newline at end of file
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 8e38de7..18cdfae 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"
@@ -17,6 +17,7 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.AspNetCore.Http;
using WIDESEA_WCS.IRepositories;
+using Microsoft.AspNetCore.Mvc.RazorPages;
namespace WIDESEA_WCS.Services
{
@@ -37,28 +38,39 @@
//澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
//base.Init(dbRepository);
}
+ public override WebResponseContent Add(SaveModel 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;
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs"
index b2bd01f..50c4f1d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/BaseInfo/dt_geometry_data.cs"
@@ -13,11 +13,20 @@
namespace WIDESEA_Entity.DomainModels
{
- [Entity(TableCnName = "杞﹁疆淇℃伅",TableName = "dt_geometry_data")]
+ [Entity(TableCnName = "鏈哄姞宸ヨ溅杞俊鎭�",TableName = "dt_geometry_data")]
public partial class dt_geometry_data:BaseEntity
{
/// <summary>
- ///
+ ///涓婚敭
+ /// </summary>
+ [Key]
+ [Display(Name ="涓婚敭")]
+ [Column(TypeName="int")]
+ [Required(AllowEmptyStrings=false)]
+ public int ID { get; set; }
+
+ /// <summary>
+ ///TypeId
/// </summary>
[Display(Name ="TypeId")]
[Column(TypeName="int")]
@@ -108,30 +117,22 @@
public float h { get; set; }
/// <summary>
- ///
+ ///鎵撳寘鏁伴噺
/// </summary>
- [Key]
- [Display(Name ="ID")]
+ [Display(Name ="鎵撳寘鏁伴噺")]
[Column(TypeName="int")]
+ [Editable(true)]
[Required(AllowEmptyStrings=false)]
- public int ID { get; set; }
+ public int stackNoRange { get; set; }
- /// <summary>
- /// 鎵撳寘鏁伴噺
- /// </summary>
- [Display(Name = "stackNoRange")]
- [Column(TypeName = "int")]
- //[Editable(true)]
- //[Required(AllowEmptyStrings = false)]
- public int stackNoRange { get; set; }
+ /// <summary>
+ ///閲嶉噺
+ /// </summary>
+ [Display(Name ="閲嶉噺")]
+ [Column(TypeName="float")]
+ [Editable(true)]
+ public float? weight { get; set; }
- /// <summary>
- ///閲嶉噺
- /// </summary>
- [Display(Name = "weight")]
- [Column(TypeName = "float")]
- //[Editable(true)]
- //[Required(AllowEmptyStrings = false)]
- public float? weight { get; set; }
+
}
}
\ No newline at end of file
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