From 1fe7c9ad8caab3db17369062b52a9c35e3aee187 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期一, 10 三月 2025 14:54:51 +0800 Subject: [PATCH] 更新实体 --- Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_DTL.cs | 143 +++++---- /dev/null | 151 ---------- Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs | 161 ++++++----- Tiger.Model.Net/Base/iBizOrder.cs | 16 + Tiger.Model.Net/Entitys/MES/YadaU9/mes_AsnDocInfo.cs | 76 ++-- Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs | 135 +++++---- Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs | 127 ++++---- Tiger.Model.Net/Tiger.Model.Net.csproj | 3 Tiger.Model.Net/Entitys/MES/ParameterEntity/MESDTO.cs | 0 Tiger.Model.Net/Entitys/MES/YadaU9/mes_ReturnedDocInfo.cs | 16 + Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs | 2 11 files changed, 371 insertions(+), 459 deletions(-) diff --git a/Tiger.Model.Net/Base/iBizOrder.cs b/Tiger.Model.Net/Base/iBizOrder.cs new file mode 100644 index 0000000..b4a276f --- /dev/null +++ b/Tiger.Model.Net/Base/iBizOrder.cs @@ -0,0 +1,16 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tiger.Model.Base +{ + /// <summary> + /// 涓氬姟鍗曟嵁鍩虹被鎺ュ彛 + /// </summary> + public interface iBizOrder + { + string ORDER_NO { get; set; } + } +} diff --git a/Tiger.Model.Net/Entitys/BIZ_U9_RETURN.cs b/Tiger.Model.Net/Entitys/BIZ_U9_RETURN.cs deleted file mode 100644 index af9b165..0000000 --- a/Tiger.Model.Net/Entitys/BIZ_U9_RETURN.cs +++ /dev/null @@ -1,151 +0,0 @@ -using System; -using SqlSugar; -using System.Linq; -using System.ComponentModel; -using System.Collections.Generic; - -namespace Tiger.Model -{ - /// <summary> - /// 实体:退货单(U9) - /// </summary> - [Description("Primary:ID")] - [DisplayName("退货单(U9)")] - [Serializable] - [SugarTable("BIZ_U9_RETURN")] - public class BIZ_U9_RETURN : DbEntityWithAuth - { - #region 构造函数 - /// <summary> - /// 实体:退货单(U9) - /// </summary> - public BIZ_U9_RETURN() {} - #endregion - - #region 公共属性 - /// <summary> - /// 单据号 - /// </summary> - [DisplayName("单据号")] - public string ORDER_NO { get; set; } - /// <summary> - /// 状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废) - /// </summary> - [DisplayName("状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)")] - public int STATUS { get; set; } - /// <summary> - /// 供应商编码 - /// </summary> - [DisplayName("供应商编码")] - public string SUPP_CODE { get; set; } - /// <summary> - /// 供应商名称 - /// </summary> - [DisplayName("供应商名称")] - public string SUPP_NAME { get; set; } - /// <summary> - /// 单据日期 - /// </summary> - [DisplayName("单据日期")] - public DateTime ORDER_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 收货人 - /// </summary> - [DisplayName("收货人")] - public string RECEIVER { get; set; } - /// <summary> - /// 收货日期 - /// </summary> - [DisplayName("收货日期")] - public DateTime RECEIVE_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 备注 - /// </summary> - [DisplayName("备注")] - public string REMARK { get; set; } - /// <summary> - /// -1:未处理,0:同步处理完,>0:同步处理失败次数 - /// </summary> - [DisplayName("-1:未处理,0:同步处理完,>0:同步处理失败次数")] - public int HANDLED { get; set; } = -1; - /// <summary> - /// 最后一次同步处理日期 - /// </summary> - [DisplayName("最后一次同步处理日期")] - public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 过账提交的JSON - /// </summary> - [DisplayName("过账提交的JSON")] - public string COMMIT_JSON { get; set; } - /// <summary> - /// 过账提交的返回信息 - /// </summary> - [DisplayName("过账提交的返回信息")] - public string COMMIT_MSG { get; set; } - #endregion - - #region 虚拟属性 - /*例子 - [SugarColumn(IsIgnore = true)] - public string FieldName { get; set; } - */ - #endregion - - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RETURN类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURNId))]//ClassA表中的BIZ_U9_RETURNId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURNId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null - */ - #endregion - - #region 枚举变量 - /*例子 - public enum FieldNames - { - [Description("枚举描述0")] - Enum0, - [Description("枚举描述1")] - Enum1, - } - */ - - /// <summary> - /// 枚举:状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废) - /// </summary> - public enum STATUSs - { - [Description("初始化")] - Init = 0, - [Description("已导入")] - Imported = 1, - [Description("已送达")] - Arrived = 2, - [Description("清点中")] - Counting = 3, - [Description("检验中")] - InQC = 4, - [Description("上架中")] - Storing = 5, - [Description("待审核")] - Review = 6, - [Description("已完成")] - Finished = 7, - [Description("已作废")] - Cancel = 8, - } - #endregion - - #region 公共方法 - - #endregion - - }//endClass -} \ No newline at end of file diff --git a/Tiger.Model.Net/DTO/MESDTO.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/MESDTO.cs similarity index 100% rename from Tiger.Model.Net/DTO/MESDTO.cs rename to Tiger.Model.Net/Entitys/MES/ParameterEntity/MESDTO.cs diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_AsnDocInfo.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_AsnDocInfo.cs index f5ec57d..a29caa1 100644 --- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_AsnDocInfo.cs +++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_AsnDocInfo.cs @@ -8,126 +8,126 @@ namespace Tiger.Model.MES.Yada { /// <summary> - /// 瀹炰綋锛歮es_AsnDocInfo + /// 实体:mes_AsnDocInfo /// </summary> [Serializable] [SugarTable("mes_AsnDocInfo")] public class mes_AsnDocInfo : iViewEntity { - #region 鏋勯�犲嚱鏁� + #region 构造函数 /// <summary> - /// 瀹炰綋锛歮es_AsnDocInfo + /// 实体:mes_AsnDocInfo /// </summary> public mes_AsnDocInfo() {} #endregion - #region 鍏叡灞炴�� + #region 公共属性 /// <summary> - /// 缁勭粐 + /// 组织 /// </summary> public long Org { get; set; } - /// <summary> - /// 鍗旾D - /// </summary> - public string AsnId { get; set; } - /// <summary> - /// 鍗曞彿 - /// </summary> - public string DocNo { get; set; } /// <summary> - /// 渚涘簲鍟嗙紪鐮� + /// 单ID + /// </summary> + public long AsnId { get; set; } + /// <summary> + /// 单号 + /// </summary> + public string DocNo { get; set; } + /// <summary> + /// 供应商编码 /// </summary> public string SupplierCode { get; set; } /// <summary> - /// 渚涘簲鍟嗗悕瀛� + /// 供应商名字 /// </summary> public string SupplierName { get; set; } /// <summary> - /// 鍙戣揣鏃ユ湡 + /// 发货日期 /// </summary> public DateTime ShipDate { get; set; } = DateTime.MinValue; /// <summary> - /// 棰勮閫佽揪鏃ユ湡 + /// 预计送达日期 /// </summary> public DateTime PlanArriveDate { get; set; } = DateTime.MinValue; /// <summary> - /// 鐘舵�� + /// 状态 /// </summary> public int Status { get; set; } /// <summary> - /// 琛孖D + /// 行ID /// </summary> public long LineID { get; set; } /// <summary> - /// 琛屽彿 + /// 行号 /// </summary> public int DocLineNo { get; set; } /// <summary> - /// 鏂欏彿 + /// 料号 /// </summary> public string ItemCode { get; set; } /// <summary> - /// sap鏂欏彿 + /// sap料号 /// </summary> public string ItemCode1 { get; set; } /// <summary> - /// 鍝佸悕 + /// 品名 /// </summary> public string ItemName { get; set; } /// <summary> - /// 鏂欏搧鎻忚堪 + /// 料品描述 /// </summary> public string ItemDescription { get; set; } /// <summary> - /// 閲囪喘鏁伴噺 + /// 采购数量 /// </summary> public decimal POQtyTU { get; set; } /// <summary> - /// 鏈�灏忓寘瑁呮暟閲� + /// 最小包装数量 /// </summary> public string PackQty { get; set; } /// <summary> - /// 鐢熶骇鎵瑰彿(渚涘簲鍟�) + /// 生产批号(供应商) /// </summary> public string SupplierLot { get; set; } /// <summary> - /// 鎵瑰彿 + /// 批号 /// </summary> public string LotMater { get; set; } /// <summary> - /// 鏇存柊浜� + /// 更新人 /// </summary> public string ModifiedBy { get; set; } /// <summary> - /// 鏇存柊鏃堕棿 + /// 更新时间 /// </summary> public DateTime ModifiedOn { get; set; } = DateTime.MinValue; /// <summary> - /// 鍗曚綅ID + /// 单位ID /// </summary> public long TradeUOM { get; set; } #endregion - #region 铏氭嫙灞炴�� - /*渚嬪瓙 + #region 虚拟属性 + /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion - #region 鏋氫妇鍙橀噺 - /*渚嬪瓙 + #region 枚举变量 + /*例子 public enum FieldNames { - [Description("鏋氫妇鎻忚堪0")] + [Description("枚举描述0")] Enum0, - [Description("鏋氫妇鎻忚堪1")] + [Description("枚举描述1")] Enum1, } */ #endregion - #region 鍏叡鏂规硶 + #region 公共方法 #endregion diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ReturnedDocInfo.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ReturnedDocInfo.cs index 7ce2808..458e83b 100644 --- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ReturnedDocInfo.cs +++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ReturnedDocInfo.cs @@ -86,6 +86,22 @@ /// ASN单行ID /// </summary> public long SrcASNDocLineId { get; set; } + /// <summary> + /// 创建时间 + /// </summary> + public DateTime CreatedOn { get; set; } = DateTime.MinValue; + /// <summary> + /// 创建人 + /// </summary> + public string CreatedBy { get; set; } + /// <summary> + /// 更新时间 + /// </summary> + public DateTime ModifiedOn { get; set; } = DateTime.MinValue; + /// <summary> + /// 更新人 + /// </summary> + public string ModifiedBy { get; set; } #endregion #region 虚拟属性 diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs index ba41393..5cf299d 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN.cs @@ -3,167 +3,182 @@ using System.Linq; using System.ComponentModel; using System.Collections.Generic; +using Tiger.Model.Base; namespace Tiger.Model { /// <summary> - /// 实体:送货单(U9) + /// 瀹炰綋锛氶�佽揣鍗�(U9) /// </summary> [Description("Primary:ID")] - [DisplayName("送货单(U9)")] + [DisplayName("閫佽揣鍗�(U9)")] [Serializable] [SugarTable("BIZ_U9_ASN")] - public class BIZ_U9_ASN : DbEntityWithAuth - { - #region 构造函数 + public class BIZ_U9_ASN : DbEntityWithAuth, iBizOrder + { + #region 鏋勯�犲嚱鏁� /// <summary> - /// 实体:送货单(U9) + /// 瀹炰綋锛氶�佽揣鍗�(U9) /// </summary> public BIZ_U9_ASN() {} #endregion - #region 公共属性 + #region 鍏叡灞炴�� /// <summary> - /// 单据号 + /// 鍗曟嵁鍙� /// </summary> - [DisplayName("单据号")] + [DisplayName("鍗曟嵁鍙�")] public string ORDER_NO { get; set; } /// <summary> - /// 状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废) + /// 鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�) /// </summary> - [DisplayName("状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)")] + [DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�)")] public int STATUS { get; set; } /// <summary> - /// 供应商编码 + /// 渚涘簲鍟嗙紪鐮� /// </summary> - [DisplayName("供应商编码")] + [DisplayName("渚涘簲鍟嗙紪鐮�")] public string SUPP_CODE { get; set; } /// <summary> - /// 供应商名称 + /// 渚涘簲鍟嗗悕绉� /// </summary> - [DisplayName("供应商名称")] + [DisplayName("渚涘簲鍟嗗悕绉�")] public string SUPP_NAME { get; set; } /// <summary> - /// 单据日期 + /// 鍗曟嵁鏃ユ湡 /// </summary> - [DisplayName("单据日期")] + [DisplayName("鍗曟嵁鏃ユ湡")] public DateTime ORDER_DATE { get; set; } = DateTime.MinValue; /// <summary> - /// 送货日期 + /// 閫佽揣鏃ユ湡 /// </summary> - [DisplayName("送货日期")] + [DisplayName("閫佽揣鏃ユ湡")] public DateTime DELIVERY_DATE { get; set; } = DateTime.MinValue; /// <summary> - /// 预计送达日期 + /// 棰勮閫佽揪鏃ユ湡 /// </summary> - [DisplayName("预计送达日期")] + [DisplayName("棰勮閫佽揪鏃ユ湡")] public DateTime PLANARRIVED_DATE { get; set; } = DateTime.MinValue; /// <summary> - /// 采购单ID + /// 閲囪喘鍗旾D /// </summary> - [DisplayName("采购单ID")] + [DisplayName("閲囪喘鍗旾D")] public string PO_ID { get; set; } /// <summary> - /// 采购单号 + /// 閲囪喘鍗曞彿 /// </summary> - [DisplayName("采购单号")] + [DisplayName("閲囪喘鍗曞彿")] public string PO_NO { get; set; } /// <summary> - /// 收货人 + /// 鏀惰揣鍗旾D /// </summary> - [DisplayName("收货人")] + [DisplayName("鏀惰揣鍗旾D")] + public string RECEIVER_ID { get; set; } + /// <summary> + /// 鏀惰揣鍗曞彿 + /// </summary> + [DisplayName("鏀惰揣鍗曞彿")] + public string RECEIVER_NO { get; set; } + /// <summary> + /// 鏀惰揣浜� + /// </summary> + [DisplayName("鏀惰揣浜�")] public string RECEIVER { get; set; } /// <summary> - /// 收货日期 + /// 鏀惰揣鏃ユ湡 /// </summary> - [DisplayName("收货日期")] + [DisplayName("鏀惰揣鏃ユ湡")] public DateTime RECEIVE_DATE { get; set; } = DateTime.MinValue; /// <summary> - /// 备注 + /// 澶囨敞 /// </summary> - [DisplayName("备注")] + [DisplayName("澶囨敞")] public string REMARK { get; set; } /// <summary> - /// -1:未处理,0:同步处理完,>0:同步处理失败次数 + /// -1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟 /// </summary> - [DisplayName("-1:未处理,0:同步处理完,>0:同步处理失败次数")] + [DisplayName("-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟")] public int HANDLED { get; set; } = -1; /// <summary> - /// 最后一次同步处理日期 + /// 鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈� /// </summary> - [DisplayName("最后一次同步处理日期")] + [DisplayName("鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�")] public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue; /// <summary> - /// 过账提交的JSON + /// 杩囪处鎻愪氦鐨凧SON /// </summary> - [DisplayName("过账提交的JSON")] + [DisplayName("杩囪处鎻愪氦鐨凧SON")] public string COMMIT_JSON { get; set; } /// <summary> - /// 过账提交的返回信息 + /// 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭� /// </summary> - [DisplayName("过账提交的返回信息")] + [DisplayName("杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�")] public string COMMIT_MSG { get; set; } - #endregion + #endregion - #region 虚拟属性 - /*例子 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ - #endregion + #endregion - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_ASN类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_ASNId))]//ClassA表中的BIZ_U9_ASNId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_ASNId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_ASN绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_ASNId))]//ClassA琛ㄤ腑鐨凚IZ_U9_ASNId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_ASNId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 + public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull */ - #endregion + [Navigate(NavigateType.OneToMany, nameof(BIZ_U9_ASN_DTL.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_ASN绫婚噷闈㈢殑澶栭敭ID瀛楁 + public BIZ_U9_ASN_DTL Details { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + [Navigate(NavigateType.OneToMany, nameof(BIZ_U9_ASN_SN.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_ASN绫婚噷闈㈢殑澶栭敭ID瀛楁 + public BIZ_U9_ASN_SN SnList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - /// <summary> - /// 枚举:状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废) - /// </summary> - public enum STATUSs + /// <summary> + /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Imported宸插鍏2Arrived宸查�佽揪|3Counting娓呯偣涓瓅4InQC妫�楠屼腑|5Storing涓婃灦涓瓅6Review寰呭鏍竱7Finished宸插畬鎴恷8Cancel宸蹭綔搴�) + /// </summary> + public enum STATUSs { - [Description("初始化")] + [Description("鍒濆鍖�")] Init = 0, - [Description("已导入")] + [Description("宸插鍏�")] Imported = 1, - [Description("已送达")] + [Description("宸查�佽揪")] Arrived = 2, - [Description("清点中")] + [Description("娓呯偣涓�")] Counting = 3, - [Description("检验中")] + [Description("妫�楠屼腑")] InQC = 4, - [Description("上架中")] + [Description("涓婃灦涓�")] Storing = 5, - [Description("待审核")] + [Description("寰呭鏍�")] Review = 6, - [Description("已完成")] + [Description("宸插畬鎴�")] Finished = 7, - [Description("已作废")] + [Description("宸蹭綔搴�")] Cancel = 8, } #endregion - #region 公共方法 + #region 鍏叡鏂规硶 #endregion diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_DTL.cs index 98ab4e3..7300c8e 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_DTL.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_ASN_DTL.cs @@ -7,126 +7,131 @@ namespace Tiger.Model { /// <summary> - /// 实体:送货单(U9)明细 + /// 瀹炰綋锛氶�佽揣鍗�(U9)鏄庣粏 /// </summary> [Description("Primary:ID")] - [DisplayName("送货单(U9)明细")] + [DisplayName("閫佽揣鍗�(U9)鏄庣粏")] [Serializable] [SugarTable("BIZ_U9_ASN_DTL")] public class BIZ_U9_ASN_DTL : DbEntityWithAuth { - #region 构造函数 + #region 鏋勯�犲嚱鏁� /// <summary> - /// 实体:送货单(U9)明细 + /// 瀹炰綋锛氶�佽揣鍗�(U9)鏄庣粏 /// </summary> public BIZ_U9_ASN_DTL() {} #endregion - #region 公共属性 + #region 鍏叡灞炴�� /// <summary> - /// 单据号 + /// 鍗曟嵁鍙� /// </summary> - [DisplayName("单据号")] + [DisplayName("鍗曟嵁鍙�")] public string ORDER_NO { get; set; } /// <summary> - /// 单据行号 + /// 鍗曟嵁琛屽彿 /// </summary> - [DisplayName("单据行号")] + [DisplayName("鍗曟嵁琛屽彿")] public string LINE_NO { get; set; } /// <summary> - /// 状态(同单据状态) + /// 鐘舵��(鍚屽崟鎹姸鎬�) /// </summary> - [DisplayName("状态(同单据状态)")] + [DisplayName("鐘舵��(鍚屽崟鎹姸鎬�)")] public int STATUS { get; set; } /// <summary> - /// 物料编码 + /// 鐗╂枡缂栫爜 /// </summary> - [DisplayName("物料编码")] + [DisplayName("鐗╂枡缂栫爜")] public string ITEM_CODE { get; set; } /// <summary> - /// 单位 + /// 鍗曚綅 /// </summary> - [DisplayName("单位")] + [DisplayName("鍗曚綅")] public string UNIT { get; set; } /// <summary> - /// 单据数量 + /// 鍗曟嵁鏁伴噺 /// </summary> - [DisplayName("单据数量")] + [DisplayName("鍗曟嵁鏁伴噺")] public double QTY { get; set; } /// <summary> - /// 包装数量 + /// 鍖呰鏁伴噺 /// </summary> - [DisplayName("包装数量")] + [DisplayName("鍖呰鏁伴噺")] public double QTY_PACKING { get; set; } /// <summary> - /// 入库数量 + /// 鍏ュ簱鏁伴噺 /// </summary> - [DisplayName("入库数量")] + [DisplayName("鍏ュ簱鏁伴噺")] public double QTY_IN { get; set; } /// <summary> - /// 良品数量 + /// 鑹搧鏁伴噺 /// </summary> - [DisplayName("良品数量")] + [DisplayName("鑹搧鏁伴噺")] public double QTY_OK { get; set; } /// <summary> - /// 退货数量 + /// 閫�璐ф暟閲� /// </summary> - [DisplayName("退货数量")] + [DisplayName("閫�璐ф暟閲�")] public double QTY_RETURN { get; set; } /// <summary> - /// 是否赠品(Y/N) + /// 鏄惁璧犲搧(Y/N) /// </summary> - [DisplayName("是否赠品(Y/N)")] + [DisplayName("鏄惁璧犲搧(Y/N)")] public string IS_GIFT { get; set; } /// <summary> - /// 供应商编码 + /// 渚涘簲鍟嗙紪鐮� /// </summary> - [DisplayName("供应商编码")] + [DisplayName("渚涘簲鍟嗙紪鐮�")] public string SUPP_CODE { get; set; } /// <summary> - /// 供应商批次号 + /// 渚涘簲鍟嗘壒娆″彿 /// </summary> - [DisplayName("供应商批次号")] + [DisplayName("渚涘簲鍟嗘壒娆″彿")] public string SUPP_LOTNO { get; set; } /// <summary> - /// 批次号 + /// 鎵规鍙� /// </summary> - [DisplayName("批次号")] + [DisplayName("鎵规鍙�")] public string LOTNO { get; set; } /// <summary> - /// 采购单ID + /// 閲囪喘鍗旾D /// </summary> - [DisplayName("采购单ID")] + [DisplayName("閲囪喘鍗旾D")] public string PO_ID { get; set; } /// <summary> - /// 采购单号 + /// 閲囪喘鍗曞彿 /// </summary> - [DisplayName("采购单号")] + [DisplayName("閲囪喘鍗曞彿")] public string PO_NO { get; set; } /// <summary> - /// 采购单行号 + /// 閲囪喘鍗曡鍙� /// </summary> - [DisplayName("采购单行号")] + [DisplayName("閲囪喘鍗曡鍙�")] public string PO_LINE { get; set; } /// <summary> - /// 送检单ID + /// 閫佹鍗旾D /// </summary> - [DisplayName("送检单ID")] + [DisplayName("閫佹鍗旾D")] public string IQC_ID { get; set; } /// <summary> - /// 送检单号 + /// 閫佹鍗曞彿 /// </summary> - [DisplayName("送检单号")] + [DisplayName("閫佹鍗曞彿")] public string IQC_NO { get; set; } /// <summary> - /// 备注 + /// ERP缂栫爜 /// </summary> - [DisplayName("备注")] + [DisplayName("ERP缂栫爜")] + public string ERP_CODE { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] public string REMARK { get; set; } - #endregion + #endregion - #region 虚拟属性 - /*例子 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ @@ -136,39 +141,39 @@ public string ITEM_DESC => ItemInfo?.ITEM_DESC; #endregion - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_ASN_DTL类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_ASN_DTLId))]//ClassA表中的BIZ_U9_ASN_DTLId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_ASN_DTLId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_ASN_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_ASN_DTLId))]//ClassA琛ㄤ腑鐨凚IZ_U9_ASN_DTLId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_ASN_DTLId), 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是MES_WIP_DATA类里面的外键ID字段 - public List<BAS_ITEM> _ItemInfos { get; set; } //注意禁止手动赋值,只能是null + [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁 + public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull [SugarColumn(IsIgnore = true)] public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG); #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - #endregion + #endregion - #region 公共方法 + #region 鍏叡鏂规硶 - #endregion + #endregion - }//endClass + }//endClass } \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs index b1b189b..d625302 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RECEIPT_DTL.cs @@ -7,116 +7,121 @@ namespace Tiger.Model { /// <summary> - /// 实体:收货单(U9)明细 + /// 瀹炰綋锛氭敹璐у崟(U9)鏄庣粏 /// </summary> [Description("Primary:ID")] - [DisplayName("收货单(U9)明细")] + [DisplayName("鏀惰揣鍗�(U9)鏄庣粏")] [Serializable] [SugarTable("BIZ_U9_RECEIPT_DTL")] public class BIZ_U9_RECEIPT_DTL : DbEntityWithAuth { - #region 构造函数 + #region 鏋勯�犲嚱鏁� /// <summary> - /// 实体:收货单(U9)明细 + /// 瀹炰綋锛氭敹璐у崟(U9)鏄庣粏 /// </summary> public BIZ_U9_RECEIPT_DTL() {} #endregion - #region 公共属性 + #region 鍏叡灞炴�� /// <summary> - /// 单据号 + /// 鍗曟嵁鍙� /// </summary> - [DisplayName("单据号")] + [DisplayName("鍗曟嵁鍙�")] public string ORDER_NO { get; set; } /// <summary> - /// 单据行号 + /// 鍗曟嵁琛屽彿 /// </summary> - [DisplayName("单据行号")] + [DisplayName("鍗曟嵁琛屽彿")] public string LINE_NO { get; set; } /// <summary> - /// 状态(同单据状态) + /// 鐘舵��(鍚屽崟鎹姸鎬�) /// </summary> - [DisplayName("状态(同单据状态)")] + [DisplayName("鐘舵��(鍚屽崟鎹姸鎬�)")] public int STATUS { get; set; } /// <summary> - /// 物料编码 + /// 鐗╂枡缂栫爜 /// </summary> - [DisplayName("物料编码")] + [DisplayName("鐗╂枡缂栫爜")] public string ITEM_CODE { get; set; } /// <summary> - /// 单位 + /// 鍗曚綅 /// </summary> - [DisplayName("单位")] + [DisplayName("鍗曚綅")] public string UNIT { get; set; } /// <summary> - /// 单据数量 + /// 鍗曟嵁鏁伴噺 /// </summary> - [DisplayName("单据数量")] + [DisplayName("鍗曟嵁鏁伴噺")] public double QTY { get; set; } /// <summary> - /// 包装数量 + /// 鍖呰鏁伴噺 /// </summary> - [DisplayName("包装数量")] + [DisplayName("鍖呰鏁伴噺")] public double QTY_PACKING { get; set; } /// <summary> - /// 入库数量 + /// 鍏ュ簱鏁伴噺 /// </summary> - [DisplayName("入库数量")] + [DisplayName("鍏ュ簱鏁伴噺")] public double QTY_IN { get; set; } /// <summary> - /// 良品数量 + /// 鑹搧鏁伴噺 /// </summary> - [DisplayName("良品数量")] + [DisplayName("鑹搧鏁伴噺")] public double QTY_OK { get; set; } /// <summary> - /// 不良数量 + /// 涓嶈壇鏁伴噺 /// </summary> - [DisplayName("不良数量")] + [DisplayName("涓嶈壇鏁伴噺")] public double QTY_NG { get; set; } /// <summary> - /// 报废数量 + /// 鎶ュ簾鏁伴噺 /// </summary> - [DisplayName("报废数量")] + [DisplayName("鎶ュ簾鏁伴噺")] public double QTY_SCRAP { get; set; } /// <summary> - /// 批次号 + /// 鎵规鍙� /// </summary> - [DisplayName("批次号")] + [DisplayName("鎵规鍙�")] public string LOTNO { get; set; } /// <summary> - /// 送货单ID + /// 閫佽揣鍗旾D /// </summary> - [DisplayName("送货单ID")] + [DisplayName("閫佽揣鍗旾D")] public string ASN_ID { get; set; } /// <summary> - /// 送货单号 + /// 閫佽揣鍗曞彿 /// </summary> - [DisplayName("送货单号")] + [DisplayName("閫佽揣鍗曞彿")] public string ASN_NO { get; set; } /// <summary> - /// 送货单行ID + /// 閫佽揣鍗曡ID /// </summary> - [DisplayName("送货单行ID")] + [DisplayName("閫佽揣鍗曡ID")] public string ASN_LINE_ID { get; set; } /// <summary> - /// 送货单行号 + /// 閫佽揣鍗曡鍙� /// </summary> - [DisplayName("送货单行号")] + [DisplayName("閫佽揣鍗曡鍙�")] public string ASN_LINE { get; set; } /// <summary> - /// 送检单号 + /// 閫佹鍗曞彿 /// </summary> - [DisplayName("送检单号")] + [DisplayName("閫佹鍗曞彿")] public string IQC_ORDER { get; set; } /// <summary> - /// 备注 + /// ERP缂栫爜 /// </summary> - [DisplayName("备注")] + [DisplayName("ERP缂栫爜")] + public string ERP_CODE { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] public string REMARK { get; set; } - #endregion + #endregion - #region 虚拟属性 - /*例子 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ @@ -126,39 +131,39 @@ public string ITEM_DESC => ItemInfo?.ITEM_DESC; #endregion - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RECEIPT_DTL类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RECEIPT_DTLId))]//ClassA表中的BIZ_U9_RECEIPT_DTLId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RECEIPT_DTLId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RECEIPT_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RECEIPT_DTLId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RECEIPT_DTLId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RECEIPT_DTLId), 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是MES_WIP_DATA类里面的外键ID字段 - public List<BAS_ITEM> _ItemInfos { get; set; } //注意禁止手动赋值,只能是null + [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁 + public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull [SugarColumn(IsIgnore = true)] public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG); #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - #endregion + #endregion - #region 公共方法 + #region 鍏叡鏂规硶 - #endregion + #endregion - }//endClass + }//endClass } \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs index 78200d9..af9b165 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN.cs @@ -67,7 +67,7 @@ /// -1:未处理,0:同步处理完,>0:同步处理失败次数 /// </summary> [DisplayName("-1:未处理,0:同步处理完,>0:同步处理失败次数")] - public int HANDLED { get; set; } + public int HANDLED { get; set; } = -1; /// <summary> /// 最后一次同步处理日期 /// </summary> diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs index f02e5d7..c28ee5b 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RETURN_DTL.cs @@ -7,106 +7,111 @@ namespace Tiger.Model { /// <summary> - /// 实体:退货单(U9)明细 + /// 瀹炰綋锛氶��璐у崟(U9)鏄庣粏 /// </summary> [Description("Primary:ID")] - [DisplayName("退货单(U9)明细")] + [DisplayName("閫�璐у崟(U9)鏄庣粏")] [Serializable] [SugarTable("BIZ_U9_RETURN_DTL")] public class BIZ_U9_RETURN_DTL : DbEntityWithAuth { - #region 构造函数 + #region 鏋勯�犲嚱鏁� /// <summary> - /// 实体:退货单(U9)明细 + /// 瀹炰綋锛氶��璐у崟(U9)鏄庣粏 /// </summary> public BIZ_U9_RETURN_DTL() {} #endregion - #region 公共属性 + #region 鍏叡灞炴�� /// <summary> - /// 单据号 + /// 鍗曟嵁鍙� /// </summary> - [DisplayName("单据号")] + [DisplayName("鍗曟嵁鍙�")] public string ORDER_NO { get; set; } /// <summary> - /// 单据行号 + /// 鍗曟嵁琛屽彿 /// </summary> - [DisplayName("单据行号")] + [DisplayName("鍗曟嵁琛屽彿")] public string LINE_NO { get; set; } /// <summary> - /// 状态(同单据状态) + /// 鐘舵��(鍚屽崟鎹姸鎬�) /// </summary> - [DisplayName("状态(同单据状态)")] + [DisplayName("鐘舵��(鍚屽崟鎹姸鎬�)")] public int STATUS { get; set; } /// <summary> - /// 物料编码 + /// 鐗╂枡缂栫爜 /// </summary> - [DisplayName("物料编码")] + [DisplayName("鐗╂枡缂栫爜")] public string ITEM_CODE { get; set; } /// <summary> - /// 单位 + /// 鍗曚綅 /// </summary> - [DisplayName("单位")] + [DisplayName("鍗曚綅")] public string UNIT { get; set; } /// <summary> - /// 单据数量 + /// 鍗曟嵁鏁伴噺 /// </summary> - [DisplayName("单据数量")] + [DisplayName("鍗曟嵁鏁伴噺")] public double QTY { get; set; } /// <summary> - /// 包装数量 + /// 鍖呰鏁伴噺 /// </summary> - [DisplayName("包装数量")] + [DisplayName("鍖呰鏁伴噺")] public double QTY_PACKING { get; set; } /// <summary> - /// 入库数量 + /// 鍏ュ簱鏁伴噺 /// </summary> - [DisplayName("入库数量")] + [DisplayName("鍏ュ簱鏁伴噺")] public double QTY_IN { get; set; } /// <summary> - /// 良品数量 + /// 鑹搧鏁伴噺 /// </summary> - [DisplayName("良品数量")] + [DisplayName("鑹搧鏁伴噺")] public double QTY_OK { get; set; } /// <summary> - /// 不良数量 + /// 涓嶈壇鏁伴噺 /// </summary> - [DisplayName("不良数量")] + [DisplayName("涓嶈壇鏁伴噺")] public double QTY_NG { get; set; } /// <summary> - /// 报废数量 + /// 鎶ュ簾鏁伴噺 /// </summary> - [DisplayName("报废数量")] + [DisplayName("鎶ュ簾鏁伴噺")] public double QTY_SCRAP { get; set; } /// <summary> - /// 批次号 + /// 鎵规鍙� /// </summary> - [DisplayName("批次号")] + [DisplayName("鎵规鍙�")] public string LOTNO { get; set; } /// <summary> - /// 采购单号 + /// 閲囪喘鍗曞彿 /// </summary> - [DisplayName("采购单号")] + [DisplayName("閲囪喘鍗曞彿")] public string SALE_ORDER { get; set; } /// <summary> - /// 采购单行号 + /// 閲囪喘鍗曡鍙� /// </summary> - [DisplayName("采购单行号")] + [DisplayName("閲囪喘鍗曡鍙�")] public string SALE_LINE { get; set; } /// <summary> - /// 送检单号 + /// 閫佹鍗曞彿 /// </summary> - [DisplayName("送检单号")] + [DisplayName("閫佹鍗曞彿")] public string IQC_ORDER { get; set; } /// <summary> - /// 备注 + /// ERP缂栫爜 /// </summary> - [DisplayName("备注")] + [DisplayName("ERP缂栫爜")] + public string ERP_CODE { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] public string REMARK { get; set; } - #endregion + #endregion - #region 虚拟属性 - /*例子 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ @@ -116,39 +121,39 @@ public string ITEM_DESC => ItemInfo?.ITEM_DESC; #endregion - #region 外键属性 - /*例子 - //一对一外键导航 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RETURN_DTL类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURN_DTLId))]//ClassA表中的BIZ_U9_RETURN_DTLId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURN_DTLId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RETURN_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RETURN_DTLId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RETURN_DTLId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RETURN_DTLId), 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是MES_WIP_DATA类里面的外键ID字段 - public List<BAS_ITEM> _ItemInfos { get; set; } //注意禁止手动赋值,只能是null + [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁 + public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull [SugarColumn(IsIgnore = true)] public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG); #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - #endregion + #endregion - #region 公共方法 + #region 鍏叡鏂规硶 - #endregion + #endregion - }//endClass + }//endClass } \ No newline at end of file diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj index 11e7206..8488071 100644 --- a/Tiger.Model.Net/Tiger.Model.Net.csproj +++ b/Tiger.Model.Net/Tiger.Model.Net.csproj @@ -76,8 +76,9 @@ </ItemGroup> <ItemGroup> <Compile Include="Base\DbEntityBase.cs" /> + <Compile Include="Base\iBizOrder.cs" /> <Compile Include="Base\TraceDebug.cs" /> - <Compile Include="DTO\MESDTO.cs" /> + <Compile Include="Entitys\MES\ParameterEntity\MESDTO.cs" /> <Compile Include="Entitys\BAS\BAS_CODE_MEANING.cs" /> <Compile Include="Entitys\BAS\BAS_CODE_TYPE.cs" /> <Compile Include="Entitys\BAS\BAS_PROCESS_VAR.cs" /> -- Gitblit v1.9.3