From 8a09a1fabfa8840288c10f6c58ff4a6d519e66d7 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 21 二月 2025 15:43:23 +0800
Subject: [PATCH] 雅达-更新条码生成逻辑，注释多处代码块

---
 Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs |  320 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 231 insertions(+), 89 deletions(-)

diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
index 47745e8..620fcad 100644
--- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
+++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
@@ -7,222 +7,364 @@
 namespace Tiger.Model
 {
 	/// <summary>
-	/// 实体：工单
+	/// 瀹炰綋锛氬伐鍗�
 	/// </summary>
 	[Description("Primary:ID")]
+	[DisplayName("宸ュ崟")]
 	[Serializable]
 	[SugarTable("BIZ_MES_WO")]
 	public class BIZ_MES_WO : DbEntityWithAuth
 	{
-		#region 构造函数
+		#region 鏋勯�犲嚱鏁�
 		/// <summary>
-		/// 实体：工单
+		/// 瀹炰綋锛氬伐鍗�
 		/// </summary>
 		public BIZ_MES_WO() {}
 		#endregion
 
-		#region 公共属性
+		#region 鍏叡灞炴��
 		/// <summary>
-		/// 工单号
+		/// 宸ュ崟鍙�
 		/// </summary>
+		[DisplayName("宸ュ崟鍙�")]
 		public string ORDER_NO { get; set; }
 		/// <summary>
-		/// 工单类型(0Normal正常|1Rework返工)
+		/// 宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏)
 		/// </summary>
-		public string ORDER_TYPE { get; set; }
+		[DisplayName("宸ュ崟绫诲瀷(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏)")]
+		public int ORDER_TYPE { get; set; }
 		/// <summary>
-		/// 工单描述
+		/// 宸ュ崟鎻忚堪
 		/// </summary>
+		[DisplayName("宸ュ崟鎻忚堪")]
 		public string ORDER_DESC { get; set; }
 		/// <summary>
-		/// 父工单
+		/// 鐖跺伐鍗�
 		/// </summary>
+		[DisplayName("鐖跺伐鍗�")]
 		public string PARENT_ORDER { get; set; }
 		/// <summary>
-		/// 状态(0Init初始化|1Imported已导入|2Release已下发|3Working生产中|4Paused已暂停|5Closed已关闭)
+		/// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)
 		/// </summary>
+		[DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")]
 		public int STATUS { get; set; }
-		/// <summary>
-		/// 物料编码
-		/// </summary>
+        /// <summary>
+        /// 鏄惁鍑嗗瀹屾垚(Y/N)
+        /// </summary>
+        [DisplayName("鏄惁鍑嗗瀹屾垚(Y/N)")]
+        public string IS_READY { get; set; }
+        /// <summary>
+        /// 鐗╂枡缂栫爜
+        /// </summary>
+        [DisplayName("鐗╂枡缂栫爜")]
 		public string ITEM_CODE { get; set; }
 		/// <summary>
-		/// 物料类型
+		/// 鐗╂枡绫诲瀷
 		/// </summary>
+		[DisplayName("鐗╂枡绫诲瀷")]
 		public string ITEM_TYPE { get; set; }
 		/// <summary>
-		/// 机型
+		/// 鏈哄瀷
 		/// </summary>
+		[DisplayName("鏈哄瀷")]
 		public string ITEM_MODEL { get; set; }
 		/// <summary>
-		/// 优先级
+		/// 浼樺厛绾�
 		/// </summary>
+		[DisplayName("浼樺厛绾�")]
 		public string PRIORITY { get; set; }
 		/// <summary>
-		/// 客户编码
+		/// 瀹㈡埛缂栫爜
 		/// </summary>
+		[DisplayName("瀹㈡埛缂栫爜")]
 		public string CUST_CODE { get; set; }
 		/// <summary>
-		/// 路由编码
+		/// 璺敱缂栫爜
 		/// </summary>
+		[DisplayName("璺敱缂栫爜")]
 		public string ROUTE_CODE { get; set; }
 		/// <summary>
-		/// 工艺状态(0WaitSet待配置|1Finish已配置|2Cancel取消|3Close关闭)
+		/// 宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)
 		/// </summary>
+		[DisplayName("宸ヨ壓鐘舵��(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)")]
 		public int ROUTE_STATUS { get; set; }
 		/// <summary>
-		/// 工厂
+		/// 宸ュ巶
 		/// </summary>
+		[DisplayName("宸ュ巶")]
 		public string FACTORY { get; set; }
 		/// <summary>
-		/// 计划线体
+		/// 杞﹂棿缂栫爜
 		/// </summary>
+		[DisplayName("杞﹂棿缂栫爜")]
+		public string WS_CODE { get; set; }
+		/// <summary>
+		/// 璁″垝绾夸綋
+		/// </summary>
+		[DisplayName("璁″垝绾夸綋")]
 		public string PLAN_LINE { get; set; }
 		/// <summary>
-		/// 实际线体
+		/// 瀹為檯绾夸綋
 		/// </summary>
+		[DisplayName("瀹為檯绾夸綋")]
 		public string ACT_LINE { get; set; }
-		/// <summary>
-		/// 计划开始时间
-		/// </summary>
+        /// <summary>
+        /// 璁″垝鏃ユ湡
+        /// </summary>
+        [DisplayName("璁″垝鏃ユ湡")]
+        public string PLAN_DATE { get; set; }
+        /// <summary>
+        /// 璁″垝寮�濮嬫椂闂�
+        /// </summary>
+        [DisplayName("璁″垝寮�濮嬫椂闂�")]
 		public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 计划结束时间
+		/// 璁″垝缁撴潫鏃堕棿
 		/// </summary>
+		[DisplayName("璁″垝缁撴潫鏃堕棿")]
 		public DateTime PLAN_END_TIME { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 实际开始时间
+		/// 瀹為檯寮�濮嬫椂闂�
 		/// </summary>
+		[DisplayName("瀹為檯寮�濮嬫椂闂�")]
 		public DateTime ACT_START_TIME { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 实际结束时间
+		/// 瀹為檯缁撴潫鏃堕棿
 		/// </summary>
+		[DisplayName("瀹為檯缁撴潫鏃堕棿")]
 		public DateTime ACT_END_TIME { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 标准作业人数
+		/// 鏍囧噯浣滀笟浜烘暟
 		/// </summary>
-		public int STD_WORKERS_QTY { get; set; }
+		[DisplayName("鏍囧噯浣滀笟浜烘暟")]
+		public int STD_WORKER_QTY { get; set; }
 		/// <summary>
-		/// 实际作业人数
+		/// 瀹為檯浣滀笟浜烘暟
 		/// </summary>
+		[DisplayName("瀹為檯浣滀笟浜烘暟")]
 		public int ACT_WORKER_QTY { get; set; }
 		/// <summary>
-		/// 导入时间
+		/// 瀵煎叆鏃堕棿
 		/// </summary>
+		[DisplayName("瀵煎叆鏃堕棿")]
 		public DateTime IMPORT_TIME { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 下发时间
+		/// 涓嬪彂鏃堕棿
 		/// </summary>
+		[DisplayName("涓嬪彂鏃堕棿")]
 		public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 下发人
+		/// 涓嬪彂浜�
 		/// </summary>
+		[DisplayName("涓嬪彂浜�")]
 		public string RELEASE_USER { get; set; }
 		/// <summary>
-		/// 变更时间
+		/// 鍙樻洿鏃堕棿
 		/// </summary>
+		[DisplayName("鍙樻洿鏃堕棿")]
 		public DateTime CHANGE_TIME { get; set; } = DateTime.MinValue;
 		/// <summary>
-		/// 变更人
+		/// 鍙樻洿浜�
 		/// </summary>
+		[DisplayName("鍙樻洿浜�")]
 		public string CHANGE_USER { get; set; }
 		/// <summary>
-		/// 计划数量
+		/// 璁″垝鏁伴噺
 		/// </summary>
+		[DisplayName("璁″垝鏁伴噺")]
 		public int PLAN_QTY { get; set; }
 		/// <summary>
-		/// 投入数量
+		/// 鎶曞叆鏁伴噺
 		/// </summary>
+		[DisplayName("鎶曞叆鏁伴噺")]
 		public int INPUT_QTY { get; set; }
 		/// <summary>
-		/// 完工数量
+		/// 瀹屽伐鏁伴噺
 		/// </summary>
+		[DisplayName("瀹屽伐鏁伴噺")]
 		public int OUTPUT_QTY { get; set; }
 		/// <summary>
-		/// 报废数量
+		/// 鎶ュ簾鏁伴噺
 		/// </summary>
+		[DisplayName("鎶ュ簾鏁伴噺")]
 		public int SCRAP_QTY { get; set; }
 		/// <summary>
-		/// 入库数量
+		/// 鍏ュ簱鏁伴噺
 		/// </summary>
+		[DisplayName("鍏ュ簱鏁伴噺")]
 		public int STOCK_IN_QTY { get; set; }
-		/// <summary>
-		/// UPH
-		/// </summary>
+        /// <summary>
+        /// 棣栦欢纭鏁伴噺
+        /// </summary>
+        [DisplayName("棣栦欢纭鏁伴噺")]
+        public int FIRST_IN_QTY { get; set; }
+        /// <summary>
+        /// UPH
+        /// </summary>
+        [DisplayName("UPH")]
 		public double UPH { get; set; }
 		/// <summary>
 		/// UPPH
 		/// </summary>
+		[DisplayName("UPPH")]
 		public double UPPH { get; set; }
-		/// <summary>
-		/// 最后的工单历史ID
-		/// </summary>
-		public string LAST_HIST_ID { get; set; }
-		/// <summary>
-		/// 备注
-		/// </summary>
+        /// <summary>
+        /// 閿�鍞鍗�
+        /// </summary>
+        [DisplayName("閿�鍞鍗�")]
+		public string SALES_ORDER { get; set; }
+        /// <summary>
+        /// 閿�鍞悎鍚屽彿
+        /// </summary>
+        [DisplayName("閿�鍞悎鍚屽彿")]
+        public string SALES_CONTRACT { get; set; }
+        /// <summary>
+        /// 閿�鍞鍗曞娉�
+        /// </summary>
+        [DisplayName("閿�鍞鍗曞娉�")]
+        public string SALES_REMARK { get; set; }
+        /// <summary>
+        /// 宸ュ崟搴忓垪鍙�
+        /// </summary>
+        [DisplayName("宸ュ崟搴忓垪鍙�")]
+        public string SERIAL_NO { get; set; }
+        /// <summary>
+        /// 鍘傚唴鏉＄爜鍓嶇紑
+        /// </summary>
+        [DisplayName("鍘傚唴鏉＄爜鍓嶇紑")]
+        public string SN_PREFIX { get; set; }
+        /// <summary>
+        /// 瀹㈡埛鏉＄爜鍓嶇紑
+        /// </summary>
+        [DisplayName("瀹㈡埛鏉＄爜鍓嶇紑")]
+        public string CUST_PREFIX { get; set; }
+        /// <summary>
+        /// 鏈�鍚庣殑宸ュ崟鍘嗗彶ID
+        /// </summary>
+        [DisplayName("鏈�鍚庣殑宸ュ崟鍘嗗彶ID")]
+        public string LAST_HIST_ID { get; set; }
+        /// <summary>
+        /// 澶囨敞
+        /// </summary>
+        [DisplayName("澶囨敞")]
 		public string REMARK { get; set; }
 		/// <summary>
-		/// 接口表记录ID
+		/// 鎺ュ彛琛ㄨ褰旾D
 		/// </summary>
+		[DisplayName("鎺ュ彛琛ㄨ褰旾D")]
 		public string FBILLNO_ID { get; set; }
 		/// <summary>
-		/// 备料单返回信息
+		/// 澶囨枡鍗曡繑鍥炰俊鎭�
 		/// </summary>
+		[DisplayName("澶囨枡鍗曡繑鍥炰俊鎭�")]
 		public string PREP_MSG { get; set; }
         #endregion
 
-        #region 虚拟属性
-        /*例子
+        #region 铏氭嫙灞炴��
+        /*渚嬪瓙
 		[SugarColumn(IsIgnore = true)]
 		public string FieldName { get; set; }
 		*/
+        [SugarColumn(IsIgnore = true)]
+        public string CUST_NAME => Customer?.CUST_NAME_CN;
+        [SugarColumn(IsIgnore = true)]
+        public string WS_NAME => WorkShop?.WS_NAME;
         #endregion
 
-        #region 外键属性
-        /*例子
-		//一对一外键导航
-		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_MES_WO类里面的外键ID字段
-		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
-		//一对多外键导航
-		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_MES_WOId))]//ClassA表中的BIZ_MES_WOId
-		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
-		//多对多外键导航
-		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WOId), nameof(MappingClass.ClassAId))]//注意顺序
-		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+        #region 澶栭敭灞炴��
+        /*渚嬪瓙
+		//涓�瀵逛竴澶栭敭瀵艰埅
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁
+		public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+		//涓�瀵瑰澶栭敭瀵艰埅
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_MES_WOId))]//ClassA琛ㄤ腑鐨凚IZ_MES_WOId
+		public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+		//澶氬澶氬閿鑸�
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WOId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+		public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
 		*/
+        [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁
+        public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        [SugarColumn(IsIgnore = true)]
+        public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG);
+		[Navigate(NavigateType.OneToOne, nameof(CUST_CODE), nameof(BAS_CUSTOMER.CUST_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁
+        public BAS_CUSTOMER Customer { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+        [Navigate(NavigateType.OneToOne, nameof(WS_CODE), nameof(MES_WORKSHOP.WS_CODE), "GHOST_ROW = 0")] 
+        public MES_WORKSHOP WorkShop { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
         #endregion
 
-        #region 枚举变量
-        /*例子
+        #region 鏋氫妇鍙橀噺
+        /*渚嬪瓙
 		public enum FieldNames
 		{
-			[Description("枚举描述0")]
+			[Description("鏋氫妇鎻忚堪0")]
 			Enum0,
-			[Description("枚举描述1")]
+			[Description("鏋氫妇鎻忚堪1")]
 			Enum1,
 		}
 		*/
-        public enum STATUSs
-        {
-            [Description("初始化")]
-            Init,
-            [Description("已导入")]
-            Imported,
-            [Description("已下发")]
-            Release,
-            [Description("生产中")]
-            Working,
-            [Description("已暂停")]
-            Paused,
-            [Description("已关闭")]
-            Closed,
-        }
-        #endregion
 
-        #region 公共方法
+        /// <summary>
+        /// 鏋氫妇锛氬伐鍗曠被鍨�(0Plan璁″垝|1Standard鏍囧噯|2Rework杩斿伐|3Restructuring鍦ㄥ簱鏀瑰埗|5Outsourcing濮斿|6RD鐮斿彂|7Forecast棰勬祴|8Disassemble鎷嗗嵏)
+        /// </summary>
+        public enum ORDER_TYPEs
+		{
+			[Description("璁″垝")]
+			Plan = 0,
+			[Description("鏍囧噯")]
+			Standard = 1,
+			[Description("杩斿伐")]
+			Rework = 2,
+			[Description("鍦ㄥ簱鏀瑰埗")]
+			Restructuring = 3,
+			[Description("濮斿")]
+			Outsourcing = 5,
+			[Description("鐮斿彂")]
+			RD = 6,
+			[Description("棰勬祴")]
+			Forecast = 7,
+			[Description("鎷嗗嵏")]
+			Disassemble = 8,
+		}
 
-        #endregion
+		/// <summary>
+		/// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)
+		/// </summary>
+		public enum STATUSs
+		{
+			[Description("鍒濆鍖�")]
+			Init = 0,
+			[Description("宸插鍏�")]
+			Imported = 1,
+			[Description("宸蹭笅鍙�")]
+			Release = 2,
+			[Description("鐢熶骇涓�")]
+			Working = 3,
+			[Description("宸叉殏鍋�")]
+			Paused = 4,
+			[Description("宸插叧闂�")]
+			Closed = 5,
+		}
 
-    }//endClass
+		/// <summary>
+		/// 鏋氫妇锛氬伐鑹虹姸鎬�(0WaitSet寰呴厤缃畖1Finish宸查厤缃畖2Cancel鍙栨秷|3Close鍏抽棴)
+		/// </summary>
+		public enum ROUTE_STATUSs
+		{
+			[Description("寰呴厤缃�")]
+			WaitSet = 0,
+			[Description("宸查厤缃�")]
+			Finish = 1,
+			[Description("鍙栨秷")]
+			Cancel = 2,
+			[Description("鍏抽棴")]
+			Close = 3,
+		}
+		#endregion
+
+		#region 鍏叡鏂规硶
+
+		#endregion
+
+	}//endClass
 }
\ No newline at end of file

--
Gitblit v1.9.3