From 59e703685d36818247da3fcd101ca72e691d86de Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 27 11月 2024 10:05:57 +0800 Subject: [PATCH] 222 --- LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs | 107 +++++++++++++++++++++++++++-------------------------- 1 files changed, 55 insertions(+), 52 deletions(-) diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs index e354693..77a7d63 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Entity/WmsOrder/Mes_BatchOrderUPI.cs @@ -13,25 +13,10 @@ [SugarTable("mes_batchOrderUPI_new", "鎵规鏁版嵁")] public class Mes_BatchOrderUPI_New : EntityBase { - #region wms鏂板瀛楁 銆怑ditby shaocx,2024-11-20銆� - /// <summary> - /// 鎵�鍦ㄥ尯鍩� - /// </summary> - [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "鎵�鍦ㄥ尯鍩�")] - public AreaCodeEnum? AreaCode { get; set; } - - - /// <summary> - /// 鏉挎枡鐘舵�� - /// </summary> [Required] - [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")] - public UpiStatusEnum UpiStatus { get; set; } - - #endregion - - + [SugarColumn(ColumnName = "UPI", ColumnDescription = "閮ㄤ欢鏉$爜", Length = 50)] + public string UPI { get; set; } [Required] @@ -42,9 +27,31 @@ [SugarColumn(ColumnName = "OrderId", ColumnDescription = "璁㈠崟鍙�", Length = 50)] public string OrderId { get; set; } + /// <summary> + /// 鐢熶骇鍗曞彿 + /// </summary> + [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)] + public string? Info5 { get; set; } + + + #region wms鏂板瀛楁 銆怑ditby shaocx,2024-11-20銆� + + /// <summary> + /// 鎵�鍦ㄥ尯鍩� + /// </summary> + [SugarColumn(ColumnName = "AreaCode", ColumnDescription = "鎵�鍦ㄥ尯鍩�")] + public AreaCodeEnum? AreaCode { get; set; } = AreaCodeEnum.鏃犲尯鍩�; + + + /// <summary> + /// 鏉挎枡鐘舵�� + /// </summary> [Required] - [SugarColumn(ColumnName = "UPI", ColumnDescription = "閮ㄤ欢鏉$爜", Length = 50)] - public string UPI { get; set; } + [SugarColumn(ColumnName = "UpiStatus", ColumnDescription = "鏉挎枡鐘舵��")] + public UpiStatusEnum UpiStatus { get; set; } = UpiStatusEnum.鍒濆; + + #endregion + [Required] [SugarColumn(ColumnName = "DetailName", ColumnDescription = "閮ㄤ欢鍚嶇О", Length = 50)] @@ -60,30 +67,30 @@ [SugarColumn(ColumnName = "Thk", ColumnDescription = "鍘�")] public float Thk { get; set; } - [SugarColumn(ColumnName = "Matgrid", ColumnDescription = "閮ㄤ欢绾圭悊", Length = 50)] - public string? Matgrid { get; set; } + //[SugarColumn(ColumnName = "Matgrid", ColumnDescription = "閮ㄤ欢绾圭悊", Length = 50)] + //public string? Matgrid { get; set; } - [SugarColumn(ColumnName = "IsEB", ColumnDescription = "鏄惁灏佽竟")] - public int? IsEB { get; set; } + //[SugarColumn(ColumnName = "IsEB", ColumnDescription = "鏄惁灏佽竟")] + //public int? IsEB { get; set; } - /// <summary> - /// 鎵撳瓟璁惧缂栧彿 銆怑ditBy shaocx,2022-05-28銆� - /// 0锛氫笉鎵撳瓟 - /// 1锛氬洓闈㈤捇 - /// 2锛氳豹杩堝叚闈㈤捇 - /// 5锛氬崡鍏村叚闈㈤捇 - /// </summary> - [SugarColumn(ColumnName = "DRNum", ColumnDescription = "鎵撳瓟璁惧缂栧彿")] - public int? DRNum { get; set; } + ///// <summary> + ///// 鎵撳瓟璁惧缂栧彿 銆怑ditBy shaocx,2022-05-28銆� + ///// 0锛氫笉鎵撳瓟 + ///// 1锛氬洓闈㈤捇 + ///// 2锛氳豹杩堝叚闈㈤捇 + ///// 5锛氬崡鍏村叚闈㈤捇 + ///// </summary> + //[SugarColumn(ColumnName = "DRNum", ColumnDescription = "鎵撳瓟璁惧缂栧彿")] + //public int? DRNum { get; set; } [SugarColumn(ColumnName = "IsPA", ColumnDescription = "鏄惁浼樺寲鍖呰")] public int? IsPA { get; set; } - /// <summary> - /// 閿垏鍥惧彿 - /// </summary> - [SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "閿垏鍥惧彿")] - public int? MaterialIndeX { get; set; } + ///// <summary> + ///// 閿垏鍥惧彿 + ///// </summary> + //[SugarColumn(ColumnName = "MaterialIndeX", ColumnDescription = "閿垏鍥惧彿")] + //public int? MaterialIndeX { get; set; } #region 鍖呰绾挎湁鍏� @@ -115,18 +122,18 @@ #endregion - /// <summary> - /// 鏄惁杞悜 - /// 0锛氫笉杞悜 - /// 1锛氳浆鍚� - /// 鐩墠鍙湁鍥涢潰閽绘墠鑳借浆鍚� - /// </summary> - [Required] - [SugarColumn(ColumnName = "Rotation", ColumnDescription = "杞悜瑙掑害", Length = 50)] - public float? Rotation { get; set; } + ///// <summary> + ///// 鏄惁杞悜 + ///// 0锛氫笉杞悜 + ///// 1锛氳浆鍚� + ///// 鐩墠鍙湁鍥涢潰閽绘墠鑳借浆鍚� + ///// </summary> + //[Required] + //[SugarColumn(ColumnName = "Rotation", ColumnDescription = "杞悜瑙掑害", Length = 50)] + //public float? Rotation { get; set; } - + [SugarColumn(ColumnName = "Info1", ColumnDescription = "绾哥闀�", Length = 50)] public float? Info1 { get; set; } @@ -141,11 +148,7 @@ [SugarColumn(ColumnName = "Info4", ColumnDescription = "閿�鍞悎鍚屽崟鍙�", Length = 60)] public string? Info4 { get; set; } - /// <summary> - /// 鐢熶骇鍗曞彿 - /// </summary> - [SugarColumn(ColumnName = "Info5", ColumnDescription = "鐢熶骇鍗曞彿", Length = 60)] - public string? Info5 { get; set; } + /// <summary> /// 绗嚑鍖� -- Gitblit v1.9.3