From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben
---
Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs | 268 ++++++++++++++++++++++++++++-------------------------
1 files changed, 143 insertions(+), 125 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
index 59f83d3..01dd037 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
@@ -6,129 +6,148 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("鐢熶骇鍖呰璁板綍")]
- [Serializable]
- [SugarTable("MES_WIP_PKG")]
- public class MES_WIP_PKG : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
- /// <summary>
- /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
- /// </summary>
- public MES_WIP_PKG() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐢熶骇鍖呰璁板綍")]
+ [Serializable]
+ [SugarTable("MES_WIP_PKG")]
+ public class MES_WIP_PKG : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
+ /// </summary>
+ public MES_WIP_PKG() { }
+ #endregion
- #region 鍏叡灞炴��
- /// <summary>
- /// 鏉＄爜
- /// </summary>
- [DisplayName("鏉＄爜")]
- public string SN { get; set; }
- /// <summary>
- /// 鐖跺寘瑁呮潯鐮�
- /// </summary>
- [DisplayName("鐖跺寘瑁呮潯鐮�")]
- public string PARENT_SN { get; set; }
- /// <summary>
- /// 鍖呰绫诲瀷
- /// </summary>
- [DisplayName("鍖呰绫诲瀷")]
- public string PKG_TYPE { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [DisplayName("鏁伴噺")]
- public double QTY { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [DisplayName("鍗曚綅")]
- public string UNIT { get; set; }
- /// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
- [DisplayName("宸ュ崟鍙�")]
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 宸ュ崟鎵规鍙�
- /// </summary>
- [DisplayName("宸ュ崟鎵规鍙�")]
- public string BATCH_NO { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎缂栫爜
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎缂栫爜")]
- public string ROT_CODE { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣ID
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
- public string NODE_ID { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
- public string NODE_NAME { get; set; }
- /// <summary>
- /// 宸ュ巶缂栫爜
- /// </summary>
- [DisplayName("宸ュ巶缂栫爜")]
- public string FTY_CODE { get; set; }
- /// <summary>
- /// 杞﹂棿缂栫爜
- /// </summary>
- [DisplayName("杞﹂棿缂栫爜")]
- public string WS_CODE { get; set; }
- /// <summary>
- /// 浜х嚎缂栫爜
- /// </summary>
- [DisplayName("浜х嚎缂栫爜")]
- public string LINE_CODE { get; set; }
- /// <summary>
- /// 宀椾綅缂栫爜
- /// </summary>
- [DisplayName("宀椾綅缂栫爜")]
- public string POST_CODE { get; set; }
- /// <summary>
- /// 宸ュ簭缂栫爜
- /// </summary>
- [DisplayName("宸ュ簭缂栫爜")]
- public string OPER_CODE { get; set; }
- /// <summary>
- /// 鍔犲伐娈�
- /// </summary>
- [DisplayName("鍔犲伐娈�")]
- public string SEGMENT { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [DisplayName("澶囨敞")]
- public string REMARK { get; set; }
- /// <summary>
- /// 杩芥函淇℃伅
- /// </summary>
- [DisplayName("杩芥函淇℃伅")]
- public string TRACE_INFO { get; set; }
- #endregion
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 琚寘瑁呮潯鐮�
+ /// </summary>
+ [DisplayName("琚寘瑁呮潯鐮�")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 鐖跺寘瑁呮潯鐮�(鏈�澶栧眰鍖呰鐣欑┖)
+ /// </summary>
+ [DisplayName("鐖跺寘瑁呮潯鐮�(鏈�澶栧眰鍖呰鐣欑┖)")]
+ public string PARENT_SN { get; set; }
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D(涓嶆槸鏈�灏忓寘瑁呭垯鐣欑┖)
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D(涓嶆槸鏈�灏忓寘瑁呭垯鐣欑┖)")]
+ public string WIP_ID { get; set; }
+ /// <summary>
+ /// 鍖呰绫诲瀷
+ /// </summary>
+ [DisplayName("鍖呰绫诲瀷")]
+ public string PKG_TYPE { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [DisplayName("鏁伴噺")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [DisplayName("鍗曚綅")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鍙�")]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 宸ュ崟鎵规鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鎵规鍙�")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎缂栫爜
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { get; set; }
+ /// <summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
+ [DisplayName("宸ュ巶缂栫爜")]
+ public string FTY_CODE { get; set; }
+ /// <summary>
+ /// 杞﹂棿缂栫爜
+ /// </summary>
+ [DisplayName("杞﹂棿缂栫爜")]
+ public string WS_CODE { get; set; }
+ /// <summary>
+ /// 浜х嚎缂栫爜
+ /// </summary>
+ [DisplayName("浜х嚎缂栫爜")]
+ public string LINE_CODE { get; set; }
+ /// <summary>
+ /// 宀椾綅缂栫爜
+ /// </summary>
+ [DisplayName("宀椾綅缂栫爜")]
+ public string POST_CODE { get; set; }
+ /// <summary>
+ /// 宸ュ簭缂栫爜
+ /// </summary>
+ [DisplayName("宸ュ簭缂栫爜")]
+ public string OPER_CODE { get; set; }
+ /// <summary>
+ /// 鍔犲伐娈�
+ /// </summary>
+ [DisplayName("鍔犲伐娈�")]
+ public string SEGMENT { get; set; }
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ [DisplayName("閲嶉噺")]
+ public double WEIGHT { get; set; }
+ /// <summary>
+ /// 閲嶉噺鍗曚綅
+ /// </summary>
+ [DisplayName("閲嶉噺鍗曚綅")]
+ public string WEIGHT_UNIT { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// 杩芥函淇℃伅
+ /// </summary>
+ [DisplayName("杩芥函淇℃伅")]
+ public string TRACE_INFO { get; set; }
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ [SugarColumn(IsIgnore = true)]
+ public string ACT_ID { get; set; }
+ [SugarColumn(IsIgnore = true)]
+ public string FLOW_SN { get; set; }
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_PKG绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -139,10 +158,10 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_PKGId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -151,12 +170,11 @@
Enum1,
}
*/
+ #endregion
- #endregion
+ #region 鍏叡鏂规硶
- #region 鍏叡鏂规硶
+ #endregion
- #endregion
-
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3