From efe6984c4e0e91b16b2704e174d610e180045dc5 Mon Sep 17 00:00:00 2001
From: 展杰 <1240968267@qq.com>
Date: 星期一, 19 八月 2024 09:01:56 +0800
Subject: [PATCH] 合并上格-8.19
---
MES.Service/Modes/MesLine.cs | 291 ++++++++++++++++++++--------------------------------------
1 files changed, 100 insertions(+), 191 deletions(-)
diff --git a/MES.Service/Modes/MesLine.cs b/MES.Service/Modes/MesLine.cs
index a1e3718..b1d8449 100644
--- a/MES.Service/Modes/MesLine.cs
+++ b/MES.Service/Modes/MesLine.cs
@@ -1,258 +1,167 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
+锘縰sing SqlSugar;
namespace MES.Service.Modes;
/// <summary>
/// 绾夸綋
/// </summary>
-[Table("MES_LINE")]
-[SugarTable("MES_LINE")] //鐢ㄤ簬SqlSugar
+[SugarTable("MES_LINE")]
public class MesLine
{
/// <summary>
/// 涓婚敭
/// </summary>
- [Key]
- [Column("ID")]
- [SugarColumn(ColumnName = "ID")] //鐢ㄤ簬SqlSugar
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
- /// 鏉＄爜绫诲瀷
+ /// 绾夸綋缂栧彿
/// </summary>
- [Column("BARTYPE")]
- [SugarColumn(ColumnName = "BARTYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "鏉＄爜绫诲瀷闀垮害涓嶈兘瓒呭嚭20")]
- public string Bartype { get; set; }
+ [SugarColumn(ColumnName = "LINE_NO")]
+ public string LineNo { get; set; }
/// <summary>
- /// 鍗℃澘鍒嗙被
+ /// 绾夸綋鍚嶇О
/// </summary>
- [Column("BK01")]
- [SugarColumn(ColumnName = "BK01")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍗℃澘鍒嗙被闀垮害涓嶈兘瓒呭嚭50")]
- public string Bk01 { get; set; }
+ [SugarColumn(ColumnName = "LINE_NAME")]
+ public string LineName { get; set; }
/// <summary>
- /// 瀹℃牳浜�
+ /// 宸ヤ綔涓績缂栧彿
/// </summary>
- [Column("CHECK_BY")]
- [SugarColumn(ColumnName = "CHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "瀹℃牳浜洪暱搴︿笉鑳借秴鍑�30")]
- public string CheckBy { get; set; }
+ [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
+ public string WorkshopCenterCode { get; set; }
/// <summary>
- /// 瀹℃牳鏃ユ湡
+ /// 澶囨敞
/// </summary>
- [Column("CHECK_DATE")]
- [SugarColumn(ColumnName = "CHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐘舵��
- /// </summary>
- [Column("CHECK_STATUS")]
- [SugarColumn(ColumnName = "CHECK_STATUS")] //鐢ㄤ簬SqlSugar
- public decimal? CheckStatus { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("COMPANY")]
- [SugarColumn(ColumnName = "COMPANY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Company闀垮害涓嶈兘瓒呭嚭20")]
- public string Company { get; set; }
+ [SugarColumn(ColumnName = "MEMO")]
+ public string Memo { get; set; }
/// <summary>
/// 鍒涘缓浜�
/// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�30")]
+ [SugarColumn(ColumnName = "CREATE_BY")]
public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃ユ湡
/// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
+ [SugarColumn(ColumnName = "CREATE_DATE")]
public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 閮ㄩ棬缂栧彿
- /// </summary>
- [Column("DEPARTMENTCODE")]
- [SugarColumn(ColumnName = "DEPARTMENTCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "閮ㄩ棬缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string Departmentcode { get; set; }
-
- /// <summary>
- /// 绾胯竟浠撳簱
- /// </summary>
- [Column("DEPOT_CODE")]
- [SugarColumn(ColumnName = "DEPOT_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "绾胯竟浠撳簱闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotCode { get; set; }
-
- /// <summary>
- /// 榛樿搴撲綅
- /// </summary>
- [Column("DEPOT_SECTION_CODE")]
- [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "榛樿搴撲綅闀垮害涓嶈兘瓒呭嚭50")]
- public string DepotSectionCode { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("FACTORY")]
- [SugarColumn(ColumnName = "FACTORY")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Factory闀垮害涓嶈兘瓒呭嚭20")]
- public string Factory { get; set; }
-
- /// <summary>
- /// 鏍囩鏄剧ず鍊�
- /// </summary>
- [Column("LABEL")]
- [SugarColumn(ColumnName = "LABEL")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏍囩鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�100")]
- public string Label { get; set; }
/// <summary>
/// 鏈�鍚庝慨鏀逛汉
/// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(30, ErrorMessage = "鏈�鍚庝慨鏀逛汉闀垮害涓嶈兘瓒呭嚭30")]
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庝慨鏀规棩鏈�
/// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
public DateTime? LastupdateDate { get; set; }
/// <summary>
- /// 缁勯暱缂栧彿
+ /// 鍗℃澘鍒嗙被
/// </summary>
- [Column("L_CODE")]
- [SugarColumn(ColumnName = "L_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "缁勯暱缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LCode { get; set; }
+ [SugarColumn(ColumnName = "BK01")]
+ public string Bk01 { get; set; }
/// <summary>
- /// 绾跨畝鐮�
+ /// 鏍囩鏄剧ず鍊�
/// </summary>
- [Column("LINEJM")]
- [SugarColumn(ColumnName = "LINEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "绾跨畝鐮侀暱搴︿笉鑳借秴鍑�20")]
- public string Linejm { get; set; }
-
- /// <summary>
- /// 绾夸綋鍚嶇О
- /// </summary>
- [Column("LINE_NAME")]
- [SugarColumn(ColumnName = "LINE_NAME")] //鐢ㄤ簬SqlSugar
- [StringLength(64, ErrorMessage = "绾夸綋鍚嶇О闀垮害涓嶈兘瓒呭嚭64")]
- public string LineName { get; set; }
-
- /// <summary>
- /// 绾夸綋缂栧彿
- /// </summary>
- [Column("LINE_NO")]
- [SugarColumn(ColumnName = "LINE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "绾夸綋缂栧彿闀垮害涓嶈兘瓒呭嚭32")]
- public string LineNo { get; set; }
-
- /// <summary>
- /// 浜х嚎绫诲埆
- /// </summary>
- [Column("LINE_STYLE")]
- [SugarColumn(ColumnName = "LINE_STYLE")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "浜х嚎绫诲埆闀垮害涓嶈兘瓒呭嚭32")]
- public string LineStyle { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [Column("MEMO")]
- [SugarColumn(ColumnName = "MEMO")] //鐢ㄤ簬SqlSugar
- [StringLength(1000, ErrorMessage = "澶囨敞闀垮害涓嶈兘瓒呭嚭1000")]
- public string Memo { get; set; }
-
- /// <summary>
- /// 鎵�灞炲伐搴�
- /// </summary>
- [Column("PROC_NO")]
- [SugarColumn(ColumnName = "PROC_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(32, ErrorMessage = "鎵�灞炲伐搴忛暱搴︿笉鑳借秴鍑�32")]
- public string ProcNo { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("SHOW_INDEX")]
- [SugarColumn(ColumnName = "SHOW_INDEX")] //鐢ㄤ簬SqlSugar
- public decimal? ShowIndex { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("SIMPLENAME")]
- [SugarColumn(ColumnName = "SIMPLENAME")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "Simplename闀垮害涓嶈兘瓒呭嚭20")]
- public string Simplename { get; set; }
-
- /// <summary>
- /// 鏍囧噯宸ユ椂
- /// </summary>
- [Column("STAND_TIME")]
- [SugarColumn(ColumnName = "STAND_TIME")] //鐢ㄤ簬SqlSugar
- public decimal? StandTime { get; set; }
-
- /// <summary>
- /// 缁勯暱
- /// </summary>
- [Column("USERCODE")]
- [SugarColumn(ColumnName = "USERCODE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "缁勯暱闀垮害涓嶈兘瓒呭嚭50")]
- public string Usercode { get; set; }
-
- /// <summary>
- /// 鍖哄垎閿傞敯閿備簹
- /// </summary>
- [Column("WORKCENTERTYPE")]
- [SugarColumn(ColumnName = "WORKCENTERTYPE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "鍖哄垎閿傞敯閿備簹闀垮害涓嶈兘瓒呭嚭50")]
- public string Workcentertype { get; set; }
+ [SugarColumn(ColumnName = "LABEL")]
+ public string Label { get; set; }
/// <summary>
/// 杞﹂棿绠�鐮�
/// </summary>
- [Column("WORKHOMEJM")]
- [SugarColumn(ColumnName = "WORKHOMEJM")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "杞﹂棿绠�鐮侀暱搴︿笉鑳借秴鍑�20")]
+ [SugarColumn(ColumnName = "WORKHOMEJM")]
public string Workhomejm { get; set; }
/// <summary>
- /// 宸ヤ綔涓績缂栧彿
+ /// 绾跨畝鐮�
/// </summary>
- [Column("WORKSHOP_CENTER_CODE")]
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")] //鐢ㄤ簬SqlSugar
- [StringLength(20, ErrorMessage = "宸ヤ綔涓績缂栧彿闀垮害涓嶈兘瓒呭嚭20")]
- public string WorkshopCenterCode { get; set; }
+ [SugarColumn(ColumnName = "LINEJM")]
+ public string Linejm { get; set; }
/// <summary>
- /// 鎶ュ伐鏂瑰紡锛�0銆佺鏁ｆ姤宸ワ紝1銆佹暣绾挎姤宸ワ級
+ /// 鏉＄爜绫诲瀷
/// </summary>
- [Column("WORK_TYPE")]
- [SugarColumn(ColumnName = "WORK_TYPE")] //鐢ㄤ簬SqlSugar
- public decimal? WorkType { get; set; }
+ [SugarColumn(ColumnName = "BARTYPE")]
+ public string Bartype { get; set; }
/// <summary>
/// 寰俊鏄剧ず鍊�
/// </summary>
- [Column("WX_LABLE")]
- [SugarColumn(ColumnName = "WX_LABLE")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "寰俊鏄剧ず鍊奸暱搴︿笉鑳借秴鍑�50")]
+ [SugarColumn(ColumnName = "WX_LABLE")]
public string WxLable { get; set; }
+
+ /// <summary>
+ /// 鍖哄垎閿傞敯閿備簹
+ /// </summary>
+ [SugarColumn(ColumnName = "WORKCENTERTYPE")]
+ public string Workcentertype { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "SIMPLENAME")]
+ public string Simplename { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "SHOW_INDEX")]
+ public decimal? ShowIndex { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string Company { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string Factory { get; set; }
+
+ /// <summary>
+ /// 绾胯竟浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
+ public string DepotCode { get; set; }
+
+ /// <summary>
+ /// 榛樿搴撲綅
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
+ public string DepotSectionCode { get; set; }
+
+ /// <summary>
+ /// 鎶ュ伐鏂瑰紡锛�0銆佺鏁ｆ姤宸ワ紝1銆佹暣绾挎姤宸ワ級
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_TYPE")]
+ public decimal? WorkType { get; set; }
+
+ /// <summary>
+ /// 閮ㄩ棬缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPARTMENTCODE")]
+ public string Departmentcode { get; set; }
+
+ /// <summary>
+ /// 鎵�灞炲伐搴�
+ /// </summary>
+ [SugarColumn(ColumnName = "PROC_NO")]
+ public string ProcNo { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_STYLE")]
+ public string LineStyle { get; set; }
+
+ /// <summary>
+ /// 缁勯暱缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "L_CODE")]
+ public string LCode { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.3