From 6b821f97b2a82c199113d68054b3e3c93f3443aa Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期一, 28 四月 2025 14:19:04 +0800
Subject: [PATCH] 收货行ID类型修改
---
Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs | 98 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 76 insertions(+), 22 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
index 38e3f50..620fcad 100644
--- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
+++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO.cs
@@ -48,10 +48,15 @@
/// </summary>
[DisplayName("鐘舵��(0Init鍒濆鍖東1Imported宸插鍏2Release宸蹭笅鍙憒3Working鐢熶骇涓瓅4Paused宸叉殏鍋渱5Closed宸插叧闂�)")]
public int STATUS { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
+ /// <summary>
+ /// 鏄惁鍑嗗瀹屾垚(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鍑嗗瀹屾垚(Y/N)")]
+ public string IS_READY { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
public string ITEM_CODE { get; set; }
/// <summary>
/// 鐗╂枡绫诲瀷
@@ -103,10 +108,15 @@
/// </summary>
[DisplayName("瀹為檯绾夸綋")]
public string ACT_LINE { get; set; }
- /// <summary>
- /// 璁″垝寮�濮嬫椂闂�
- /// </summary>
- [DisplayName("璁″垝寮�濮嬫椂闂�")]
+ /// <summary>
+ /// 璁″垝鏃ユ湡
+ /// </summary>
+ [DisplayName("璁″垝鏃ユ湡")]
+ public string PLAN_DATE { get; set; }
+ /// <summary>
+ /// 璁″垝寮�濮嬫椂闂�
+ /// </summary>
+ [DisplayName("璁″垝寮�濮嬫椂闂�")]
public DateTime PLAN_START_TIME { get; set; } = DateTime.MinValue;
/// <summary>
/// 璁″垝缁撴潫鏃堕棿
@@ -183,25 +193,60 @@
/// </summary>
[DisplayName("鍏ュ簱鏁伴噺")]
public int STOCK_IN_QTY { get; set; }
- /// <summary>
- /// UPH
- /// </summary>
- [DisplayName("UPH")]
+ /// <summary>
+ /// 棣栦欢纭鏁伴噺
+ /// </summary>
+ [DisplayName("棣栦欢纭鏁伴噺")]
+ public int FIRST_IN_QTY { get; set; }
+ /// <summary>
+ /// UPH
+ /// </summary>
+ [DisplayName("UPH")]
public double UPH { get; set; }
/// <summary>
/// UPPH
/// </summary>
[DisplayName("UPPH")]
public double UPPH { get; set; }
- /// <summary>
- /// 鏈�鍚庣殑宸ュ崟鍘嗗彶ID
- /// </summary>
- [DisplayName("鏈�鍚庣殑宸ュ崟鍘嗗彶ID")]
- public string LAST_HIST_ID { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [DisplayName("澶囨敞")]
+ /// <summary>
+ /// 閿�鍞鍗�
+ /// </summary>
+ [DisplayName("閿�鍞鍗�")]
+ public string SALES_ORDER { get; set; }
+ /// <summary>
+ /// 閿�鍞悎鍚屽彿
+ /// </summary>
+ [DisplayName("閿�鍞悎鍚屽彿")]
+ public string SALES_CONTRACT { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞娉�
+ /// </summary>
+ [DisplayName("閿�鍞鍗曞娉�")]
+ public string SALES_REMARK { get; set; }
+ /// <summary>
+ /// 宸ュ崟搴忓垪鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟搴忓垪鍙�")]
+ public string SERIAL_NO { get; set; }
+ /// <summary>
+ /// 鍘傚唴鏉＄爜鍓嶇紑
+ /// </summary>
+ [DisplayName("鍘傚唴鏉＄爜鍓嶇紑")]
+ public string SN_PREFIX { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鏉＄爜鍓嶇紑
+ /// </summary>
+ [DisplayName("瀹㈡埛鏉＄爜鍓嶇紑")]
+ public string CUST_PREFIX { get; set; }
+ /// <summary>
+ /// 鏈�鍚庣殑宸ュ崟鍘嗗彶ID
+ /// </summary>
+ [DisplayName("鏈�鍚庣殑宸ュ崟鍘嗗彶ID")]
+ public string LAST_HIST_ID { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
/// <summary>
/// 鎺ュ彛琛ㄨ褰旾D
@@ -220,6 +265,10 @@
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
+ [SugarColumn(IsIgnore = true)]
+ public string CUST_NAME => Customer?.CUST_NAME_CN;
+ [SugarColumn(IsIgnore = true)]
+ public string WS_NAME => WorkShop?.WS_NAME;
#endregion
#region 澶栭敭灞炴��
@@ -234,9 +283,14 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_MES_WOId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+ [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁
public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [SugarColumn(IsIgnore = true)]
public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG);
+ [Navigate(NavigateType.OneToOne, nameof(CUST_CODE), nameof(BAS_CUSTOMER.CUST_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疊IZ_MES_WO绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public BAS_CUSTOMER Customer { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [Navigate(NavigateType.OneToOne, nameof(WS_CODE), nameof(MES_WORKSHOP.WS_CODE), "GHOST_ROW = 0")]
+ public MES_WORKSHOP WorkShop { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
#endregion
#region 鏋氫妇鍙橀噺
--
Gitblit v1.9.3