车轮参数信息添加、修改增加条件判断

dengjunjie

2024-06-21 11ff4d231e12aa7f7cd2627df5f79b6d2bed5906

车轮参数信息添加、修改增加条件判断

 ´úÂë¹ÜÀí/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; }
       
    }
}

 ´úÂë¹ÜÀí/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 @@
            //多租户会用到这init代码，其他情况可以不用
            //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;
        }
    }
}

 ´úÂë¹ÜÀí/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; }
       
    }
}

 ´úÂë¹ÜÀí/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;
        }
    }
}