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_SN.cs | 275 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 160 insertions(+), 115 deletions(-)
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 51efbd9..cdb32ab 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs
@@ -7,225 +7,270 @@
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 构造函数
+ #region 鏋勯�犲嚱鏁�
/// <summary>
- /// 实体：备料任务(WMS)条码明细
+ /// 瀹炰綋锛氬鏂欎换鍔�(WMS)鏉＄爜鏄庣粏
/// </summary>
public BIZ_WMS_PREP_SN() {}
#endregion
- #region 公共属性
+ #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; }
+ [DisplayName("鍙戞枡鎵规")]
+ public string DLVY_BATCH { get; set; }
/// <summary>
- /// 物品标签
+ /// 鐗╁搧鏍囩
/// </summary>
- [DisplayName("物品标签")]
+ [DisplayName("鐗╁搧鏍囩")]
public string SN { get; set; }
/// <summary>
- /// 物品编码
+ /// 鐗╁搧缂栫爜
/// </summary>
- [DisplayName("物品编码")]
+ [DisplayName("鐗╁搧缂栫爜")]
public string ITEM_CODE { get; set; }
- /// <summary>
- /// 单位
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [DisplayName("鎵规鍙�")]
+ public string LOTNO { get; set; }
+ /// <summary>
+ /// 鍗曚綅
/// </summary>
- [DisplayName("单位")]
- public string UNIT { get; set; }
+ [DisplayName("鍗曚綅")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 鐗╁搧鏁伴噺
+ /// </summary>
+ [DisplayName("鐗╁搧鏁伴噺")]
+ public double QTY { get; set; }
/// <summary>
- /// 物品数量
+ /// 鍗曚綅鐢ㄩ噺
/// </summary>
- [DisplayName("物品数量")]
- public string QTY { get; set; }
- /// <summary>
- /// 单位用量
- /// </summary>
- [DisplayName("单位用量")]
+ [DisplayName("鍗曚綅鐢ㄩ噺")]
public double QTY_UNIT { get; set; }
/// <summary>
- /// 发出数量
+ /// 鍙戝嚭鏁伴噺
/// </summary>
- [DisplayName("发出数量")]
+ [DisplayName("鍙戝嚭鏁伴噺")]
public double QTY_DLVY { get; set; }
/// <summary>
- /// 状态(同WMS_ITEM状态)
+ /// 鐘舵��(鍚學MS_ITEM鐘舵��)
/// </summary>
- [DisplayName("状态(同WMS_ITEM状态)")]
+ [DisplayName("鐘舵��(鍚學MS_ITEM鐘舵��)")]
public int STATUS { get; set; }
- /// <summary>
- /// 发料仓库
- /// </summary>
- [DisplayName("发料仓库")]
- public string WH_CODE { get; set; }
- /// <summary>
- /// 发料储区
- /// </summary>
- [DisplayName("发料储区")]
- public string REGION_CODE { get; set; }
- /// <summary>
- /// 发料货架/料车
- /// </summary>
- [DisplayName("发料货架/料车")]
- public string SHELF_CODE { get; set; }
- /// <summary>
- /// 发料储位
- /// </summary>
- [DisplayName("发料储位")]
- public string LOCATION_CODE { get; set; }
- /// <summary>
- /// 下架时间
- /// </summary>
- [DisplayName("下架时间")]
+ /// <summary>
+ /// 鍙戞枡浠撳簱ID
+ /// </summary>
+ [DisplayName("鍙戞枡浠撳簱ID")]
+ public string WH_ID { get; set; }
+ /// <summary>
+ /// 鍙戞枡浠撳簱
+ /// </summary>
+ [DisplayName("鍙戞枡浠撳簱")]
+ public string WH_CODE { get; set; }
+ /// <summary>
+ /// 鍙戞枡鍌ㄥ尯ID
+ /// </summary>
+ [DisplayName("鍙戞枡鍌ㄥ尯ID")]
+ public string REGION_ID { get; set; }
+ /// <summary>
+ /// 鍙戞枡鍌ㄥ尯
+ /// </summary>
+ [DisplayName("鍙戞枡鍌ㄥ尯")]
+ public string REGION_CODE { get; set; }
+ /// <summary>
+ /// 鍙戞枡璐ф灦/鏂欒溅ID
+ /// </summary>
+ [DisplayName("鍙戞枡璐ф灦/鏂欒溅ID")]
+ public string SHELF_ID { get; set; }
+ /// <summary>
+ /// 鍙戞枡璐ф灦/鏂欒溅
+ /// </summary>
+ [DisplayName("鍙戞枡璐ф灦/鏂欒溅")]
+ public string SHELF_CODE { get; set; }
+ /// <summary>
+ /// 鍙戞枡鍌ㄤ綅ID
+ /// </summary>
+ [DisplayName("鍙戞枡鍌ㄤ綅ID")]
+ public string LOCATION_ID { get; set; }
+ /// <summary>
+ /// 鍙戞枡鍌ㄤ綅
+ /// </summary>
+ [DisplayName("鍙戞枡鍌ㄤ綅")]
+ public string LOCATION_CODE { get; set; }
+ /// <summary>
+ /// 涓嬫灦鏃堕棿
+ /// </summary>
+ [DisplayName("涓嬫灦鏃堕棿")]
public DateTime DOWN_TIME { get; set; } = DateTime.MinValue;
/// <summary>
- /// 出库时间
+ /// 鍑哄簱鏃堕棿
/// </summary>
- [DisplayName("出库时间")]
+ [DisplayName("鍑哄簱鏃堕棿")]
public DateTime DLVY_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_LINE { 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 string SMT_NO { get; set; }
/// <summary>
- /// 站位号
+ /// 绔欎綅鍙�
/// </summary>
- [DisplayName("站位号")]
+ [DisplayName("绔欎綅鍙�")]
public string STATION_NO { get; set; }
/// <summary>
- /// 飞达号
+ /// 椋炶揪鍙�
/// </summary>
- [DisplayName("飞达号")]
+ [DisplayName("椋炶揪鍙�")]
public string FEEDER_NO { get; set; }
/// <summary>
- /// 料枪类型
+ /// 鏂欐灙绫诲瀷
/// </summary>
- [DisplayName("料枪类型")]
+ [DisplayName("鏂欐灙绫诲瀷")]
public string FEEDER_TYPE { get; set; }
/// <summary>
- /// 上料顺序
+ /// 涓婃枡椤哄簭
/// </summary>
- [DisplayName("上料顺序")]
+ [DisplayName("涓婃枡椤哄簭")]
public int LOAD_SEQ { get; set; }
/// <summary>
- /// 是否首套料(Y/N)
+ /// 鏄惁棣栧鏂�(Y/N)
/// </summary>
- [DisplayName("是否首套料(Y/N)")]
+ [DisplayName("鏄惁棣栧鏂�(Y/N)")]
public string IS_FIRST { get; set; }
/// <summary>
- /// 是否需要截料发料(Y/N)
+ /// 鏄惁闇�瑕佹埅鏂欏彂鏂�(Y/N)
/// </summary>
- [DisplayName("是否需要截料发料(Y/N)")]
+ [DisplayName("鏄惁闇�瑕佹埅鏂欏彂鏂�(Y/N)")]
public string NEED_CUTTING { get; set; }
/// <summary>
- /// 备注
+ /// 澶囨敞
/// </summary>
- [DisplayName("备注")]
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
- #endregion
+ /// <summary>
+ /// 杩芥函ID
+ /// </summary>
+ [DisplayName("杩芥函ID")]
+ public string TRACE_ID { get; set; }
+ /// <summary>
+ /// 杩芥函淇℃伅
+ /// </summary>
+ [DisplayName("杩芥函淇℃伅")]
+ public string TRACE_INFO { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ /// <summary>
+ /// 鎴枡鍚庡彂鍑虹殑SN
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public string DeliverySN { get; set; }
+ /// <summary>
+ /// 鎴枡鍚庝繚鐣欑殑SN
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public string ReserveSN { get; set; }
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_WMS_PREP_SN类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_PREP_SNId))]//ClassA表中的BIZ_WMS_PREP_SNId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_PREP_SNId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_PREP_SN绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_PREP_SNId))]//ClassA琛ㄤ腑鐨凚IZ_WMS_PREP_SNId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_PREP_SNId), 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,
}
*/
- #endregion
+ #endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3