From 36746596927952a6b860129a62eec9059bf083a7 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期六, 26 四月 2025 18:06:27 +0800 Subject: [PATCH] 优化了备料逻辑 --- Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs | 146 +++++++++++++++++++++++++----------------------- 1 files changed, 75 insertions(+), 71 deletions(-) diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs index a030a1b..3dda0d4 100644 --- a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs +++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs @@ -7,164 +7,168 @@ namespace Tiger.Model { /// <summary> - /// 实体:杂发单(U9) + /// 瀹炰綋锛氭潅鍙戝崟(U9) /// </summary> [Description("Primary:ID")] - [DisplayName("杂发单(U9)")] + [DisplayName("鏉傚彂鍗�(U9)")] [Serializable] [SugarTable("BIZ_U9_MISC_OUT")] public class BIZ_U9_MISC_OUT : DbEntityWithAuth { - #region 构造函数 + #region 鏋勯�犲嚱鏁� /// <summary> - /// 实体:杂发单(U9) + /// 瀹炰綋锛氭潅鍙戝崟(U9) /// </summary> public BIZ_U9_MISC_OUT() {} #endregion - #region 公共属性 + #region 鍏叡灞炴�� /// <summary> - /// 单据号 + /// 鍗曟嵁鍙� /// </summary> - [DisplayName("单据号")] + [DisplayName("鍗曟嵁鍙�")] public string ORDER_NO { get; set; } /// <summary> - /// 状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废) + /// 鐘舵��(0Init鍒濆鍖東1WaitPick寰呮崱鏂檤2Picking鎹℃枡涓瓅3Picked宸叉崱瀹寍4Sended宸插彂鏂檤5Close宸插叧闂瓅6Cancel浣滃簾) /// </summary> - [DisplayName("状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)")] + [DisplayName("鐘舵��(0Init鍒濆鍖東1WaitPick寰呮崱鏂檤2Picking鎹℃枡涓瓅3Picked宸叉崱瀹寍4Sended宸插彂鏂檤5Close宸插叧闂瓅6Cancel浣滃簾)")] public int STATUS { get; set; } /// <summary> - /// 单据类型编码 + /// 鍗曟嵁绫诲瀷缂栫爜 /// </summary> - [DisplayName("单据类型编码")] + [DisplayName("鍗曟嵁绫诲瀷缂栫爜")] public string TYPE_CODE { get; set; } /// <summary> - /// 单据类型名称 + /// 鍗曟嵁绫诲瀷鍚嶇О /// </summary> - [DisplayName("单据类型名称")] + [DisplayName("鍗曟嵁绫诲瀷鍚嶇О")] public string TYPE_NAME { get; set; } /// <summary> - /// ERP单据状态 + /// ERP鍗曟嵁鐘舵�� /// </summary> - [DisplayName("ERP单据状态")] + [DisplayName("ERP鍗曟嵁鐘舵��")] public string ERP_STATUS_CODE { get; set; } /// <summary> - /// ERP单据状态名称 + /// ERP鍗曟嵁鐘舵�佸悕绉� /// </summary> - [DisplayName("ERP单据状态名称")] + [DisplayName("ERP鍗曟嵁鐘舵�佸悕绉�")] public string ERP_STATUS_NAME { get; set; } /// <summary> - /// 单据日期 + /// 鍗曟嵁鏃ユ湡 /// </summary> - [DisplayName("单据日期")] + [DisplayName("鍗曟嵁鏃ユ湡")] public DateTime ORDER_DATE { get; set; } = DateTime.MinValue; /// <summary> - /// 备料人 + /// 澶囨枡浜� /// </summary> - [DisplayName("备料人")] + [DisplayName("澶囨枡浜�")] public string PREP_PERSON { get; set; } /// <summary> - /// 备料完成时间 + /// 澶囨枡瀹屾垚鏃堕棿 /// </summary> - [DisplayName("备料完成时间")] + [DisplayName("澶囨枡瀹屾垚鏃堕棿")] public DateTime FINISH_TIME { get; set; } = DateTime.MinValue; /// <summary> - /// 领料人 + /// 棰嗘枡浜� /// </summary> - [DisplayName("领料人")] + [DisplayName("棰嗘枡浜�")] public string REQ_PERSON { get; set; } /// <summary> - /// 领料部门 + /// 棰嗘枡閮ㄩ棬 /// </summary> - [DisplayName("领料部门")] + [DisplayName("棰嗘枡閮ㄩ棬")] public string REQ_DEPT { get; set; } /// <summary> - /// 出库时间 + /// 鍑哄簱鏃堕棿 /// </summary> - [DisplayName("出库时间")] + [DisplayName("鍑哄簱鏃堕棿")] public DateTime DLVY_TIME { 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; } /// <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_MISC_OUT类里面的外键ID字段 - public ClassA ClassA { get; set; } //注意禁止手动赋值,只能是null - //一对多外键导航 - [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_OUTId))]//ClassA表中的BIZ_U9_MISC_OUTId - public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值,只能是null - //多对多外键导航 - [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_OUTId), nameof(MappingClass.ClassAId))]//注意顺序 - public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值,只能是null + #region 澶栭敭灞炴�� + /*渚嬪瓙 + //涓�瀵逛竴澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_MISC_OUT绫婚噷闈㈢殑澶栭敭ID瀛楁 + public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //涓�瀵瑰澶栭敭瀵艰埅 + [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_OUTId))]//ClassA琛ㄤ腑鐨凚IZ_U9_MISC_OUTId + public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + //澶氬澶氬閿鑸� + [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_OUTId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭 + public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull */ - #endregion + [Navigate(NavigateType.OneToMany, nameof(BIZ_U9_MISC_OUT_DTL.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_MISC_OUT绫婚噷闈㈢殑澶栭敭ID瀛楁 + public List<BIZ_U9_MISC_OUT_DTL> Details { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + [Navigate(NavigateType.OneToMany, nameof(BIZ_U9_MISC_OUT_SN.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_U9_MISC_OUT绫婚噷闈㈢殑澶栭敭ID瀛楁 + public List<BIZ_U9_MISC_OUT_SN> SnList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull + #endregion - #region 枚举变量 - /*例子 + #region 鏋氫妇鍙橀噺 + /*渚嬪瓙 public enum FieldNames { - [Description("枚举描述0")] + [Description("鏋氫妇鎻忚堪0")] Enum0, - [Description("枚举描述1")] + [Description("鏋氫妇鎻忚堪1")] Enum1, } */ - /// <summary> - /// 枚举:状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废) - /// </summary> - public enum STATUSs + /// <summary> + /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1WaitPick寰呮崱鏂檤2Picking鎹℃枡涓瓅3Picked宸叉崱瀹寍4Sended宸插彂鏂檤5Close宸插叧闂瓅6Cancel浣滃簾) + /// </summary> + public enum STATUSs { - [Description("初始化")] + [Description("鍒濆鍖�")] Init = 0, - [Description("待捡料")] + [Description("寰呮崱鏂�")] WaitPick = 1, - [Description("捡料中")] + [Description("鎹℃枡涓�")] Picking = 2, - [Description("已捡完")] + [Description("宸叉崱瀹�")] Picked = 3, - [Description("已发料")] + [Description("宸插彂鏂�")] Sended = 4, - [Description("已关闭")] + [Description("宸插叧闂�")] Close = 5, - [Description("作废")] + [Description("浣滃簾")] Cancel = 6, } #endregion - #region 公共方法 + #region 鍏叡鏂规硶 #endregion -- Gitblit v1.9.3