From beca28ecb3a730ffb33c21e0c55c729774725faf Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 25 四月 2025 16:51:28 +0800
Subject: [PATCH] 优化备料单发料逻辑
---
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs | 213 ++++++++++++++++++++++++++++-------------------------
1 files changed, 113 insertions(+), 100 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs
index 34ba08e..02c3736 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_BTH.cs
@@ -7,240 +7,253 @@
namespace Tiger.Model
{
/// <summary>
- /// 实体：备料任务(WMS)发料批次
+ /// 瀹炰綋锛氬鏂欎换鍔�(WMS)鍙戞枡鎵规
/// </summary>
[Description("Primary:ID")]
- [DisplayName("备料任务(WMS)发料批次")]
+ [DisplayName("澶囨枡浠诲姟(WMS)鍙戞枡鎵规")]
[Serializable]
[SugarTable("BIZ_WMS_PREP_BTH")]
public class BIZ_WMS_PREP_BTH : DbEntityWithAuth
{
- #region 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：备料任务(WMS)发料批次
+ /// 瀹炰綋锛氬鏂欎换鍔�(WMS)鍙戞枡鎵规
/// </summary>
public BIZ_WMS_PREP_BTH() {}
#endregion
- #region 公共属性
+ #region 鍏叡灞炴��
/// <summary>
- /// 备料任务号
+ /// 澶囨枡浠诲姟鍙�
/// </summary>
- [DisplayName("备料任务号")]
+ [DisplayName("澶囨枡浠诲姟鍙�")]
public string ORDER_NO { get; set; }
/// <summary>
- /// 发料批次
+ /// 鍙戞枡鎵规
/// </summary>
- [DisplayName("发料批次")]
- public int BATCH { get; set; }
+ [DisplayName("鍙戞枡鎵规")]
+ public string DLVY_BATCH { get; set; }
/// <summary>
- /// 备料方式(0Whole整单备料|1SideA/A面备料|2SideB/B面备料)
+ /// 澶囨枡鏂瑰紡(0Whole鏁村崟澶囨枡|1SideA/A闈㈠鏂檤2SideB/B闈㈠鏂�)
/// </summary>
- [DisplayName("备料方式(0Whole整单备料|1SideA/A面备料|2SideB/B面备料)")]
+ [DisplayName("澶囨枡鏂瑰紡(0Whole鏁村崟澶囨枡|1SideA/A闈㈠鏂檤2SideB/B闈㈠鏂�)")]
public int PREP_MODE { get; set; }
/// <summary>
- /// 发料方式(0Supply正常发料|1First首套发料)
+ /// 鍙戞枡鏂瑰紡(0Supply姝ｅ父鍙戞枡|1First棣栧鍙戞枡)
/// </summary>
- [DisplayName("发料方式(0Supply正常发料|1First首套发料)")]
+ [DisplayName("鍙戞枡鏂瑰紡(0Supply姝ｅ父鍙戞枡|1First棣栧鍙戞枡)")]
public int DLVY_MODE { get; set; }
/// <summary>
- /// 状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)
+ /// 鐘舵��(0Init鍒濆鍖東1Called宸插彨鏂檤2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸插彂鏂檤6Close宸插叧闂瓅7Cancel浣滃簾)
/// </summary>
- [DisplayName("状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)")]
+ [DisplayName("鐘舵��(0Init鍒濆鍖東1Called宸插彨鏂檤2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸插彂鏂檤6Close宸插叧闂瓅7Cancel浣滃簾)")]
public int STATUS { get; set; }
/// <summary>
- /// 工厂编码
+ /// 宸ュ巶缂栫爜
/// </summary>
- [DisplayName("工厂编码")]
+ [DisplayName("宸ュ巶缂栫爜")]
public string FTY_CODE { get; set; }
/// <summary>
- /// 车间编码
+ /// 杞﹂棿缂栫爜
/// </summary>
- [DisplayName("车间编码")]
+ [DisplayName("杞﹂棿缂栫爜")]
public string WS_CODE { get; set; }
/// <summary>
- /// 产线编码
+ /// 浜х嚎缂栫爜
/// </summary>
- [DisplayName("产线编码")]
+ [DisplayName("浜х嚎缂栫爜")]
public string LINE_CODE { get; set; }
/// <summary>
- /// 岗位编码
+ /// 宀椾綅缂栫爜
/// </summary>
- [DisplayName("岗位编码")]
+ [DisplayName("宀椾綅缂栫爜")]
public string POST_CODE { get; set; }
/// <summary>
- /// 工序编码
+ /// 宸ュ簭缂栫爜
/// </summary>
- [DisplayName("工序编码")]
+ [DisplayName("宸ュ簭缂栫爜")]
public string OPER_CODE { get; set; }
/// <summary>
- /// 加工段
+ /// 鍔犲伐娈�
/// </summary>
- [DisplayName("加工段")]
+ [DisplayName("鍔犲伐娈�")]
public string SEGMENT { get; set; }
/// <summary>
- /// 叫料时间
+ /// 鍙枡鏃堕棿
/// </summary>
- [DisplayName("叫料时间")]
+ [DisplayName("鍙枡鏃堕棿")]
public DateTime CALL_TIME { get; set; } = DateTime.MinValue;
/// <summary>
- /// 计划完成时间
+ /// 璁″垝瀹屾垚鏃堕棿
/// </summary>
- [DisplayName("计划完成时间")]
+ [DisplayName("璁″垝瀹屾垚鏃堕棿")]
public DateTime PLAN_TIME { get; set; } = DateTime.MinValue;
/// <summary>
- /// 备料开始时间
+ /// 澶囨枡寮�濮嬫椂闂�
/// </summary>
- [DisplayName("备料开始时间")]
+ [DisplayName("澶囨枡寮�濮嬫椂闂�")]
public DateTime PICK_TIME { get; set; } = DateTime.MinValue;
/// <summary>
- /// 备料优先级(1-7)越小越优先
+ /// 澶囨枡浼樺厛绾�(1-7)瓒婂皬瓒婁紭鍏�
/// </summary>
- [DisplayName("备料优先级(1-7)越小越优先")]
+ [DisplayName("澶囨枡浼樺厛绾�(1-7)瓒婂皬瓒婁紭鍏�")]
public int PRIORITY { get; set; }
/// <summary>
- /// 备料人
+ /// 澶囨枡浜�
/// </summary>
- [DisplayName("备料人")]
+ [DisplayName("澶囨枡浜�")]
public string PREP_PERSON { get; set; }
/// <summary>
- /// 备料完成时间
+ /// 澶囨枡瀹屾垚鏃堕棿
/// </summary>
- [DisplayName("备料完成时间")]
+ [DisplayName("澶囨枡瀹屾垚鏃堕棿")]
public DateTime FINISH_TIME { get; set; } = DateTime.MinValue;
/// <summary>
- /// 关联领料单ID
+ /// 鍏宠仈棰嗘枡鍗旾D
/// </summary>
- [DisplayName("关联领料单ID")]
+ [DisplayName("鍏宠仈棰嗘枡鍗旾D")]
public string REQ_ID { get; set; }
/// <summary>
- /// 关联领料单号
+ /// 鍏宠仈棰嗘枡鍗曞彿
/// </summary>
- [DisplayName("关联领料单号")]
+ [DisplayName("鍏宠仈棰嗘枡鍗曞彿")]
public string REQ_ORDER { get; set; }
/// <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; } = -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_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
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP_BTH绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_PREP_BTHId))]//ClassA琛ㄤ腑鐨凚IZ_WMS_PREP_BTHId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_PREP_BTHId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ #endregion
- #region 枚举变量
- /*例子
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
- [Description("枚举描述0")]
+ [Description("鏋氫妇鎻忚堪0")]
Enum0,
- [Description("枚举描述1")]
+ [Description("鏋氫妇鎻忚堪1")]
Enum1,
}
*/
- /// <summary>
- /// 枚举：备料方式(0Whole整单备料|1SideA/A面备料|2SideB/B面备料)
- /// </summary>
- public enum PREP_MODEs
+ /// <summary>
+ /// 鏋氫妇锛氱敓鎴愯寖鍥�(0CurTrans鏈鎿嶄綔|1CurWH褰撳墠浠撳簱|2Whole褰撳墠鍗曟嵁)
+ /// </summary>
+ public enum BATCH_RANGEs
+ {
+ [Description("鏈鎿嶄綔")]
+ CurTrans = 0,
+ [Description("褰撳墠浠撳簱")]
+ CurWH = 1,
+ [Description("褰撳墠鍗曟嵁")]
+ Whole = 2,
+ }
+
+ /// <summary>
+ /// 鏋氫妇锛氬鏂欐柟寮�(0Whole鏁村崟澶囨枡|1SideA/A闈㈠鏂檤2SideB/B闈㈠鏂�)
+ /// </summary>
+ public enum PREP_MODEs
{
- [Description("整单备料")]
+ [Description("鏁村崟澶囨枡")]
Whole = 0,
- [Description("A面备料")]
+ [Description("A闈㈠鏂�")]
SideA = 1,
- [Description("B面备料")]
+ [Description("B闈㈠鏂�")]
SideB = 2,
}
/// <summary>
- /// 枚举：发料方式(0Supply正常发料|1First首套发料)
+ /// 鏋氫妇锛氬彂鏂欐柟寮�(0Supply姝ｅ父鍙戞枡|1First棣栧鍙戞枡)
/// </summary>
public enum DLVY_MODEs
{
- [Description("正常发料")]
+ [Description("姝ｅ父鍙戞枡")]
Supply = 0,
- [Description("首套发料")]
+ [Description("棣栧鍙戞枡")]
First = 1,
}
/// <summary>
- /// 枚举：状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Called宸插彨鏂檤2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸插彂鏂檤6Close宸插叧闂瓅7Cancel浣滃簾)
/// </summary>
public enum STATUSs
{
- [Description("初始化")]
+ [Description("鍒濆鍖�")]
Init = 0,
- [Description("已叫料")]
+ [Description("宸插彨鏂�")]
Called = 1,
- [Description("待捡料")]
+ [Description("寰呮崱鏂�")]
WaitPick = 2,
- [Description("捡料中")]
+ [Description("鎹℃枡涓�")]
Picking = 3,
- [Description("已捡完")]
+ [Description("宸叉崱瀹�")]
Picked = 4,
- [Description("已发料")]
+ [Description("宸插彂鏂�")]
Sended = 5,
- [Description("已关闭")]
+ [Description("宸插叧闂�")]
Close = 6,
- [Description("作废")]
+ [Description("浣滃簾")]
Cancel = 7,
}
#endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
#endregion
--
Gitblit v1.9.3