From f8be4db0be9e9de5830dd41f7d156c368a1ea43f Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 24 四月 2025 09:45:20 +0800
Subject: [PATCH] 优化了一些已知问题
---
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs | 296 +++++++++++++++++++++++-----------------------------------
1 files changed, 117 insertions(+), 179 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
index 702f9d2..39e7999 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
@@ -3,237 +3,175 @@
using System.Linq;
using System.ComponentModel;
using System.Collections.Generic;
+using Tiger.Model.Extensions;
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 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：备料单(WMS)
+ /// 瀹炰綋锛氬鏂欎换鍔�(WMS)
/// </summary>
public BIZ_WMS_PREP() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 备料单号
+ /// 澶囨枡浠诲姟鍙�
/// </summary>
- [DisplayName("备料单号")]
- public string PREP_NO { get; set; }
+ [DisplayName("澶囨枡浠诲姟鍙�")]
+ public string ORDER_NO { get; set; }
/// <summary>
- /// 类型(0Supply正常备料|1First首套备料)
+ /// 涓氬姟绫诲瀷(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡|4Transfer璋冩嫧澶囨枡)
/// </summary>
- [DisplayName("类型(0Supply正常备料|1First首套备料)")]
- public int PREP_TYPE { get; set; }
+ [DisplayName("涓氬姟绫诲瀷(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡|4Transfer璋冩嫧澶囨枡)")]
+ public int BIZ_TYPE { get; set; }
/// <summary>
- /// 发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)
+ /// 鐘舵��(0Init鍒濆鍖東1Called宸插彨鏂檤2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸插彂鏂檤6Close宸插叧闂瓅7Cancel浣滃簾)
/// </summary>
- [DisplayName("发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)")]
- public int DLVY_MODE { get; set; }
- /// <summary>
- /// 状态(0WaitCall待叫料|1WaitPick待捡料|2Picking捡料中|3WaitSend待发料|4Sended已发料|5Close已关闭|6Cancel作废)
- /// </summary>
- [DisplayName("状态(0WaitCall待叫料|1WaitPick待捡料|2Picking捡料中|3WaitSend待发料|4Sended已发料|5Close已关闭|6Cancel作废)")]
+ [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("备注")]
+ /// <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>
- /// -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
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ [SugarColumn(IsIgnore = true)]
+ public BIZ_WMS_PREP_BTH CurBatch => Batchs?.OrderBy(q => q.CALL_TIME).FirstOrDefault(q => q.STATUS < STATUSs.Sended.GetValue());
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_WMS_PREP类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_PREPId))]//ClassA表中的BIZ_WMS_PREPId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_PREPId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_PREPId))]//ClassA琛ㄤ腑鐨凚IZ_WMS_PREPId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_PREPId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_PREP_SRC.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public List<BIZ_WMS_PREP_SRC> SourceOrders { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_PREP_SRC_DTL.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public List<BIZ_WMS_PREP_SRC_DTL> SourceDetails { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_PREP_DTL.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public List<BIZ_WMS_PREP_DTL> Details { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_PREP_BTH.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public List<BIZ_WMS_PREP_BTH> Batchs { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_PREP_SN.ORDER_NO), nameof(ORDER_NO), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public List<BIZ_WMS_PREP_SN> SnList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #endregion
- #region 枚举变量
- /*例子
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
- [Description("枚举描述0")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
- /// <summary>
- /// 枚举：类型(0Supply正常备料|1First首套备料)
- /// </summary>
- public enum PREP_TYPEs
+ /// <summary>
+ /// 鏋氫妇锛氫笟鍔＄被鍨�(0Others鍏朵粬澶囨枡|1Requisition棰嗘枡鍗曞鏂檤2WorkOrder宸ュ崟澶囨枡|3Outsourcing濮斿澶囨枡|4Transfer璋冩嫧澶囨枡)
+ /// </summary>
+ public enum BIZ_TYPEs
{
- [Description("正常备料")]
- Supply = 0,
- [Description("首套备料")]
- First = 1,
- }
+ [Description("鍏朵粬澶囨枡")]
+ Others = 0,
+ [Description("棰嗘枡鍗曞鏂�")]
+ Requisition = 1,
+ [Description("宸ュ崟澶囨枡")]
+ WorkOrder = 2,
+ [Description("濮斿澶囨枡")]
+ Outsourcing = 3,
+ [Description("璋冩嫧澶囨枡")]
+ Transfer = 4,
+ }
/// <summary>
- /// 枚举：发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)
- /// </summary>
- public enum DLVY_MODEs
- {
- [Description("整单发料")]
- Whole = 0,
- [Description("A面发料")]
- SideA = 1,
- [Description("B面发料")]
- SideB = 2,
- }
-
- /// <summary>
- /// 枚举：状态(0WaitCall待叫料|1WaitPick待捡料|2Picking捡料中|3WaitSend待发料|4Sended已发料|5Close已关闭|6Cancel作废)
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Called宸插彨鏂檤2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸插彂鏂檤6Close宸插叧闂瓅7Cancel浣滃簾)
/// </summary>
public enum STATUSs
{
- [Description("待叫料")]
- WaitCall = 0,
- [Description("待捡料")]
- WaitPick = 1,
- [Description("捡料中")]
- Picking = 2,
- [Description("待发料")]
- WaitSend = 3,
- [Description("已发料")]
- Sended = 4,
- [Description("已关闭")]
- Close = 5,
- [Description("作废")]
- Cancel = 6,
+ [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 公共方法
+ #region 鍏叡鏂规硶
#endregion
--
Gitblit v1.9.3