From 8c044861aea55f9c1830b4defb80e82600c16c1c Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期三, 26 三月 2025 11:32:05 +0800 Subject: [PATCH] 更新实体 --- Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs | 114 +++--- Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs | 40 - Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SRC.cs | 91 +++++ Tiger.Model.Net/Tiger.Model.Net.csproj | 7 Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs | 248 +++++++++++++ Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs | 153 +------- Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs | 251 +++++++------ Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs | 106 ++-- Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs | 12 Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs | 26 + 10 files changed, 643 insertions(+), 405 deletions(-) diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs index 71dd48a..6b7238e 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA.cs @@ -7,143 +7,143 @@ namespace Tiger.Model { /// <summary> - /// 瀹炰綋锛氶��璐у崟(U9) + /// 实体:退货单(U9) /// </summary> [Description("Primary:ID")] - [DisplayName("閫�璐у崟(U9)")] + [DisplayName("退货单(U9)")] [Serializable] [SugarTable("BIZ_U9_RMA")] public class BIZ_U9_RMA : DbEntityWithAuth { - #region 鏋勯�犲嚱鏁� + #region 构造函数 /// <summary> - /// 瀹炰綋锛氶��璐у崟(U9) + /// 实体:退货单(U9) /// </summary> public BIZ_U9_RMA() {} #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 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> - /// 杩囪处鎻愪氦鐨凧SON + /// 过账提交的JSON /// </summary> - [DisplayName("杩囪处鎻愪氦鐨凧SON")] + [DisplayName("过账提交的JSON")] public string COMMIT_JSON { get; set; } /// <summary> - /// 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭� + /// 过账提交的返回信息 /// </summary> - [DisplayName("杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�")] + [DisplayName("过账提交的返回信息")] public string COMMIT_MSG { get; set; } #endregion - #region 铏氭嫙灞炴�� - /*渚嬪瓙 + #region 虚拟属性 + /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion - #region 澶栭敭灞炴�� - /*渚嬪瓙 - //涓�瀵逛竴澶栭敭瀵艰埅 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RMA绫婚噷闈㈢殑澶栭敭ID瀛楁 - public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull - //涓�瀵瑰澶栭敭瀵艰埅 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RMAId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RMAId - public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull - //澶氬澶氬閿鑸� - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RMAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 - public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + #region 外键属性 + /*例子 + //一对一外键导航 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RMA类里面的外键ID字段 + public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null + //一对多外键导航 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RMAId))]//ClassA表中的BIZ_U9_RMAId + public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null + //多对多外键导航 + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RMAId), nameof(MappingClass.ClassAId))]//注意顺序 + public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null */ #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宸蹭綔搴�) + /// 枚举:状态(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_RMA_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs index 5b71bcb..bbaa2ce 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_RMA_SN.cs @@ -7,133 +7,133 @@ namespace Tiger.Model { /// <summary> - /// 瀹炰綋锛氶��璐у崟(U9)鏉$爜鏄庣粏 + /// 实体:退货单(U9)条码明细 /// </summary> [Description("Primary:ID")] - [DisplayName("閫�璐у崟(U9)鏉$爜鏄庣粏")] + [DisplayName("退货单(U9)条码明细")] [Serializable] [SugarTable("BIZ_U9_RMA_SN")] public class BIZ_U9_RMA_SN : DbEntityWithAuth { - #region 鏋勯�犲嚱鏁� + #region 构造函数 /// <summary> - /// 瀹炰綋锛氶��璐у崟(U9)鏉$爜鏄庣粏 + /// 实体:退货单(U9)条码明细 /// </summary> public BIZ_U9_RMA_SN() {} #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 string SN { get; set; } /// <summary> - /// 鍏冩潯鐮� + /// 元条码 /// </summary> - [DisplayName("鍏冩潯鐮�")] + [DisplayName("元条码")] public string META_SN { get; set; } /// <summary> - /// 鐗╂枡缂栫爜 + /// 物料编码 /// </summary> - [DisplayName("鐗╂枡缂栫爜")] + [DisplayName("物料编码")] public string ITEM_CODE { get; set; } /// <summary> - /// 鐘舵��(鍚學MS_ITEM鐘舵��) + /// 状态(同WMS_ITEM状态) /// </summary> - [DisplayName("鐘舵��(鍚學MS_ITEM鐘舵��)")] + [DisplayName("状态(同WMS_ITEM状态)")] public int STATUS { get; set; } /// <summary> - /// 鏁伴噺 + /// 数量 /// </summary> - [DisplayName("鏁伴噺")] + [DisplayName("数量")] public double QTY { get; set; } /// <summary> - /// 鍗曚綅 + /// 单位 /// </summary> - [DisplayName("鍗曚綅")] + [DisplayName("单位")] public string UNIT { get; set; } /// <summary> - /// 鏄惁鑹搧(Y/N) + /// 是否良品(Y/N) /// </summary> - [DisplayName("鏄惁鑹搧(Y/N)")] + [DisplayName("是否良品(Y/N)")] public string IS_OK { get; set; } /// <summary> - /// 鏄惁鍏ュ簱(Y/N) + /// 是否入库(Y/N) /// </summary> - [DisplayName("鏄惁鍏ュ簱(Y/N)")] + [DisplayName("是否入库(Y/N)")] public string IS_IN { get; set; } /// <summary> - /// 鏄惁鎶ュ簾(Y/N) + /// 是否报废(Y/N) /// </summary> - [DisplayName("鏄惁鎶ュ簾(Y/N)")] + [DisplayName("是否报废(Y/N)")] public string IS_SCRAP { get; set; } /// <summary> - /// 鎵规鍙� + /// 批次号 /// </summary> - [DisplayName("鎵规鍙�")] + [DisplayName("批次号")] public string LOTNO { get; set; } /// <summary> - /// 绠卞彿 + /// 箱号 /// </summary> - [DisplayName("绠卞彿")] + [DisplayName("箱号")] public string CARTON_NO { get; set; } /// <summary> - /// 鏍堟澘鍙� + /// 栈板号 /// </summary> - [DisplayName("鏍堟澘鍙�")] + [DisplayName("栈板号")] public string PALLET_NO { get; set; } /// <summary> - /// 澶囨敞 + /// 备注 /// </summary> - [DisplayName("澶囨敞")] + [DisplayName("备注")] public string REMARK { get; set; } #endregion - #region 铏氭嫙灞炴�� - /*渚嬪瓙 + #region 虚拟属性 + /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion - #region 澶栭敭灞炴�� - /*渚嬪瓙 - //涓�瀵逛竴澶栭敭瀵艰埅 - [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_RMA_SN绫婚噷闈㈢殑澶栭敭ID瀛楁 - public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull - //涓�瀵瑰澶栭敭瀵艰埅 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RMA_SNId))]//ClassA琛ㄤ腑鐨凚IZ_U9_RMA_SNId - public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull - //澶氬澶氬閿鑸� - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RMA_SNId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 - public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + #region 外键属性 + /*例子 + //一对一外键导航 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_RMA_SN类里面的外键ID字段 + public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null + //一对多外键导航 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_RMA_SNId))]//ClassA表中的BIZ_U9_RMA_SNId + public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null + //多对多外键导航 + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_RMA_SNId), nameof(MappingClass.ClassAId))]//注意顺序 + public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null */ #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/WMS/BIZ_WMS_PREP.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs index 28b5662..57dca25 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs @@ -7,152 +7,52 @@ namespace Tiger.Model { /// <summary> - /// 实体:备料单(WMS) + /// 实体:备料任务(WMS) /// </summary> [Description("Primary:ID")] - [DisplayName("备料单(WMS)")] + [DisplayName("备料任务(WMS)")] [Serializable] [SugarTable("BIZ_WMS_PREP")] public class BIZ_WMS_PREP : DbEntityWithAuth { #region 构造函数 /// <summary> - /// 实体:备料单(WMS) + /// 实体:备料任务(WMS) /// </summary> public BIZ_WMS_PREP() {} #endregion #region 公共属性 /// <summary> - /// 备料单号 + /// 备料任务号 /// </summary> - [DisplayName("备料单号")] + [DisplayName("备料任务号")] public string ORDER_NO { get; set; } /// <summary> - /// 类型(0Supply正常备料|1First首套备料) + /// 业务类型(0Others其他备料|1Requisition领料单备料|2WorkOrder工单备料|3Outsourcing委外备料) /// </summary> - [DisplayName("类型(0Supply正常备料|1First首套备料)")] - public int PREP_TYPE { get; set; } - /// <summary> - /// 发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料) - /// </summary> - [DisplayName("发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)")] - public int DLVY_MODE { get; set; } + [DisplayName("业务类型(0Others其他备料|1Requisition领料单备料|2WorkOrder工单备料|3Outsourcing委外备料)")] + public int BIZ_TYPE { get; set; } /// <summary> /// 状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废) /// </summary> [DisplayName("状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)")] public int STATUS { get; set; } /// <summary> - /// 来源单据编码,多个用“'”分隔 + /// 来源单据编码,多个用“,”分隔 /// </summary> - [DisplayName("来源单据编码,多个用“'”分隔")] + [DisplayName("来源单据编码,多个用“,”分隔")] public string SOURCE_CODE { get; set; } /// <summary> - /// 来源单号,多个用“'”分隔,跟编码一一对应 + /// 来源单号,多个用“,”分隔,跟编码一一对应 /// </summary> - [DisplayName("来源单号,多个用“'”分隔,跟编码一一对应")] + [DisplayName("来源单号,多个用“,”分隔,跟编码一一对应")] public string SOURCE_ORDER { 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 DateTime CALL_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 计划完成时间 - /// </summary> - [DisplayName("计划完成时间")] - public DateTime PLAN_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 备料优先级(1-7)越小越优先 - /// </summary> - [DisplayName("备料优先级(1-7)越小越优先")] - public int PRIORITY { get; set; } - /// <summary> - /// 备料人 - /// </summary> - [DisplayName("备料人")] - public string PREP_PERSON { get; set; } - /// <summary> - /// 备料完成时间 - /// </summary> - [DisplayName("备料完成时间")] - public DateTime FINISH_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 领料人 - /// </summary> - [DisplayName("领料人")] - public string REQ_PERSON { get; set; } - /// <summary> - /// 领料部门 - /// </summary> - [DisplayName("领料部门")] - public string REQ_DEPT { get; set; } - /// <summary> - /// 出库时间 - /// </summary> - [DisplayName("出库时间")] - public DateTime DLVY_TIME { get; set; } = DateTime.MinValue; - /// <summary> - /// 关联领料单号 - /// </summary> - [DisplayName("关联领料单号")] - public string REQ_ORDER { get; set; } /// <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 虚拟属性 @@ -188,27 +88,18 @@ */ /// <summary> - /// 枚举:类型(0Supply正常备料|1First首套备料) + /// 枚举:业务类型(0Others其他备料|1Requisition领料单备料|2WorkOrder工单备料|3Outsourcing委外备料) /// </summary> - public enum PREP_TYPEs + public enum BIZ_TYPEs { - [Description("正常备料")] - Supply = 0, - [Description("首套备料")] - First = 1, - } - - /// <summary> - /// 枚举:发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料) - /// </summary> - public enum DLVY_MODEs - { - [Description("整单发料")] - Whole = 0, - [Description("A面发料")] - SideA = 1, - [Description("B面发料")] - SideB = 2, + [Description("其他备料")] + Others = 0, + [Description("领料单备料")] + Requisition = 1, + [Description("工单备料")] + WorkOrder = 2, + [Description("委外备料")] + Outsourcing = 3, } /// <summary> diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs new file mode 100644 index 0000000..34ba08e --- /dev/null +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs @@ -0,0 +1,248 @@ +using System; +using SqlSugar; +using System.Linq; +using System.ComponentModel; +using System.Collections.Generic; + +namespace Tiger.Model +{ + /// <summary> + /// 实体:备料任务(WMS)发料批次 + /// </summary> + [Description("Primary:ID")] + [DisplayName("备料任务(WMS)发料批次")] + [Serializable] + [SugarTable("BIZ_WMS_PREP_BTH")] + public class BIZ_WMS_PREP_BTH : DbEntityWithAuth + { + #region 构造函数 + /// <summary> + /// 实体:备料任务(WMS)发料批次 + /// </summary> + public BIZ_WMS_PREP_BTH() {} + #endregion + + #region 公共属性 + /// <summary> + /// 备料任务号 + /// </summary> + [DisplayName("备料任务号")] + public string ORDER_NO { get; set; } + /// <summary> + /// 发料批次 + /// </summary> + [DisplayName("发料批次")] + public int BATCH { get; set; } + /// <summary> + /// 备料方式(0Whole整单备料|1SideA/A面备料|2SideB/B面备料) + /// </summary> + [DisplayName("备料方式(0Whole整单备料|1SideA/A面备料|2SideB/B面备料)")] + public int PREP_MODE { get; set; } + /// <summary> + /// 发料方式(0Supply正常发料|1First首套发料) + /// </summary> + [DisplayName("发料方式(0Supply正常发料|1First首套发料)")] + public int DLVY_MODE { get; set; } + /// <summary> + /// 状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废) + /// </summary> + [DisplayName("状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)")] + public int STATUS { 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 DateTime CALL_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 计划完成时间 + /// </summary> + [DisplayName("计划完成时间")] + public DateTime PLAN_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 备料开始时间 + /// </summary> + [DisplayName("备料开始时间")] + public DateTime PICK_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 备料优先级(1-7)越小越优先 + /// </summary> + [DisplayName("备料优先级(1-7)越小越优先")] + public int PRIORITY { get; set; } + /// <summary> + /// 备料人 + /// </summary> + [DisplayName("备料人")] + public string PREP_PERSON { get; set; } + /// <summary> + /// 备料完成时间 + /// </summary> + [DisplayName("备料完成时间")] + public DateTime FINISH_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 关联领料单ID + /// </summary> + [DisplayName("关联领料单ID")] + public string REQ_ID { get; set; } + /// <summary> + /// 关联领料单号 + /// </summary> + [DisplayName("关联领料单号")] + public string REQ_ORDER { get; set; } + /// <summary> + /// 领料人 + /// </summary> + [DisplayName("领料人")] + public string REQ_PERSON { get; set; } + /// <summary> + /// 领料部门 + /// </summary> + [DisplayName("领料部门")] + public string REQ_DEPT { get; set; } + /// <summary> + /// 领料出库时间 + /// </summary> + [DisplayName("领料出库时间")] + public DateTime DLVY_TIME { 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_WMS_PREP_BTH类里面的外键ID字段 + public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null + //一对多外键导航 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_PREP_BTHId))]//ClassA表中的BIZ_WMS_PREP_BTHId + public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null + //多对多外键导航 + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_PREP_BTHId), nameof(MappingClass.ClassAId))]//注意顺序 + public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + */ + #endregion + + #region 枚举变量 + /*例子 + public enum FieldNames + { + [Description("枚举描述0")] + Enum0, + [Description("枚举描述1")] + Enum1, + } + */ + + /// <summary> + /// 枚举:备料方式(0Whole整单备料|1SideA/A面备料|2SideB/B面备料) + /// </summary> + public enum PREP_MODEs + { + [Description("整单备料")] + Whole = 0, + [Description("A面备料")] + SideA = 1, + [Description("B面备料")] + SideB = 2, + } + + /// <summary> + /// 枚举:发料方式(0Supply正常发料|1First首套发料) + /// </summary> + public enum DLVY_MODEs + { + [Description("正常发料")] + Supply = 0, + [Description("首套发料")] + First = 1, + } + + /// <summary> + /// 枚举:状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废) + /// </summary> + public enum STATUSs + { + [Description("初始化")] + Init = 0, + [Description("已叫料")] + Called = 1, + [Description("待捡料")] + WaitPick = 2, + [Description("捡料中")] + Picking = 3, + [Description("已捡完")] + Picked = 4, + [Description("已发料")] + Sended = 5, + [Description("已关闭")] + Close = 6, + [Description("作废")] + Cancel = 7, + } + #endregion + + #region 公共方法 + + #endregion + + }//endClass +} \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs index a26d6c5..3225279 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs @@ -7,31 +7,31 @@ namespace Tiger.Model { /// <summary> - /// 实体:备料单(WMS)明细 + /// 实体:备料任务(WMS)物料明细 /// </summary> [Description("Primary:ID")] - [DisplayName("备料单(WMS)明细")] + [DisplayName("备料任务(WMS)物料明细")] [Serializable] [SugarTable("BIZ_WMS_PREP_DTL")] public class BIZ_WMS_PREP_DTL : DbEntityWithAuth { #region 构造函数 /// <summary> - /// 实体:备料单(WMS)明细 + /// 实体:备料任务(WMS)物料明细 /// </summary> public BIZ_WMS_PREP_DTL() {} #endregion #region 公共属性 /// <summary> - /// 备料单号 + /// 备料任务号 /// </summary> - [DisplayName("备料单号")] + [DisplayName("备料任务号")] public string ORDER_NO { get; set; } /// <summary> - /// 备料单行号 + /// 备料任务行号 /// </summary> - [DisplayName("备料单行号")] + [DisplayName("备料任务行号")] public string ORDER_LINE { get; set; } /// <summary> /// 物料编码 @@ -39,9 +39,9 @@ [DisplayName("物料编码")] public string ITEM_CODE { get; set; } /// <summary> - /// 替代料,多个用“'”分隔 + /// 替代料,多个用“,”分隔 /// </summary> - [DisplayName("替代料,多个用“'”分隔")] + [DisplayName("替代料,多个用“,”分隔")] public string SUBITEM_CODE { get; set; } /// <summary> /// 单位 @@ -69,19 +69,19 @@ [DisplayName("是否最小包装发料(Y/N)")] public string IS_WHOLE { get; set; } /// <summary> - /// 来源单据编码,多个用“'”分隔 + /// 来源单据编码,多个用“,”分隔 /// </summary> - [DisplayName("来源单据编码,多个用“'”分隔")] + [DisplayName("来源单据编码,多个用“,”分隔")] public string SOURCE_CODE { get; set; } /// <summary> - /// 来源单号,多个用“'”分隔,跟编码一一对应 + /// 来源单号,多个用“,”分隔,跟编码一一对应 /// </summary> - [DisplayName("来源单号,多个用“'”分隔,跟编码一一对应")] + [DisplayName("来源单号,多个用“,”分隔,跟编码一一对应")] public string SOURCE_ORDER { get; set; } /// <summary> - /// 来源单行号,多个用“'”分隔,跟编码一一对应 + /// 来源单行号,多个用“,”分隔,跟编码一一对应 /// </summary> - [DisplayName("来源单行号,多个用“'”分隔,跟编码一一对应")] + [DisplayName("来源单行号,多个用“,”分隔,跟编码一一对应")] public string SOURCE_LINE { get; set; } /// <summary> /// 状态(0UnCalc未计算|1FistrLack首套缺料|2SupplyLack补料缺料|3Enough满足需求|4NoCalc不参与备料计算|5Cancel已作废|6Finish备料完成) @@ -158,16 +158,6 @@ /// </summary> [DisplayName("料枪类型")] public string FEEDER_TYPE { get; set; } - /// <summary> - /// 关联领料单号 - /// </summary> - [DisplayName("关联领料单号")] - public string REQ_NO { get; set; } - /// <summary> - /// 关联领料单行号 - /// </summary> - [DisplayName("关联领料单行号")] - public string REQ_LINE { get; set; } /// <summary> /// 备注 /// </summary> diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs index 9ce7559..88a5fe1 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs @@ -7,32 +7,37 @@ namespace Tiger.Model { /// <summary> - /// 实体:备料单(WMS)条码明细 + /// 实体:备料任务(WMS)条码明细 /// </summary> [Description("Primary:ID")] - [DisplayName("备料单(WMS)条码明细")] + [DisplayName("备料任务(WMS)条码明细")] [Serializable] [SugarTable("BIZ_WMS_PREP_SN")] public class BIZ_WMS_PREP_SN : DbEntityWithAuth { #region 构造函数 /// <summary> - /// 实体:备料单(WMS)条码明细 + /// 实体:备料任务(WMS)条码明细 /// </summary> public BIZ_WMS_PREP_SN() {} #endregion #region 公共属性 /// <summary> - /// 备料单号 + /// 备料任务号 /// </summary> - [DisplayName("备料单号")] + [DisplayName("备料任务号")] public string ORDER_NO { get; set; } /// <summary> - /// 备料单行号 + /// 备料任务行号 /// </summary> - [DisplayName("备料单行号")] + [DisplayName("备料任务行号")] public string ORDER_LINE { get; set; } + /// <summary> + /// 发料批次 + /// </summary> + [DisplayName("发料批次")] + public string ORDER_BATCH { get; set; } /// <summary> /// 物品标签 /// </summary> @@ -99,10 +104,15 @@ [DisplayName("出库时间")] public DateTime DLVY_TIME { get; set; } = DateTime.MinValue; /// <summary> + /// 关联领料单ID + /// </summary> + [DisplayName("关联领料单ID")] + public string REQ_ID { get; set; } + /// <summary> /// 关联领料单号 /// </summary> [DisplayName("关联领料单号")] - public string REQ_NO { get; set; } + public string REQ_ORDER { get; set; } /// <summary> /// 关联领料单行号 /// </summary> diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SRC.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SRC.cs new file mode 100644 index 0000000..0e8c22d --- /dev/null +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SRC.cs @@ -0,0 +1,91 @@ +using System; +using SqlSugar; +using System.Linq; +using System.ComponentModel; +using System.Collections.Generic; + +namespace Tiger.Model +{ + /// <summary> + /// 实体:备料任务(WMS)来源单据 + /// </summary> + [Description("Primary:ID")] + [DisplayName("备料任务(WMS)来源单据")] + [Serializable] + [SugarTable("BIZ_WMS_PREP_SRC")] + public class BIZ_WMS_PREP_SRC : DbEntityWithAuth + { + #region 构造函数 + /// <summary> + /// 实体:备料任务(WMS)来源单据 + /// </summary> + public BIZ_WMS_PREP_SRC() {} + #endregion + + #region 公共属性 + /// <summary> + /// 备料任务号 + /// </summary> + [DisplayName("备料任务号")] + public string ORDER_NO { get; set; } + /// <summary> + /// 来源单据编码 + /// </summary> + [DisplayName("来源单据编码")] + public string SOURCE_CODE { get; set; } + /// <summary> + /// 来源据单号 + /// </summary> + [DisplayName("来源据单号")] + public string SOURCE_ORDER { get; set; } + /// <summary> + /// 关联时间 + /// </summary> + [DisplayName("关联时间")] + public DateTime ADD_TIME { get; set; } = DateTime.MinValue; + /// <summary> + /// 备注 + /// </summary> + [DisplayName("备注")] + public string REMARK { get; set; } + #endregion + + #region 虚拟属性 + /*例子 + [SugarColumn(IsIgnore = true)] + public string FieldName { get; set; } + */ + #endregion + + #region 外键属性 + /*例子 + //一对一外键导航 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_WMS_PREP_SRC类里面的外键ID字段 + public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null + //一对多外键导航 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_PREP_SRCId))]//ClassA表中的BIZ_WMS_PREP_SRCId + public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null + //多对多外键导航 + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_PREP_SRCId), nameof(MappingClass.ClassAId))]//注意顺序 + public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + */ + #endregion + + #region 枚举变量 + /*例子 + public enum FieldNames + { + [Description("枚举描述0")] + Enum0, + [Description("枚举描述1")] + Enum1, + } + */ + #endregion + + #region 公共方法 + + #endregion + + }//endClass +} \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs index b39a1d8..2624ff4 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs @@ -6,99 +6,99 @@ namespace Tiger.Model { - /// <summary> - /// 瀹炰綋锛氳皟鎷ㄥ崟(WMS) - /// </summary> - [Description("Primary:ID")] - [DisplayName("璋冩嫧鍗�(WMS)")] - [Serializable] - [SugarTable("BIZ_WMS_TRANSFER")] - public class BIZ_WMS_TRANSFER : DbEntityWithAuth - { - #region 鏋勯�犲嚱鏁� - /// <summary> - /// 瀹炰綋锛氳皟鎷ㄥ崟(WMS) - /// </summary> - public BIZ_WMS_TRANSFER() { } - #endregion + /// <summary> + /// 瀹炰綋锛氳皟鎷ㄥ崟(WMS) + /// </summary> + [Description("Primary:ID")] + [DisplayName("璋冩嫧鍗�(WMS)")] + [Serializable] + [SugarTable("BIZ_WMS_TRANSFER")] + public class BIZ_WMS_TRANSFER : DbEntityWithAuth + { + #region 鏋勯�犲嚱鏁� + /// <summary> + /// 瀹炰綋锛氳皟鎷ㄥ崟(WMS) + /// </summary> + public BIZ_WMS_TRANSFER() {} + #endregion - #region 鍏叡灞炴�� - /// <summary> - /// 璋冩嫧鍗曞彿 - /// </summary> - [DisplayName("璋冩嫧鍗曞彿")] - public string ORDER_NO { get; set; } - /// <summary> - /// 鍗曟嵁鏃ユ湡 - /// </summary> - [DisplayName("鍗曟嵁鏃ユ湡")] - public DateTime ORDER_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾) - /// </summary> - [DisplayName("鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)")] - public int STATUS { get; set; } - /// <summary> - /// 璋冨嚭浠撳簱 - /// </summary> - [DisplayName("璋冨嚭浠撳簱")] - public string OUT_WH_CODE { get; set; } - /// <summary> - /// 鎷ㄥ叆浠撳簱 - /// </summary> - [DisplayName("鎷ㄥ叆浠撳簱")] - public string IN_WH_CODE { get; set; } - /// <summary> - /// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅� - /// </summary> - [DisplayName("鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�")] - public string SOURCE_CODE { get; set; } - /// <summary> - /// 鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲 - /// </summary> - [DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")] - public string SOURCE_ORDER { get; set; } - /// <summary> - /// ERP鍗曟嵁鍙风爜 - /// </summary> - [DisplayName("ERP鍗曟嵁鍙风爜")] - public string ERP_ORDER { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - [DisplayName("澶囨敞")] - public string REMARK { get; set; } - /// <summary> - /// -1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟 - /// </summary> - [DisplayName("-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟")] - public int HANDLED { get; set; } - /// <summary> - /// 鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈� - /// </summary> - [DisplayName("鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�")] - public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue; - /// <summary> - /// 杩囪处鎻愪氦鐨凧SON - /// </summary> - [DisplayName("杩囪处鎻愪氦鐨凧SON")] - public string COMMIT_JSON { get; set; } - /// <summary> - /// 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭� - /// </summary> - [DisplayName("杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�")] - public string COMMIT_MSG { get; set; } - #endregion + #region 鍏叡灞炴�� + /// <summary> + /// 璋冩嫧鍗曞彿 + /// </summary> + [DisplayName("璋冩嫧鍗曞彿")] + public string ORDER_NO { get; set; } + /// <summary> + /// 鍗曟嵁鏃ユ湡 + /// </summary> + [DisplayName("鍗曟嵁鏃ユ湡")] + public DateTime ORDER_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾) + /// </summary> + [DisplayName("鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)")] + public int STATUS { get; set; } + /// <summary> + /// 璋冨嚭浠撳簱 + /// </summary> + [DisplayName("璋冨嚭浠撳簱")] + public string OUT_WH_CODE { get; set; } + /// <summary> + /// 鎷ㄥ叆浠撳簱 + /// </summary> + [DisplayName("鎷ㄥ叆浠撳簱")] + public string IN_WH_CODE { get; set; } + /// <summary> + /// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�,鈥濆垎闅� + /// </summary> + [DisplayName("鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�,鈥濆垎闅�")] + public string SOURCE_CODE { get; set; } + /// <summary> + /// 鏉ユ簮鍗曞彿锛屽涓敤鈥�,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲 + /// </summary> + [DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")] + public string SOURCE_ORDER { get; set; } + /// <summary> + /// ERP鍗曟嵁鍙风爜 + /// </summary> + [DisplayName("ERP鍗曟嵁鍙风爜")] + public string ERP_ORDER { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + [DisplayName("澶囨敞")] + public string REMARK { get; set; } + /// <summary> + /// -1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟 + /// </summary> + [DisplayName("-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟")] + public int HANDLED { get; set; } + /// <summary> + /// 鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈� + /// </summary> + [DisplayName("鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�")] + public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue; + /// <summary> + /// 杩囪处鎻愪氦鐨凧SON + /// </summary> + [DisplayName("杩囪处鎻愪氦鐨凧SON")] + public string COMMIT_JSON { get; set; } + /// <summary> + /// 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭� + /// </summary> + [DisplayName("杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�")] + public string COMMIT_MSG { get; set; } + #endregion - #region 铏氭嫙灞炴�� - /*渚嬪瓙 + #region 铏氭嫙灞炴�� + /*渚嬪瓙 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ - #endregion + #endregion - #region 澶栭敭灞炴�� - /*渚嬪瓙 + #region 澶栭敭灞炴�� + /*渚嬪瓙 //涓�瀵逛竴澶栭敭瀵艰埅 [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_TRANSFER绫婚噷闈㈢殑澶栭敭ID瀛楁 public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull @@ -126,49 +126,50 @@ #region 鏋氫妇鍙橀噺 /*渚嬪瓙 - public enum FieldNames - { - [Description("鏋氫妇鎻忚堪0")] - Enum0, - [Description("鏋氫妇鎻忚堪1")] - Enum1, - } - */ + public enum FieldNames + { + [Description("鏋氫妇鎻忚堪0")] + Enum0, + [Description("鏋氫妇鎻忚堪1")] + Enum1, + } + */ + /// <summary> /// 鏋氫妇锛氱姸鎬�(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾) /// </summary> public enum STATUSs - { - [Description("鏂板垱寤�")] - Init = 0, - [Description("宸插鍏�")] - Imported = 1, - [Description("寰呮崱鏂�")] - WaitPick = 2, - [Description("鎹℃枡涓�")] - Picking = 3, - [Description("宸叉崱瀹�")] - Picked = 4, - [Description("宸茶皟鍑�")] - Sended = 5, - [Description("宸查�佽揪")] - Arrived = 6, - [Description("娓呯偣涓�")] - Counting = 7, - [Description("妫�楠屼腑")] - InQC = 8, - [Description("涓婃灦涓�")] - Storing = 9, - [Description("宸插畬鎴�")] - Finished = 10, - [Description("浣滃簾")] - Cancel = 11, - } - #endregion + { + [Description("鏂板垱寤�")] + Init = 0, + [Description("宸插鍏�")] + Imported = 1, + [Description("寰呮崱鏂�")] + WaitPick = 2, + [Description("鎹℃枡涓�")] + Picking = 3, + [Description("宸叉崱瀹�")] + Picked = 4, + [Description("宸茶皟鍑�")] + Sended = 5, + [Description("宸查�佽揪")] + Arrived = 6, + [Description("娓呯偣涓�")] + Counting = 7, + [Description("妫�楠屼腑")] + InQC = 8, + [Description("涓婃灦涓�")] + Storing = 9, + [Description("宸插畬鎴�")] + Finished = 10, + [Description("浣滃簾")] + Cancel = 11, + } + #endregion - #region 鍏叡鏂规硶 + #region 鍏叡鏂规硶 - #endregion + #endregion - }//endClass + }//endClass } \ No newline at end of file diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs index 423fc60..92566bd 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs @@ -84,19 +84,19 @@ [DisplayName("鎷ㄥ叆鎵瑰彿")] public string IN_LOTNO { get; set; } /// <summary> - /// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅� + /// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�,鈥濆垎闅� /// </summary> - [DisplayName("鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�")] + [DisplayName("鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�,鈥濆垎闅�")] public string SOURCE_CODE { get; set; } /// <summary> - /// 鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲 + /// 鏉ユ簮鍗曞彿锛屽涓敤鈥�,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲 /// </summary> - [DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")] + [DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")] public string SOURCE_ORDER { get; set; } /// <summary> - /// 鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲 + /// 鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲 /// </summary> - [DisplayName("鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")] + [DisplayName("鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��,鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")] public string SOURCE_LINE { get; set; } /// <summary> /// ERP鍗曟嵁鍙风爜 diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj index 3369e00..ac85e97 100644 --- a/Tiger.Model.Net/Tiger.Model.Net.csproj +++ b/Tiger.Model.Net/Tiger.Model.Net.csproj @@ -281,6 +281,9 @@ <Compile Include="Entitys\MengQi\TestData.cs" /> <Compile Include="Entitys\MengQi\User.cs" /> <Compile Include="Entitys\WMS\BIZ_ERP_PROD_IN_BTH.cs" /> + <Compile Include="Entitys\WMS\BIZ_ITEM_CVT.cs" /> + <Compile Include="Entitys\WMS\BIZ_ITEM_CVT_DTL.cs" /> + <Compile Include="Entitys\WMS\BIZ_ITEM_CVT_SN.cs" /> <Compile Include="Entitys\WMS\BIZ_U9_ASN.cs" /> <Compile Include="Entitys\WMS\BIZ_U9_ASN_DTL.cs" /> <Compile Include="Entitys\WMS\BIZ_U9_ASN_SN.cs" /> @@ -296,9 +299,13 @@ <Compile Include="Entitys\WMS\BIZ_U9_RMA.cs" /> <Compile Include="Entitys\WMS\BIZ_U9_RMA_DTL.cs" /> <Compile Include="Entitys\WMS\BIZ_U9_RMA_SN.cs" /> + <Compile Include="Entitys\WMS\BIZ_U9_SCM_OUT.cs" /> + <Compile Include="Entitys\WMS\BIZ_U9_SCM_OUT_DTL.cs" /> <Compile Include="Entitys\WMS\BIZ_WMS_PREP.cs" /> + <Compile Include="Entitys\WMS\BIZ_WMS_PREP_BTH.cs" /> <Compile Include="Entitys\WMS\BIZ_WMS_PREP_DTL.cs" /> <Compile Include="Entitys\WMS\BIZ_WMS_PREP_SN.cs" /> + <Compile Include="Entitys\WMS\BIZ_WMS_PREP_SRC.cs" /> <Compile Include="Entitys\WMS\V_MONTH_IN_SUM.cs" /> <Compile Include="Entitys\WMS\V_WH_ITEM_SUM.cs" /> <Compile Include="Entitys\WMS\V_WMS_ITEM_Y.cs" /> -- Gitblit v1.9.3