From f12084241b438c025550d4f9337935abf9a52c81 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 10 八月 2024 19:17:25 +0800
Subject: [PATCH] 在制品的生产信息的关联使用在制品的ID来关联，优化生产信息保存逻辑
---
Tiger.Business.MES/Transaction/CollectNode.cs | 8
Tiger.Business.MES/WorkAction/Assembly.cs | 54
Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs | 265 ++--
Tiger.Business.MES/Transaction/PackingNode.cs | 8
Tiger.Business.MES/Transaction/Position.cs | 32
Tiger.Model.Net/Entitys/MES/MES_WIP_DFT.cs | 538 +++++-----
Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs | 5
Tiger.Business.MES/Transaction/TestNode.cs | 6
Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs | 254 ++--
Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs | 300 ++--
Tiger.Business.MES/WorkAction/IPQC.cs | 5
Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs | 517 +++++----
Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs | 520 +++++----
Tiger.Business.MES/WorkAction/PackingAction.cs | 8
Tiger.Business.MES/WorkAction/PrintLabel.cs | 5
Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs | 547 +++++-----
Tiger.Business.MES/WorkAction/WipExtInfo.cs | 7
17 files changed, 1,575 insertions(+), 1,504 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 3c688ed..4856df7 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -181,6 +181,7 @@
var wipSN = new MES_WIP_DATA()
{
SN = input.SN,
+ FLOW_SN = input.SN,
STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
ITEM_CODE = CurBatch.WO.ITEM_CODE,
WORK_ORDER = CurBatch.Batch.ORDER_NO,
@@ -206,11 +207,12 @@
//缁戝畾鏉＄爜鍒板伐鍗�
foreach (var wipSN in wipSNs)
{
- if (!CurBatch.WoSNs.Any(q => q.SN == wipSN.SN))
+ if (!CurBatch.WoSNs.Any(q => q.WIP_ID == wipSN.ID))
{
CurBatch.WoSNs.Add(new()
{
WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ WIP_ID = wipSN.ID,
SN = wipSN.SN,
TRAY_SN = wipSN.TRAY_SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
@@ -295,8 +297,10 @@
DFT_CODE = dft.DFT_CODE,
DFT_NAME = dft.DFT_NAME,
DFT_LEVEL = dft.DFT_LEVEL,
+ FLOW_SN = wipSN.FLOW_SN,
TRAY_SN = wipSN.TRAY_SN,
- CONTAINER_SN = wipSN.CONTAINER_SN,
+ INNER_SN = wipSN.INNER_SN,
+ CARTON_SN = wipSN.CARTON_SN,
PALLET_SN = wipSN.PALLET_SN,
INV_FLAG = wipSN.INV_FLAG,
OPERATION_TIME = DateTime.Now,
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 265f273..e66574b 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -212,7 +212,8 @@
var wipSN = new MES_WIP_DATA()
{
SN = input.SN,
- STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
+ FLOW_SN = input.SN,
+ STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
ITEM_CODE = CurBatch.WO.ITEM_CODE,
WORK_ORDER = CurBatch.Batch.ORDER_NO,
BATCH_NO = CurBatch.Batch.BATCH_NO,
@@ -242,6 +243,7 @@
CurBatch.WoSNs.Add(new()
{
WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ WIP_ID = wipSN.ID,
SN = wipSN.SN,
TRAY_SN = wipSN.TRAY_SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
@@ -326,8 +328,10 @@
DFT_CODE = dft.DFT_CODE,
DFT_NAME = dft.DFT_NAME,
DFT_LEVEL = dft.DFT_LEVEL,
+ FLOW_SN = wipSN.FLOW_SN,
TRAY_SN = wipSN.TRAY_SN,
- CONTAINER_SN = wipSN.CONTAINER_SN,
+ INNER_SN = wipSN.INNER_SN,
+ CARTON_SN = wipSN.CARTON_SN,
PALLET_SN = wipSN.PALLET_SN,
INV_FLAG = wipSN.INV_FLAG,
OPERATION_TIME = DateTime.Now,
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 6e26cf6..757ae4e 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -17,7 +17,7 @@
/// <summary>
/// MES宀椾綅浜嬪姟
/// </summary>
- public class Position : MESTransactionBase, IPosition, ICloneable
+ public class Position : MESTransactionBase, IPosition
{
public IPosition Init(string id, string apiHost, string userCode, string postCode)
{
@@ -330,15 +330,6 @@
return result;
}
- public object Clone()
- {
- var newObject = this.MemberwiseClone() as Position;
- newObject.Steps = Steps.Clone();
- newObject.CurWipSNs = CurWipSNs.Clone();
-
- return newObject;
- }
-
/// <summary>
/// 淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版暟鎹簱
/// </summary>
@@ -374,25 +365,6 @@
throw dbTran.ErrorException;
}
}
-
-
- //if (NeedTemporaryStoreDBCommitAction)
- //{
-
-
- // NodeCommitList.Add(this.Clone() as Position);
- //}
- //else
- //{
- // //淇濆瓨鎴愬姛鍒欐竻绌烘彁浜ゆ搷浣滃垪琛�
- // foreach (var item in NodeCommitList)
- // {
- // item?.DoSaveToDB();
- // item?.Dispose();
- // }
- // DoSaveToDB();
- // NodeCommitList.Clear();
- //}
}
protected void DoSaveToDB()
@@ -503,7 +475,7 @@
switch (pv.VAR_METHOD)
{
case "GetCartonGenerate":
- return Biz.CodeRule[lv.BARCODE_RULE].Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString();
+ return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
default:
return "";
}
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 467f33f..e343980 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -182,6 +182,7 @@
var wipSN = new MES_WIP_DATA()
{
SN = input.SN,
+ FLOW_SN = input.SN,
STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
ITEM_CODE = CurBatch.WO.ITEM_CODE,
WORK_ORDER = CurBatch.Batch.ORDER_NO,
@@ -212,6 +213,7 @@
CurBatch.WoSNs.Add(new()
{
WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ WIP_ID = wipSN.ID,
SN = wipSN.SN,
TRAY_SN = wipSN.TRAY_SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
@@ -296,8 +298,10 @@
DFT_CODE = dft.DFT_CODE,
DFT_NAME = dft.DFT_NAME,
DFT_LEVEL = dft.DFT_LEVEL,
+ FLOW_SN = wipSN.FLOW_SN,
TRAY_SN = wipSN.TRAY_SN,
- CONTAINER_SN = wipSN.CONTAINER_SN,
+ INNER_SN = wipSN.INNER_SN,
+ CARTON_SN = wipSN.CARTON_SN,
PALLET_SN = wipSN.PALLET_SN,
INV_FLAG = wipSN.INV_FLAG,
OPERATION_TIME = DateTime.Now,
diff --git a/Tiger.Business.MES/WorkAction/Assembly.cs b/Tiger.Business.MES/WorkAction/Assembly.cs
index b83aef9..ab68c80 100644
--- a/Tiger.Business.MES/WorkAction/Assembly.cs
+++ b/Tiger.Business.MES/WorkAction/Assembly.cs
@@ -180,6 +180,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
SN = input.SN,
PROD_SN = wipSn.SN,
ITEM_CODE = item.ItemInfo.ITEM_CODE,
@@ -203,30 +204,34 @@
}
else
{
- var record = new MES_WIP_ASSY()
+ foreach (var wipSn in CurPosition.CurWipSNs)
{
- AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
- AUTH_PROD = CurPosition.CurLine.LINE_CODE,
- SN = input.SN,
- PROD_SN = CurPosition.CurSN,
- ITEM_CODE = item.ItemInfo.ITEM_CODE,
- QTY = 1,
- UNIT = item.ItemInfo.UNIT,
- WORK_ORDER = CurPosition.CurWipSNs.First().WORK_ORDER,
- BATCH_NO = CurPosition.CurWipSNs.First().BATCH_NO,
- ROT_CODE = CurPosition.CurWipSNs.First().ROT_CODE,
- NODE_ID = CurPosition.CurWipSNs.First().NODE_ID,
- NODE_NAME = CurPosition.CurWipSNs.First().NODE_NAME,
- FTY_CODE = CurPosition.CurWipSNs.First().FTY_CODE,
- WS_CODE = CurPosition.CurWipSNs.First().WS_CODE,
- LINE_CODE = CurPosition.CurWipSNs.First().LINE_CODE,
- POST_CODE = CurPosition.CurWipSNs.First().POST_CODE,
- OPER_CODE = CurPosition.CurWipSNs.First().OPER_CODE,
- SEGMENT = CurPosition.CurWipSNs.First().SEGMENT,
- };
- item.Records.Add(record);
+ var record = new MES_WIP_ASSY()
+ {
+ AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
+ AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
+ SN = input.SN,
+ PROD_SN = wipSn.SN,
+ ITEM_CODE = item.ItemInfo.ITEM_CODE,
+ QTY = 1,
+ UNIT = item.ItemInfo.UNIT,
+ WORK_ORDER = wipSn.WORK_ORDER,
+ BATCH_NO = wipSn.BATCH_NO,
+ ROT_CODE = wipSn.ROT_CODE,
+ NODE_ID = wipSn.NODE_ID,
+ NODE_NAME = wipSn.NODE_NAME,
+ FTY_CODE = wipSn.FTY_CODE,
+ WS_CODE = wipSn.WS_CODE,
+ LINE_CODE = wipSn.LINE_CODE,
+ POST_CODE = wipSn.POST_CODE,
+ OPER_CODE = wipSn.OPER_CODE,
+ SEGMENT = wipSn.SEGMENT,
+ };
+ item.Records.Add(record);
+ }
- if (item.Records.Sum(q => q.QTY) >= item.LoadQty * CurPosition.CurWipSNs.Count)
+ if (item.Records.Sum(q => q.QTY) / item.Records.Count >= item.LoadQty * CurPosition.CurWipSNs.Count)
{
item.IsFinished = true;
}
@@ -277,6 +282,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
SN = wipSn.SN,
STATUS = wipSn.STATUS,
@@ -294,7 +300,11 @@
POST_CODE = wipSn.POST_CODE,
OPER_CODE = wipSn.OPER_CODE,
SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
OPERATION_TIME = DateTime.Now,
SFTS_CODE = wipSn.SFTS_CODE,
SFT_CODE = wipSn.SFT_CODE,
diff --git a/Tiger.Business.MES/WorkAction/IPQC.cs b/Tiger.Business.MES/WorkAction/IPQC.cs
index d0d8c47..933ed6e 100644
--- a/Tiger.Business.MES/WorkAction/IPQC.cs
+++ b/Tiger.Business.MES/WorkAction/IPQC.cs
@@ -113,6 +113,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
SN = wipSn.SN,
STATUS = wipSn.STATUS,
@@ -130,7 +131,11 @@
POST_CODE = wipSn.POST_CODE,
OPER_CODE = wipSn.OPER_CODE,
SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
OPERATION_TIME = DateTime.Now,
SFTS_CODE = wipSn.SFTS_CODE,
SFT_CODE = wipSn.SFT_CODE,
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 9ba0268..2c0b098 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -350,6 +350,7 @@
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
SN = pInput.PkgSN,
+ WIP_ID = CurPosition.CurWipSNs.Count == 1 ? CurPosition.CurWipSNs.First().ID : null,
PKG_TYPE = dtl.PkgType.PKG_NAME,
ITEM_CODE = CurPosition.CurWipSNs.First().ITEM_CODE,
QTY = CurPosition.CurWipSNs.First().QTY,
@@ -549,6 +550,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
SN = wipSn.SN,
STATUS = wipSn.STATUS,
@@ -566,7 +568,11 @@
POST_CODE = wipSn.POST_CODE,
OPER_CODE = wipSn.OPER_CODE,
SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
OPERATION_TIME = DateTime.Now,
SFTS_CODE = wipSn.SFTS_CODE,
SFT_CODE = wipSn.SFT_CODE,
@@ -595,7 +601,7 @@
//鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
db.Updateable<MES_WIP_DATA>()
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.CONTAINER_SN == q.CARTON_SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
.SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
.Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
.ExecuteCommand();
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index 0529854..85234b9 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -115,6 +115,7 @@
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
+ WIP_ID = wipSn.ID,
SN = wipSn.SN,
STATUS = wipSn.STATUS,
ITEM_CODE = wipSn.ITEM_CODE,
@@ -131,7 +132,11 @@
POST_CODE = wipSn.POST_CODE,
OPER_CODE = wipSn.OPER_CODE,
SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
OPERATION_TIME = DateTime.Now,
SFTS_CODE = wipSn.SFTS_CODE,
SFT_CODE = wipSn.SFT_CODE,
diff --git a/Tiger.Business.MES/WorkAction/WipExtInfo.cs b/Tiger.Business.MES/WorkAction/WipExtInfo.cs
index 1854d85..7f445e4 100644
--- a/Tiger.Business.MES/WorkAction/WipExtInfo.cs
+++ b/Tiger.Business.MES/WorkAction/WipExtInfo.cs
@@ -54,6 +54,7 @@
AUTH_ORG = wipSN.AUTH_ORG,
AUTH_PROD = wipSN.AUTH_PROD,
SN = wipSN.SN,
+ WIP_ID = wipSN.ID,
});
}
}
@@ -133,7 +134,6 @@
}
//閮芥病鏈夌墿鏂欓獙璇侀�氳繃锛屽垯杩斿洖閿欒淇℃伅
-
}
catch (System.Exception ex)
{
@@ -162,6 +162,7 @@
{
AUTH_ORG = CurPosition.WorkBatch.WO.AUTH_ORG,
AUTH_PROD = CurPosition.CurLine.LINE_CODE,
+ WIP_ID = wipSn.ID,
HIS_ID = CurPosition.CurWipSNHiss.First(q => q.SN == wipSn.SN).ID,
SN = wipSn.SN,
STATUS = wipSn.STATUS,
@@ -179,7 +180,11 @@
POST_CODE = wipSn.POST_CODE,
OPER_CODE = wipSn.OPER_CODE,
SEGMENT = wipSn.SEGMENT,
+ FLOW_SN = wipSn.FLOW_SN,
TRAY_SN = wipSn.TRAY_SN,
+ INNER_SN = wipSn.INNER_SN,
+ CARTON_SN = wipSn.CARTON_SN,
+ PALLET_SN = wipSn.PALLET_SN,
OPERATION_TIME = DateTime.Now,
SFTS_CODE = wipSn.SFTS_CODE,
SFT_CODE = wipSn.SFT_CODE,
diff --git a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs
index 928b95f..004bb98 100644
--- a/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs
+++ b/Tiger.Model.Net/Entitys/MES/BIZ_MES_WO_SN.cs
@@ -34,6 +34,11 @@
[DisplayName("宸ュ崟鎵规鍙�")]
public string BATCH_NO { get; set; }
/// <summary>
+ /// 鍦ㄥ埗鍝両D
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D")]
+ public string WIP_ID { get; set; }
+ /// <summary>
/// 鏉＄爜
/// </summary>
[DisplayName("鏉＄爜")]
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
index de28a3c..ac6713f 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
@@ -6,269 +6,294 @@
namespace Tiger.Model
{
- /// <summary>
- /// 实体：生产行为记录
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("生产行为记录")]
- [Serializable]
- [SugarTable("MES_WIP_ACT")]
- public class MES_WIP_ACT : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：生产行为记录
- /// </summary>
- public MES_WIP_ACT() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜ц涓鸿褰�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐢熶骇琛屼负璁板綍")]
+ [Serializable]
+ [SugarTable("MES_WIP_ACT")]
+ public class MES_WIP_ACT : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜ц涓鸿褰�
+ /// </summary>
+ public MES_WIP_ACT() { }
+ #endregion
- #region 公共属性
- /// <summary>
- /// 生产过程记录ID
- /// </summary>
- [DisplayName("生产过程记录ID")]
- public string HIS_ID { get; set; }
- /// <summary>
- /// 过站条码
- /// </summary>
- [DisplayName("过站条码")]
- public string SN { get; set; }
- /// <summary>
- /// 状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)
- /// </summary>
- [DisplayName("状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)")]
- public int STATUS { get; set; }
- /// <summary>
- /// 物料编码
- /// </summary>
- [DisplayName("物料编码")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 工单号
- /// </summary>
- [DisplayName("工单号")]
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 工单批次号
- /// </summary>
- [DisplayName("工单批次号")]
- public string BATCH_NO { get; set; }
- /// <summary>
- /// 工艺路线编码
- /// </summary>
- [DisplayName("工艺路线编码")]
- public string ROT_CODE { get; set; }
- /// <summary>
- /// 工艺路线节点ID
- /// </summary>
- [DisplayName("工艺路线节点ID")]
- public string NODE_ID { get; set; }
- /// <summary>
- /// 工艺路线节点名称
- /// </summary>
- [DisplayName("工艺路线节点名称")]
- public string NODE_NAME { get; set; }
- /// <summary>
- /// 工序行为ID
- /// </summary>
- [DisplayName("工序行为ID")]
- public string ACT_ID { get; set; }
- /// <summary>
- /// 行为名称
- /// </summary>
- [DisplayName("行为名称")]
- public string ACT_NAME { 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 string TRAY_SN { get; set; }
- /// <summary>
- /// 当前操作时间
- /// </summary>
- [DisplayName("当前操作时间")]
- public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 班制编码
- /// </summary>
- [DisplayName("班制编码")]
- public string SFTS_CODE { get; set; }
- /// <summary>
- /// 班次编码
- /// </summary>
- [DisplayName("班次编码")]
- public string SFT_CODE { get; set; }
- /// <summary>
- /// 时段编码
- /// </summary>
- [DisplayName("时段编码")]
- public string PRD_CODE { get; set; }
- /// <summary>
- /// 行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|6Package包装规则)
- /// </summary>
- [DisplayName("行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|6Package包装规则)")]
- public int ACT_TYPE { get; set; }
- /// <summary>
- /// 行为扫码
- /// </summary>
- [DisplayName("行为扫码")]
- public string ACT_SN { get; set; }
- /// <summary>
- /// 行为操作值1
- /// </summary>
- [DisplayName("行为操作值1")]
- public string ACT_VALUE_1 { get; set; }
- /// <summary>
- /// 行为操作值2
- /// </summary>
- [DisplayName("行为操作值2")]
- public string ACT_VALUE_2 { get; set; }
- /// <summary>
- /// 行为操作值3
- /// </summary>
- [DisplayName("行为操作值3")]
- public string ACT_VALUE_3 { get; set; }
- /// <summary>
- /// 行为操作值4
- /// </summary>
- [DisplayName("行为操作值4")]
- public string ACT_VALUE_4 { get; set; }
- /// <summary>
- /// 行为操作值5
- /// </summary>
- [DisplayName("行为操作值5")]
- public string ACT_VALUE_5 { get; set; }
- /// <summary>
- /// 行为是否成功(Y/N)
- /// </summary>
- [DisplayName("行为是否成功(Y/N)")]
- public string ACT_RESULT { get; set; }
- /// <summary>
- /// 备注
- /// </summary>
- [DisplayName("备注")]
- public string REMARK { get; set; }
- /// <summary>
- /// 追溯信息
- /// </summary>
- [DisplayName("追溯信息")]
- public string TRACE_INFO { get; set; }
- #endregion
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D")]
+ public string WIP_ID { get; set; }
+ /// <summary>
+ /// 鐢熶骇杩囩▼璁板綍ID
+ /// </summary>
+ [DisplayName("鐢熶骇杩囩▼璁板綍ID")]
+ public string HIS_ID { get; set; }
+ /// <summary>
+ /// 杩囩珯鏉＄爜
+ /// </summary>
+ [DisplayName("杩囩珯鏉＄爜")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// </summary>
+ [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鍙�")]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 宸ュ崟鎵规鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鎵规鍙�")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎缂栫爜
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { get; set; }
+ /// <summary>
+ /// 宸ュ簭琛屼负ID
+ /// </summary>
+ [DisplayName("宸ュ簭琛屼负ID")]
+ public string ACT_ID { get; set; }
+ /// <summary>
+ /// 琛屼负鍚嶇О
+ /// </summary>
+ [DisplayName("琛屼负鍚嶇О")]
+ public string ACT_NAME { 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 string FLOW_SN { get; set; }
+ /// <summary>
+ /// 鎵樼洏/杞藉叿鏉＄爜
+ /// </summary>
+ [DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
+ public string TRAY_SN { get; set; }
+ /// <summary>
+ /// 鍐呭寘瑁呮潯鐮�
+ /// </summary>
+ [DisplayName("鍐呭寘瑁呮潯鐮�")]
+ public string INNER_SN { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜
+ /// </summary>
+ [DisplayName("澶栫鏉＄爜")]
+ public string CARTON_SN { get; set; }
+ /// <summary>
+ /// 鏍堟澘鏉＄爜
+ /// </summary>
+ [DisplayName("鏍堟澘鏉＄爜")]
+ public string PALLET_SN { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鏃堕棿
+ /// </summary>
+ [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
+ public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鐝埗缂栫爜
+ /// </summary>
+ [DisplayName("鐝埗缂栫爜")]
+ public string SFTS_CODE { get; set; }
+ /// <summary>
+ /// 鐝缂栫爜
+ /// </summary>
+ [DisplayName("鐝缂栫爜")]
+ public string SFT_CODE { get; set; }
+ /// <summary>
+ /// 鏃舵缂栫爜
+ /// </summary>
+ [DisplayName("鏃舵缂栫爜")]
+ public string PRD_CODE { get; set; }
+ /// <summary>
+ /// 琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// </summary>
+ [DisplayName("琛屼负绫诲瀷(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)")]
+ public int ACT_TYPE { get; set; }
+ /// <summary>
+ /// 琛屼负鎵爜
+ /// </summary>
+ [DisplayName("琛屼负鎵爜")]
+ public string ACT_SN { get; set; }
+ /// <summary>
+ /// 琛屼负鎿嶄綔鍊�1
+ /// </summary>
+ [DisplayName("琛屼负鎿嶄綔鍊�1")]
+ public string ACT_VALUE_1 { get; set; }
+ /// <summary>
+ /// 琛屼负鎿嶄綔鍊�2
+ /// </summary>
+ [DisplayName("琛屼负鎿嶄綔鍊�2")]
+ public string ACT_VALUE_2 { get; set; }
+ /// <summary>
+ /// 琛屼负鎿嶄綔鍊�3
+ /// </summary>
+ [DisplayName("琛屼负鎿嶄綔鍊�3")]
+ public string ACT_VALUE_3 { get; set; }
+ /// <summary>
+ /// 琛屼负鎿嶄綔鍊�4
+ /// </summary>
+ [DisplayName("琛屼负鎿嶄綔鍊�4")]
+ public string ACT_VALUE_4 { get; set; }
+ /// <summary>
+ /// 琛屼负鎿嶄綔鍊�5
+ /// </summary>
+ [DisplayName("琛屼负鎿嶄綔鍊�5")]
+ public string ACT_VALUE_5 { get; set; }
+ /// <summary>
+ /// 琛屼负鏄惁鎴愬姛(Y/N)
+ /// </summary>
+ [DisplayName("琛屼负鏄惁鎴愬姛(Y/N)")]
+ public string ACT_RESULT { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// 杩芥函淇℃伅
+ /// </summary>
+ [DisplayName("杩芥函淇℃伅")]
+ public string TRACE_INFO { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_ACT类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ACTId))]//ClassA表中的MES_WIP_ACTId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ACTId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_ACT绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ACTId))]//ClassA琛ㄤ腑鐨凪ES_WIP_ACTId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ACTId), 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>
- /// 枚举：状态(0Init初始化|1Input已投入|2OK良品过站|3NG不良过站|4Repair维修中|5Finished已完工|6Scrap已报废|7InStorage已入库|8Reject已拒收|9Shipped已出货)
- /// </summary>
- public enum STATUSs
- {
- [Description("初始化")]
- Init = 0,
- [Description("已投入")]
- Input = 1,
- [Description("良品过站")]
- OK = 2,
- [Description("不良过站")]
- NG = 3,
- [Description("维修中")]
- Repair = 4,
- [Description("已完工")]
- Finished = 5,
- [Description("已报废")]
- Scrap = 6,
- [Description("已入库")]
- InStorage = 7,
- [Description("已拒收")]
- Reject = 8,
- [Description("已出货")]
- Shipped = 9,
- }
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("鍒濆鍖�")]
+ Init = 0,
+ [Description("宸叉姇鍏�")]
+ Input = 1,
+ [Description("鑹搧杩囩珯")]
+ OK = 2,
+ [Description("涓嶈壇杩囩珯")]
+ NG = 3,
+ [Description("缁翠慨涓�")]
+ Repair = 4,
+ [Description("宸插畬宸�")]
+ Finished = 5,
+ [Description("宸叉姤搴�")]
+ Scrap = 6,
+ [Description("宸插叆搴�")]
+ InStorage = 7,
+ [Description("宸叉嫆鏀�")]
+ Reject = 8,
+ [Description("宸插嚭璐�")]
+ Shipped = 9,
+ }
- /// <summary>
- /// 枚举：行为类型(0Normal默认行为|1Scan扫码验证|2Assy组装上料|3Test产品测试|4Audit产品抽检|5Print标签打印|6Package包装规则)
- /// </summary>
- public enum ACT_TYPEs
- {
- [Description("默认行为")]
- Normal = 0,
- [Description("扫码验证")]
- Scan = 1,
- [Description("组装上料")]
- Assy = 2,
- [Description("产品测试")]
- Test = 3,
- [Description("产品抽检")]
- Audit = 4,
- [Description("标签打印")]
- Print = 5,
- [Description("包装规则")]
- Package = 6,
- }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氳涓虹被鍨�(0Normal榛樿琛屼负|1Scan鎵爜楠岃瘉|2Assy缁勮涓婃枡|3Test浜у搧娴嬭瘯|4Audit浜у搧鎶芥|5Print鏍囩鎵撳嵃|6Package鍖呰瑙勫垯)
+ /// </summary>
+ public enum ACT_TYPEs
+ {
+ [Description("榛樿琛屼负")]
+ Normal = 0,
+ [Description("鎵爜楠岃瘉")]
+ Scan = 1,
+ [Description("缁勮涓婃枡")]
+ Assy = 2,
+ [Description("浜у搧娴嬭瘯")]
+ Test = 3,
+ [Description("浜у搧鎶芥")]
+ Audit = 4,
+ [Description("鏍囩鎵撳嵃")]
+ Print = 5,
+ [Description("鍖呰瑙勫垯")]
+ Package = 6,
+ }
+ #endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs
index 46be0c6..b86910e 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ASSY.cs
@@ -6,151 +6,156 @@
namespace Tiger.Model
{
- /// <summary>
- /// 实体：生产上料记录
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("生产上料记录")]
- [Serializable]
- [SugarTable("MES_WIP_ASSY")]
- public class MES_WIP_ASSY : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：生产上料记录
- /// </summary>
- public MES_WIP_ASSY() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜т笂鏂欒褰�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐢熶骇涓婃枡璁板綍")]
+ [Serializable]
+ [SugarTable("MES_WIP_ASSY")]
+ public class MES_WIP_ASSY : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜т笂鏂欒褰�
+ /// </summary>
+ public MES_WIP_ASSY() { }
+ #endregion
- #region 公共属性
- /// <summary>
- /// 物料条码
- /// </summary>
- [DisplayName("物料条码")]
- public string SN { get; set; }
- /// <summary>
- /// 产品条码
- /// </summary>
- [DisplayName("产品条码")]
- public string PROD_SN { get; set; }
- /// <summary>
- /// 物料编码
- /// </summary>
- [DisplayName("物料编码")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 数量
- /// </summary>
- [DisplayName("数量")]
- public double QTY { get; set; }
- /// <summary>
- /// 单位
- /// </summary>
- [DisplayName("单位")]
- public string UNIT { get; set; }
- /// <summary>
- /// 工单号
- /// </summary>
- [DisplayName("工单号")]
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 工单批次号
- /// </summary>
- [DisplayName("工单批次号")]
- public string BATCH_NO { get; set; }
- /// <summary>
- /// 工艺路线编码
- /// </summary>
- [DisplayName("工艺路线编码")]
- public string ROT_CODE { get; set; }
- /// <summary>
- /// 工艺路线节点ID
- /// </summary>
- [DisplayName("工艺路线节点ID")]
- public string NODE_ID { get; set; }
- /// <summary>
- /// 工艺路线节点名称
- /// </summary>
- [DisplayName("工艺路线节点名称")]
- public string NODE_NAME { 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 string REMARK { get; set; }
- /// <summary>
- /// 追溯信息
- /// </summary>
- [DisplayName("追溯信息")]
- public string TRACE_INFO { get; set; }
- #endregion
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D")]
+ public string WIP_ID { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ /// </summary>
+ [DisplayName("鐗╂枡鏉＄爜")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 浜у搧鏉＄爜(鍘傚唴娴佽浆鏉＄爜)
+ /// </summary>
+ [DisplayName("浜у搧鏉＄爜(鍘傚唴娴佽浆鏉＄爜)")]
+ public string PROD_SN { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [DisplayName("鏁伴噺")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [DisplayName("鍗曚綅")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鍙�")]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 宸ュ崟鎵规鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鎵规鍙�")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎缂栫爜
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { 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 string REMARK { get; set; }
+ /// <summary>
+ /// 杩芥函淇℃伅
+ /// </summary>
+ [DisplayName("杩芥函淇℃伅")]
+ public string TRACE_INFO { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_ASSY类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ASSYId))]//ClassA表中的MES_WIP_ASSYId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ASSYId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_ASSY绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_ASSYId))]//ClassA琛ㄤ腑鐨凪ES_WIP_ASSYId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_ASSYId), 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
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
index 7100b39..13a0c10 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DATA.cs
@@ -6,38 +6,38 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("鍦ㄥ埗鍝佷俊鎭〃")]
- [Serializable]
- [SugarTable("MES_WIP_DATA")]
- public class MES_WIP_DATA : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
- /// <summary>
- /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
- /// </summary>
- public MES_WIP_DATA() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鍦ㄥ埗鍝佷俊鎭〃")]
+ [Serializable]
+ [SugarTable("MES_WIP_DATA")]
+ public class MES_WIP_DATA : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氬湪鍒跺搧淇℃伅琛�
+ /// </summary>
+ public MES_WIP_DATA() { }
+ #endregion
- #region 鍏叡灞炴��
- /// <summary>
- /// 杩囩珯鏉＄爜
- /// </summary>
- [DisplayName("杩囩珯鏉＄爜")]
- public string SN { get; set; }
- /// <summary>
- /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
- /// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
- public int STATUS { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
- public string ITEM_CODE { get; set; }
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 杩囩珯鏉＄爜
+ /// </summary>
+ [DisplayName("杩囩珯鏉＄爜")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// </summary>
+ [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
/// <summary>
/// 鏁伴噺
/// </summary>
@@ -47,221 +47,226 @@
/// 宸ュ崟鍙�
/// </summary>
[DisplayName("宸ュ崟鍙�")]
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 宸ュ崟鎵规鍙�
- /// </summary>
- [DisplayName("宸ュ崟鎵规鍙�")]
- public string BATCH_NO { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎缂栫爜
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎缂栫爜")]
- public string ROT_CODE { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣ID
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
- public string NODE_ID { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
- public string NODE_NAME { 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 string HOLD_FLAG { get; set; }
- /// <summary>
- /// 杩斿伐鏍囪
- /// </summary>
- [DisplayName("杩斿伐鏍囪")]
- public string REWORK_FLAG { get; set; }
- /// <summary>
- /// 鏄惁瀹屽伐
- /// </summary>
- [DisplayName("鏄惁瀹屽伐")]
- public string FINISHED_FLAG { get; set; }
- /// <summary>
- /// 鏄惁涓嶈壇
- /// </summary>
- [DisplayName("鏄惁涓嶈壇")]
- public string DFT_FLAG { get; set; }
- /// <summary>
- /// 涓嶈壇璁℃暟
- /// </summary>
- [DisplayName("涓嶈壇璁℃暟")]
- public int DFT_COUNT { get; set; }
- /// <summary>
- /// 涓嶈壇浠ｇ爜缂栫爜
- /// </summary>
- [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
- public string DFT_CODE { get; set; }
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 宸ュ崟鎵规鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鎵规鍙�")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎缂栫爜
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { 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 string HOLD_FLAG { get; set; }
+ /// <summary>
+ /// 杩斿伐鏍囪
+ /// </summary>
+ [DisplayName("杩斿伐鏍囪")]
+ public string REWORK_FLAG { get; set; }
+ /// <summary>
+ /// 鏄惁瀹屽伐
+ /// </summary>
+ [DisplayName("鏄惁瀹屽伐")]
+ public string FINISHED_FLAG { get; set; }
+ /// <summary>
+ /// 鏄惁涓嶈壇
+ /// </summary>
+ [DisplayName("鏄惁涓嶈壇")]
+ public string DFT_FLAG { get; set; }
+ /// <summary>
+ /// 涓嶈壇璁℃暟
+ /// </summary>
+ [DisplayName("涓嶈壇璁℃暟")]
+ public int DFT_COUNT { get; set; }
+ /// <summary>
+ /// 涓嶈壇浠ｇ爜缂栫爜
+ /// </summary>
+ [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
+ public string DFT_CODE { get; set; }
/// <summary>
/// 缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)
/// </summary>
[DisplayName("缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)")]
public string REFLOW_NODE { get; set; }
/// <summary>
+ /// 鍘傚唴娴佽浆鏉＄爜
+ /// </summary>
+ [DisplayName("鍘傚唴娴佽浆鏉＄爜")]
+ public string FLOW_SN { get; set; }
+ /// <summary>
/// 鎵樼洏/杞藉叿鏉＄爜
/// </summary>
[DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
- public string TRAY_SN { get; set; }
- /// <summary>
- /// 瀹瑰櫒/鍐呭寘瑁呮潯鐮�
- /// </summary>
- [DisplayName("瀹瑰櫒/鍐呭寘瑁呮潯鐮�")]
- public string CONTAINER_SN { get; set; }
- /// <summary>
- /// 澶栫鏉＄爜
- /// </summary>
- [DisplayName("澶栫鏉＄爜")]
- public string CARTON_SN { get; set; }
- /// <summary>
- /// 鏍堟澘鏉＄爜
- /// </summary>
- [DisplayName("鏍堟澘鏉＄爜")]
- public string PALLET_SN { get; set; }
- /// <summary>
- /// 鏄惁鍏ュ簱
- /// </summary>
- [DisplayName("鏄惁鍏ュ簱")]
- public string INV_FLAG { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- [DisplayName("鍏ュ簱鏃ユ湡")]
- public DateTime INV_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鎶曞叆鏃堕棿
- /// </summary>
- [DisplayName("鎶曞叆鏃堕棿")]
- public DateTime INLINE_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 浜у嚭鏃堕棿
- /// </summary>
- [DisplayName("浜у嚭鏃堕棿")]
- public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 褰撳墠鎿嶄綔鏃堕棿
- /// </summary>
- [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
- public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鐝埗缂栫爜
- /// </summary>
- [DisplayName("鐝埗缂栫爜")]
- public string SFTS_CODE { get; set; }
- /// <summary>
- /// 鐝缂栫爜
- /// </summary>
- [DisplayName("鐝缂栫爜")]
- public string SFT_CODE { get; set; }
- /// <summary>
- /// 鏃舵缂栫爜
- /// </summary>
- [DisplayName("鏃舵缂栫爜")]
- public string PRD_CODE { get; set; }
- /// <summary>
- /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
- /// </summary>
- [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")]
- public int OBA_STATUS { get; set; }
- /// <summary>
- /// 鎶芥鎵规鍙�
- /// </summary>
- [DisplayName("鎶芥鎵规鍙�")]
- public string OBA_BATCH { get; set; }
- /// <summary>
- /// 閿佸畾鎵规鍙�
- /// </summary>
- [DisplayName("閿佸畾鎵规鍙�")]
- public string LOCK_BATCH { get; set; }
- /// <summary>
- /// 鍑鸿揣鏃堕棿
- /// </summary>
- [DisplayName("鍑鸿揣鏃堕棿")]
- public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鍑鸿揣鍗曞彿
- /// </summary>
- [DisplayName("鍑鸿揣鍗曞彿")]
- public string SHIPPING_ORDER { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [DisplayName("澶囨敞")]
- public string REMARK { get; set; }
- #endregion
+ public string TRAY_SN { get; set; }
+ /// <summary>
+ /// 鍐呭寘瑁呮潯鐮�
+ /// </summary>
+ [DisplayName("鍐呭寘瑁呮潯鐮�")]
+ public string INNER_SN { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜
+ /// </summary>
+ [DisplayName("澶栫鏉＄爜")]
+ public string CARTON_SN { get; set; }
+ /// <summary>
+ /// 鏍堟澘鏉＄爜
+ /// </summary>
+ [DisplayName("鏍堟澘鏉＄爜")]
+ public string PALLET_SN { get; set; }
+ /// <summary>
+ /// 鏄惁鍏ュ簱
+ /// </summary>
+ [DisplayName("鏄惁鍏ュ簱")]
+ public string INV_FLAG { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鏃ユ湡
+ /// </summary>
+ [DisplayName("鍏ュ簱鏃ユ湡")]
+ public DateTime INV_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鎶曞叆鏃堕棿
+ /// </summary>
+ [DisplayName("鎶曞叆鏃堕棿")]
+ public DateTime INLINE_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 浜у嚭鏃堕棿
+ /// </summary>
+ [DisplayName("浜у嚭鏃堕棿")]
+ public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鏃堕棿
+ /// </summary>
+ [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
+ public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鐝埗缂栫爜
+ /// </summary>
+ [DisplayName("鐝埗缂栫爜")]
+ public string SFTS_CODE { get; set; }
+ /// <summary>
+ /// 鐝缂栫爜
+ /// </summary>
+ [DisplayName("鐝缂栫爜")]
+ public string SFT_CODE { get; set; }
+ /// <summary>
+ /// 鏃舵缂栫爜
+ /// </summary>
+ [DisplayName("鏃舵缂栫爜")]
+ public string PRD_CODE { get; set; }
+ /// <summary>
+ /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
+ /// </summary>
+ [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")]
+ public int OBA_STATUS { get; set; }
+ /// <summary>
+ /// 鎶芥鎵规鍙�
+ /// </summary>
+ [DisplayName("鎶芥鎵规鍙�")]
+ public string OBA_BATCH { get; set; }
+ /// <summary>
+ /// 閿佸畾鎵规鍙�
+ /// </summary>
+ [DisplayName("閿佸畾鎵规鍙�")]
+ public string LOCK_BATCH { get; set; }
+ /// <summary>
+ /// 鍑鸿揣鏃堕棿
+ /// </summary>
+ [DisplayName("鍑鸿揣鏃堕棿")]
+ public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鍑鸿揣鍗曞彿
+ /// </summary>
+ [DisplayName("鍑鸿揣鍗曞彿")]
+ public string SHIPPING_ORDER { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
- //涓�瀵逛竴澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
- public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //涓�瀵瑰澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
- public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //澶氬澶氬閿鑸�
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
- public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- */
- //[Navigate(NavigateType.OneToOne, nameof(ITEM_CODE), nameof(BAS_ITEM.ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
- //public BAS_ITEM ItemInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
- public List<BAS_ITEM> _ItemInfos { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DATAId))]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DATAId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
+ public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ */
+ //[Navigate(NavigateType.OneToOne, nameof(ITEM_CODE), nameof(BAS_ITEM.ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭ID瀛楁
+ //public BAS_ITEM ItemInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [Navigate(NavigateType.OneToMany, nameof(BAS_ITEM.ITEM_CODE), nameof(ITEM_CODE), "GHOST_ROW = 0")]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DATA绫婚噷闈㈢殑澶栭敭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.OneToMany, nameof(MES_WIP_HIS.SN), nameof(SN), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
public List<MES_WIP_HIS> _History { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
public List<MES_WIP_HIS> History => _History ?? new List<MES_WIP_HIS>();
- [Navigate(NavigateType.OneToMany, nameof(MES_WIP_DFT.SN), nameof(SN), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
- public List<MES_WIP_DFT> _Defects { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ [Navigate(NavigateType.OneToMany, nameof(MES_WIP_DFT.SN), nameof(SN), "GHOST_ROW = 0")]//ClassA琛ㄤ腑鐨凪ES_WIP_DATAId
+ public List<MES_WIP_DFT> _Defects { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
public List<MES_WIP_DFT> Defects => _Defects ?? new List<MES_WIP_DFT>();
- #endregion
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -271,56 +276,56 @@
}
*/
- /// <summary>
- /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
- /// </summary>
- public enum STATUSs
- {
- [Description("鍒濆鍖�")]
- Init = 0,
- [Description("宸叉姇鍏�")]
- Input = 1,
- [Description("鑹搧杩囩珯")]
- OK = 2,
- [Description("涓嶈壇杩囩珯")]
- NG = 3,
- [Description("缁翠慨涓�")]
- Repair = 4,
- [Description("宸插畬宸�")]
- Finished = 5,
- [Description("宸叉姤搴�")]
- Scrap = 6,
- [Description("宸插叆搴�")]
- InStorage = 7,
- [Description("宸叉嫆鏀�")]
- Reject = 8,
- [Description("宸插嚭璐�")]
- Shipped = 9,
- }
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("鍒濆鍖�")]
+ Init = 0,
+ [Description("宸叉姇鍏�")]
+ Input = 1,
+ [Description("鑹搧杩囩珯")]
+ OK = 2,
+ [Description("涓嶈壇杩囩珯")]
+ NG = 3,
+ [Description("缁翠慨涓�")]
+ Repair = 4,
+ [Description("宸插畬宸�")]
+ Finished = 5,
+ [Description("宸叉姤搴�")]
+ Scrap = 6,
+ [Description("宸插叆搴�")]
+ InStorage = 7,
+ [Description("宸叉嫆鏀�")]
+ Reject = 8,
+ [Description("宸插嚭璐�")]
+ Shipped = 9,
+ }
- /// <summary>
- /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
- /// </summary>
- public enum OBA_STATUSs
- {
- [Description("鏈娊妫�")]
- Unsampled = 0,
- [Description("涓嶆娊妫�")]
- NoSampling = 1,
- [Description("寰呮楠�")]
- WaitCheck = 2,
- [Description("妫�楠屼腑")]
- Checking = 3,
- [Description("妫�楠屽畬")]
- Completed = 4,
- [Description("宸查攣瀹�")]
- Locked = 5,
- }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
+ /// </summary>
+ public enum OBA_STATUSs
+ {
+ [Description("鏈娊妫�")]
+ Unsampled = 0,
+ [Description("涓嶆娊妫�")]
+ NoSampling = 1,
+ [Description("寰呮楠�")]
+ WaitCheck = 2,
+ [Description("妫�楠屼腑")]
+ Checking = 3,
+ [Description("妫�楠屽畬")]
+ Completed = 4,
+ [Description("宸查攣瀹�")]
+ Locked = 5,
+ }
+ #endregion
- #region 鍏叡鏂规硶
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_DFT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_DFT.cs
index 23528d9..c4cd3b5 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_DFT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_DFT.cs
@@ -6,292 +6,292 @@
namespace Tiger.Model
{
- /// <summary>
- /// 实体：生产不良记录
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("生产不良记录")]
- [Serializable]
- [SugarTable("MES_WIP_DFT")]
- public class MES_WIP_DFT : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：生产不良记录
- /// </summary>
- public MES_WIP_DFT() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜т笉鑹褰�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐢熶骇涓嶈壇璁板綍")]
+ [Serializable]
+ [SugarTable("MES_WIP_DFT")]
+ public class MES_WIP_DFT : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜т笉鑹褰�
+ /// </summary>
+ public MES_WIP_DFT() { }
+ #endregion
- #region 公共属性
- /// <summary>
- /// 过站条码
- /// </summary>
- [DisplayName("过站条码")]
- public string SN { get; set; }
- /// <summary>
- /// 状态(0WaitHandle待处理|1Repairing维修中|2Resolved已处理)
- /// </summary>
- [DisplayName("状态(0WaitHandle待处理|1Repairing维修中|2Resolved已处理)")]
- public int STATUS { get; set; }
- /// <summary>
- /// 物料编码
- /// </summary>
- [DisplayName("物料编码")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 工单号
- /// </summary>
- [DisplayName("工单号")]
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 工单批次号
- /// </summary>
- [DisplayName("工单批次号")]
- public string BATCH_NO { get; set; }
- /// <summary>
- /// 工艺路线编码
- /// </summary>
- [DisplayName("工艺路线编码")]
- public string ROT_CODE { get; set; }
- /// <summary>
- /// 工艺路线节点ID
- /// </summary>
- [DisplayName("工艺路线节点ID")]
- public string NODE_ID { get; set; }
- /// <summary>
- /// 工艺路线节点名称
- /// </summary>
- [DisplayName("工艺路线节点名称")]
- public string NODE_NAME { 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 string DFT_FLAG { get; set; }
- /// <summary>
- /// 不良计数
- /// </summary>
- [DisplayName("不良计数")]
- public int DFT_COUNT { get; set; }
- /// <summary>
- /// 不良代码编码
- /// </summary>
- [DisplayName("不良代码编码")]
- public string DFT_CODE { get; set; }
- /// <summary>
- /// 不良代码名称
- /// </summary>
- [DisplayName("不良代码名称")]
- public string DFT_NAME { get; set; }
- /// <summary>
- /// 缺陷等级(0MI轻微缺陷|1MA严重缺陷|2CR致命缺陷)
- /// </summary>
- [DisplayName("缺陷等级(0MI轻微缺陷|1MA严重缺陷|2CR致命缺陷)")]
- public int DFT_LEVEL { get; set; }
- /// <summary>
- /// 托盘/载具条码
- /// </summary>
- [DisplayName("托盘/载具条码")]
- public string TRAY_SN { get; set; }
- /// <summary>
- /// 容器/内包装条码
- /// </summary>
- [DisplayName("容器/内包装条码")]
- public string CONTAINER_SN { get; set; }
- /// <summary>
- /// 外箱条码
- /// </summary>
- [DisplayName("外箱条码")]
- public string CARTON_SN { get; set; }
- /// <summary>
- /// 栈板条码
- /// </summary>
- [DisplayName("栈板条码")]
- public string PALLET_SN { get; set; }
- /// <summary>
- /// 是否入库
- /// </summary>
- [DisplayName("是否入库")]
- public string INV_FLAG { get; set; }
- /// <summary>
- /// 当前操作时间
- /// </summary>
- [DisplayName("当前操作时间")]
- public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 班制编码
- /// </summary>
- [DisplayName("班制编码")]
- public string SFTS_CODE { get; set; }
- /// <summary>
- /// 班次编码
- /// </summary>
- [DisplayName("班次编码")]
- public string SFT_CODE { get; set; }
- /// <summary>
- /// 时段编码
- /// </summary>
- [DisplayName("时段编码")]
- public string PRD_CODE { get; set; }
- /// <summary>
- /// 抽检批次号
- /// </summary>
- [DisplayName("抽检批次号")]
- public string OBA_BATCH { get; set; }
- /// <summary>
- /// 锁定批次号
- /// </summary>
- [DisplayName("锁定批次号")]
- public string LOCK_BATCH { get; set; }
- /// <summary>
- /// 不良原因编码
- /// </summary>
- [DisplayName("不良原因编码")]
- public string RSN_CODE { get; set; }
- /// <summary>
- /// 不良原因名称
- /// </summary>
- [DisplayName("不良原因名称")]
- public string RSN_NAME { get; set; }
- /// <summary>
- /// 是否必须更换零件(Y/N)
- /// </summary>
- [DisplayName("是否必须更换零件(Y/N)")]
- public string NEED_REPLACE { get; set; }
- /// <summary>
- /// 不良责任编码
- /// </summary>
- [DisplayName("不良责任编码")]
- public string DUTY_CODE { get; set; }
- /// <summary>
- /// 不良责任名称
- /// </summary>
- [DisplayName("不良责任名称")]
- public string DUTY_NAME { get; set; }
- /// <summary>
- /// 缺陷位置编码
- /// </summary>
- [DisplayName("缺陷位置编码")]
- public string LOC_CODE { get; set; }
- /// <summary>
- /// 缺陷位置名称
- /// </summary>
- [DisplayName("缺陷位置名称")]
- public string LOC_NAME { get; set; }
- /// <summary>
- /// 不良解决方案编码
- /// </summary>
- [DisplayName("不良解决方案编码")]
- public string SOL_CODE { get; set; }
- /// <summary>
- /// 不良解决方案名称
- /// </summary>
- [DisplayName("不良解决方案名称")]
- public string SOL_NAME { get; set; }
- /// <summary>
- /// 备注
- /// </summary>
- [DisplayName("备注")]
- public string REMARK { get; set; }
- /// <summary>
- /// 追溯信息
- /// </summary>
- [DisplayName("追溯信息")]
- public string TRACE_INFO { get; set; }
- #endregion
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D")]
+ public string WIP_ID { get; set; }
+ /// <summary>
+ /// 杩囩珯鏉＄爜
+ /// </summary>
+ [DisplayName("杩囩珯鏉＄爜")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 鐘舵��(0WaitHandle寰呭鐞唡1Repairing缁翠慨涓瓅2Resolved宸插鐞�)
+ /// </summary>
+ [DisplayName("鐘舵��(0WaitHandle寰呭鐞唡1Repairing缁翠慨涓瓅2Resolved宸插鐞�)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鍙�")]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 宸ュ崟鎵规鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鎵规鍙�")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎缂栫爜
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { 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 string DFT_CODE { get; set; }
+ /// <summary>
+ /// 涓嶈壇浠ｇ爜鍚嶇О
+ /// </summary>
+ [DisplayName("涓嶈壇浠ｇ爜鍚嶇О")]
+ public string DFT_NAME { get; set; }
+ /// <summary>
+ /// 缂洪櫡绛夌骇(0MI杞诲井缂洪櫡|1MA涓ラ噸缂洪櫡|2CR鑷村懡缂洪櫡)
+ /// </summary>
+ [DisplayName("缂洪櫡绛夌骇(0MI杞诲井缂洪櫡|1MA涓ラ噸缂洪櫡|2CR鑷村懡缂洪櫡)")]
+ public int DFT_LEVEL { get; set; }
+ /// <summary>
+ /// 鍘傚唴娴佽浆鏉＄爜
+ /// </summary>
+ [DisplayName("鍘傚唴娴佽浆鏉＄爜")]
+ public string FLOW_SN { get; set; }
+ /// <summary>
+ /// 鎵樼洏/杞藉叿鏉＄爜
+ /// </summary>
+ [DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
+ public string TRAY_SN { get; set; }
+ /// <summary>
+ /// 鍐呭寘瑁呮潯鐮�
+ /// </summary>
+ [DisplayName("鍐呭寘瑁呮潯鐮�")]
+ public string INNER_SN { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜
+ /// </summary>
+ [DisplayName("澶栫鏉＄爜")]
+ public string CARTON_SN { get; set; }
+ /// <summary>
+ /// 鏍堟澘鏉＄爜
+ /// </summary>
+ [DisplayName("鏍堟澘鏉＄爜")]
+ public string PALLET_SN { get; set; }
+ /// <summary>
+ /// 鏄惁鍏ュ簱
+ /// </summary>
+ [DisplayName("鏄惁鍏ュ簱")]
+ public string INV_FLAG { get; set; }
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鏃堕棿
+ /// </summary>
+ [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
+ public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鐝埗缂栫爜
+ /// </summary>
+ [DisplayName("鐝埗缂栫爜")]
+ public string SFTS_CODE { get; set; }
+ /// <summary>
+ /// 鐝缂栫爜
+ /// </summary>
+ [DisplayName("鐝缂栫爜")]
+ public string SFT_CODE { get; set; }
+ /// <summary>
+ /// 鏃舵缂栫爜
+ /// </summary>
+ [DisplayName("鏃舵缂栫爜")]
+ public string PRD_CODE { get; set; }
+ /// <summary>
+ /// 鎶芥鎵规鍙�
+ /// </summary>
+ [DisplayName("鎶芥鎵规鍙�")]
+ public string OBA_BATCH { get; set; }
+ /// <summary>
+ /// 閿佸畾鎵规鍙�
+ /// </summary>
+ [DisplayName("閿佸畾鎵规鍙�")]
+ public string LOCK_BATCH { get; set; }
+ /// <summary>
+ /// 涓嶈壇鍘熷洜缂栫爜
+ /// </summary>
+ [DisplayName("涓嶈壇鍘熷洜缂栫爜")]
+ public string RSN_CODE { get; set; }
+ /// <summary>
+ /// 涓嶈壇鍘熷洜鍚嶇О
+ /// </summary>
+ [DisplayName("涓嶈壇鍘熷洜鍚嶇О")]
+ public string RSN_NAME { get; set; }
+ /// <summary>
+ /// 鏄惁蹇呴』鏇存崲闆朵欢(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁蹇呴』鏇存崲闆朵欢(Y/N)")]
+ public string NEED_REPLACE { get; set; }
+ /// <summary>
+ /// 涓嶈壇璐ｄ换缂栫爜
+ /// </summary>
+ [DisplayName("涓嶈壇璐ｄ换缂栫爜")]
+ public string DUTY_CODE { get; set; }
+ /// <summary>
+ /// 涓嶈壇璐ｄ换鍚嶇О
+ /// </summary>
+ [DisplayName("涓嶈壇璐ｄ换鍚嶇О")]
+ public string DUTY_NAME { get; set; }
+ /// <summary>
+ /// 缂洪櫡浣嶇疆缂栫爜
+ /// </summary>
+ [DisplayName("缂洪櫡浣嶇疆缂栫爜")]
+ public string LOC_CODE { get; set; }
+ /// <summary>
+ /// 缂洪櫡浣嶇疆鍚嶇О
+ /// </summary>
+ [DisplayName("缂洪櫡浣嶇疆鍚嶇О")]
+ public string LOC_NAME { get; set; }
+ /// <summary>
+ /// 涓嶈壇瑙ｅ喅鏂规缂栫爜
+ /// </summary>
+ [DisplayName("涓嶈壇瑙ｅ喅鏂规缂栫爜")]
+ public string SOL_CODE { get; set; }
+ /// <summary>
+ /// 涓嶈壇瑙ｅ喅鏂规鍚嶇О
+ /// </summary>
+ [DisplayName("涓嶈壇瑙ｅ喅鏂规鍚嶇О")]
+ public string SOL_NAME { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// 杩芥函淇℃伅
+ /// </summary>
+ [DisplayName("杩芥函淇℃伅")]
+ public string TRACE_INFO { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_DFT类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DFTId))]//ClassA表中的MES_WIP_DFTId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DFTId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_DFT绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_DFTId))]//ClassA琛ㄤ腑鐨凪ES_WIP_DFTId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_DFTId), 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>
- /// 枚举：状态(0WaitHandle待处理|1Repairing维修中|2Resolved已处理)
- /// </summary>
- public enum STATUSs
- {
- [Description("待处理")]
- WaitHandle = 0,
- [Description("维修中")]
- Repairing = 1,
- [Description("已处理")]
- Resolved = 2,
- }
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0WaitHandle寰呭鐞唡1Repairing缁翠慨涓瓅2Resolved宸插鐞�)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("寰呭鐞�")]
+ WaitHandle = 0,
+ [Description("缁翠慨涓�")]
+ Repairing = 1,
+ [Description("宸插鐞�")]
+ Resolved = 2,
+ }
- /// <summary>
- /// 枚举：缺陷等级(0MI轻微缺陷|1MA严重缺陷|2CR致命缺陷)
- /// </summary>
- public enum DFT_LEVELs
- {
- [Description("轻微缺陷")]
- MI = 0,
- [Description("严重缺陷")]
- MA = 1,
- [Description("致命缺陷")]
- CR = 2,
- }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氱己闄风瓑绾�(0MI杞诲井缂洪櫡|1MA涓ラ噸缂洪櫡|2CR鑷村懡缂洪櫡)
+ /// </summary>
+ public enum DFT_LEVELs
+ {
+ [Description("杞诲井缂洪櫡")]
+ MI = 0,
+ [Description("涓ラ噸缂洪櫡")]
+ MA = 1,
+ [Description("鑷村懡缂洪櫡")]
+ CR = 2,
+ }
+ #endregion
- #region 公共方法
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs
index 124fc09..fd4bbc5 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_EXT.cs
@@ -6,171 +6,171 @@
namespace Tiger.Model
{
- /// <summary>
- /// 实体：在制品扩展信息表
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("在制品扩展信息表")]
- [Serializable]
- [SugarTable("MES_WIP_EXT")]
- public class MES_WIP_EXT : DbEntityWithAuth
- {
- #region 构造函数
- /// <summary>
- /// 实体：在制品扩展信息表
- /// </summary>
- public MES_WIP_EXT() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氬湪鍒跺搧鎵╁睍淇℃伅琛�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鍦ㄥ埗鍝佹墿灞曚俊鎭〃")]
+ [Serializable]
+ [SugarTable("MES_WIP_EXT")]
+ public class MES_WIP_EXT : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氬湪鍒跺搧鎵╁睍淇℃伅琛�
+ /// </summary>
+ public MES_WIP_EXT() { }
+ #endregion
- #region 公共属性
- /// <summary>
- /// 过站条码
- /// </summary>
- [DisplayName("过站条码")]
- public string SN { get; set; }
- /// <summary>
- /// 彩盒条码
- /// </summary>
- [DisplayName("彩盒条码")]
- public string BOX_SN { get; set; }
- /// <summary>
- /// 扩展字段值01
- /// </summary>
- [DisplayName("扩展字段值01")]
- public string FIELD_01 { get; set; }
- /// <summary>
- /// 扩展字段值02
- /// </summary>
- [DisplayName("扩展字段值02")]
- public string FIELD_02 { get; set; }
- /// <summary>
- /// 扩展字段值03
- /// </summary>
- [DisplayName("扩展字段值03")]
- public string FIELD_03 { get; set; }
- /// <summary>
- /// 扩展字段值04
- /// </summary>
- [DisplayName("扩展字段值04")]
- public string FIELD_04 { get; set; }
- /// <summary>
- /// 扩展字段值05
- /// </summary>
- [DisplayName("扩展字段值05")]
- public string FIELD_05 { get; set; }
- /// <summary>
- /// 扩展字段值06
- /// </summary>
- [DisplayName("扩展字段值06")]
- public string FIELD_06 { get; set; }
- /// <summary>
- /// 扩展字段值07
- /// </summary>
- [DisplayName("扩展字段值07")]
- public string FIELD_07 { get; set; }
- /// <summary>
- /// 扩展字段值08
- /// </summary>
- [DisplayName("扩展字段值08")]
- public string FIELD_08 { get; set; }
- /// <summary>
- /// 扩展字段值09
- /// </summary>
- [DisplayName("扩展字段值09")]
- public string FIELD_09 { get; set; }
- /// <summary>
- /// 扩展字段值10
- /// </summary>
- [DisplayName("扩展字段值10")]
- public string FIELD_10 { get; set; }
- /// <summary>
- /// 扩展字段值11
- /// </summary>
- [DisplayName("扩展字段值11")]
- public string FIELD_11 { get; set; }
- /// <summary>
- /// 扩展字段值12
- /// </summary>
- [DisplayName("扩展字段值12")]
- public string FIELD_12 { get; set; }
- /// <summary>
- /// 扩展字段值13
- /// </summary>
- [DisplayName("扩展字段值13")]
- public string FIELD_13 { get; set; }
- /// <summary>
- /// 扩展字段值14
- /// </summary>
- [DisplayName("扩展字段值14")]
- public string FIELD_14 { get; set; }
- /// <summary>
- /// 扩展字段值15
- /// </summary>
- [DisplayName("扩展字段值15")]
- public string FIELD_15 { get; set; }
- /// <summary>
- /// 扩展字段值16
- /// </summary>
- [DisplayName("扩展字段值16")]
- public string FIELD_16 { get; set; }
- /// <summary>
- /// 扩展字段值17
- /// </summary>
- [DisplayName("扩展字段值17")]
- public string FIELD_17 { get; set; }
- /// <summary>
- /// 扩展字段值18
- /// </summary>
- [DisplayName("扩展字段值18")]
- public string FIELD_18 { get; set; }
- /// <summary>
- /// 扩展字段值19
- /// </summary>
- [DisplayName("扩展字段值19")]
- public string FIELD_19 { get; set; }
- /// <summary>
- /// 扩展字段值20
- /// </summary>
- [DisplayName("扩展字段值20")]
- public string FIELD_20 { get; set; }
- #endregion
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鏉＄爜(涓嶉檺浜庡湪鍒跺搧鏉＄爜)
+ /// </summary>
+ [DisplayName("鏉＄爜(涓嶉檺浜庡湪鍒跺搧鏉＄爜)")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D(涓嶆槸鍦ㄥ埗鍝佸垯鐣欑┖)
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D(涓嶆槸鍦ㄥ埗鍝佸垯鐣欑┖)")]
+ public string WIP_ID { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�01
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�01")]
+ public string FIELD_01 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�02
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�02")]
+ public string FIELD_02 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�03
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�03")]
+ public string FIELD_03 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�04
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�04")]
+ public string FIELD_04 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�05
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�05")]
+ public string FIELD_05 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�06
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�06")]
+ public string FIELD_06 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�07
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�07")]
+ public string FIELD_07 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�08
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�08")]
+ public string FIELD_08 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�09
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�09")]
+ public string FIELD_09 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�10
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�10")]
+ public string FIELD_10 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�11
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�11")]
+ public string FIELD_11 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�12
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�12")]
+ public string FIELD_12 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�13
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�13")]
+ public string FIELD_13 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�14
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�14")]
+ public string FIELD_14 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�15
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�15")]
+ public string FIELD_15 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�16
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�16")]
+ public string FIELD_16 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�17
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�17")]
+ public string FIELD_17 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�18
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�18")]
+ public string FIELD_18 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�19
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�19")]
+ public string FIELD_19 { get; set; }
+ /// <summary>
+ /// 鎵╁睍瀛楁鍊�20
+ /// </summary>
+ [DisplayName("鎵╁睍瀛楁鍊�20")]
+ public string FIELD_20 { get; set; }
+ #endregion
- #region 虚拟属性
- /*例子
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 外键属性
- /*例子
- //一对一外键导航
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是MES_WIP_EXT类里面的外键ID字段
- public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
- //一对多外键导航
- [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_EXTId))]//ClassA表中的MES_WIP_EXTId
- public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
- //多对多外键导航
- [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_EXTId), nameof(MappingClass.ClassAId))]//注意顺序
- public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
+ //涓�瀵逛竴澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_EXT绫婚噷闈㈢殑澶栭敭ID瀛楁
+ public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //涓�瀵瑰澶栭敭瀵艰埅
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.MES_WIP_EXTId))]//ClassA琛ㄤ腑鐨凪ES_WIP_EXTId
+ public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ //澶氬澶氬閿鑸�
+ [Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_EXTId), 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
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
index 4f525c3..a3e3f33 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_HIS.cs
@@ -6,38 +6,39 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("鐢熶骇杩囩▼璁板綍")]
- [Serializable]
- [SugarTable("MES_WIP_HIS")]
- public class MES_WIP_HIS : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
- /// <summary>
- /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
- /// </summary>
- public MES_WIP_HIS() {}
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐢熶骇杩囩▼璁板綍")]
+ [Serializable]
+ [SugarTable("MES_WIP_HIS")]
+ public class MES_WIP_HIS : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
+ /// </summary>
+ public MES_WIP_HIS() { }
/// <summary>
- /// 瀹炰綋锛氬簱瀛樺巻鍙�
+ /// 瀹炰綋锛氱敓浜ц繃绋嬭褰�
/// </summary>
/// <param name="data">鍘嗗彶鐨勬潵婧怚tem</param>
/// <param name="traceInfo">杩芥函淇℃伅</param>
public MES_WIP_HIS(MES_WIP_DATA data, string traceInfo)
{
- ID = Guid.NewGuid().ToString("N");
+ ID = Guid.NewGuid().ToString("N");
CREATE_USER = data.CREATE_USER;
UPDATE_USER = data.UPDATE_USER;
AUTH_ORG = data.AUTH_ORG;
AUTH_PROD = data.AUTH_PROD;
AUTH_WH = data.AUTH_WH;
+ WIP_ID = data.ID;
SN = data.SN;
STATUS = data.STATUS;
ITEM_CODE = data.ITEM_CODE;
- QTY = data.QTY;
+ QTY = data.QTY;
WORK_ORDER = data.WORK_ORDER;
BATCH_NO = data.BATCH_NO;
ROT_CODE = data.ROT_CODE;
@@ -55,9 +56,10 @@
DFT_FLAG = data.DFT_FLAG;
DFT_COUNT = data.DFT_COUNT;
DFT_CODE = data.DFT_CODE;
- REFLOW_NODE = data.REFLOW_NODE;
+ REFLOW_NODE = data.REFLOW_NODE;
+ FLOW_SN = data.FLOW_SN;
TRAY_SN = data.TRAY_SN;
- CONTAINER_SN = data.CONTAINER_SN;
+ INNER_SN = data.INNER_SN;
CARTON_SN = data.CARTON_SN;
PALLET_SN = data.PALLET_SN;
INV_FLAG = data.INV_FLAG;
@@ -80,20 +82,25 @@
#region 鍏叡灞炴��
/// <summary>
+ /// 鍦ㄥ埗鍝両D
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D")]
+ public string WIP_ID { get; set; }
+ /// <summary>
/// 杩囩珯鏉＄爜
/// </summary>
[DisplayName("杩囩珯鏉＄爜")]
- public string SN { get; set; }
- /// <summary>
- /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
- /// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
- public int STATUS { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
- public string ITEM_CODE { get; set; }
+ public string SN { get; set; }
+ /// <summary>
+ /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// </summary>
+ [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
/// <summary>
/// 鏁伴噺
/// </summary>
@@ -103,199 +110,204 @@
/// 宸ュ崟鍙�
/// </summary>
[DisplayName("宸ュ崟鍙�")]
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 宸ュ崟鎵规鍙�
- /// </summary>
- [DisplayName("宸ュ崟鎵规鍙�")]
- public string BATCH_NO { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎缂栫爜
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎缂栫爜")]
- public string ROT_CODE { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣ID
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
- public string NODE_ID { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
- public string NODE_NAME { 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 string HOLD_FLAG { get; set; }
- /// <summary>
- /// 杩斿伐鏍囪
- /// </summary>
- [DisplayName("杩斿伐鏍囪")]
- public string REWORK_FLAG { get; set; }
- /// <summary>
- /// 鏄惁瀹屽伐
- /// </summary>
- [DisplayName("鏄惁瀹屽伐")]
- public string FINISHED_FLAG { get; set; }
- /// <summary>
- /// 鏄惁涓嶈壇
- /// </summary>
- [DisplayName("鏄惁涓嶈壇")]
- public string DFT_FLAG { get; set; }
- /// <summary>
- /// 涓嶈壇璁℃暟
- /// </summary>
- [DisplayName("涓嶈壇璁℃暟")]
- public int DFT_COUNT { get; set; }
- /// <summary>
- /// 涓嶈壇浠ｇ爜缂栫爜
- /// </summary>
- [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
- public string DFT_CODE { get; set; }
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 宸ュ崟鎵规鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鎵规鍙�")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎缂栫爜
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { 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 string HOLD_FLAG { get; set; }
+ /// <summary>
+ /// 杩斿伐鏍囪
+ /// </summary>
+ [DisplayName("杩斿伐鏍囪")]
+ public string REWORK_FLAG { get; set; }
+ /// <summary>
+ /// 鏄惁瀹屽伐
+ /// </summary>
+ [DisplayName("鏄惁瀹屽伐")]
+ public string FINISHED_FLAG { get; set; }
+ /// <summary>
+ /// 鏄惁涓嶈壇
+ /// </summary>
+ [DisplayName("鏄惁涓嶈壇")]
+ public string DFT_FLAG { get; set; }
+ /// <summary>
+ /// 涓嶈壇璁℃暟
+ /// </summary>
+ [DisplayName("涓嶈壇璁℃暟")]
+ public int DFT_COUNT { get; set; }
+ /// <summary>
+ /// 涓嶈壇浠ｇ爜缂栫爜
+ /// </summary>
+ [DisplayName("涓嶈壇浠ｇ爜缂栫爜")]
+ public string DFT_CODE { get; set; }
/// <summary>
/// 缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)
/// </summary>
[DisplayName("缁翠慨鍥炴祦宸ュ簭鍚嶇О(涓虹┖鍒欎笉鎸囧畾鍥炴祦宸ュ簭)")]
public string REFLOW_NODE { get; set; }
/// <summary>
+ /// 鍘傚唴娴佽浆鏉＄爜
+ /// </summary>
+ [DisplayName("鍘傚唴娴佽浆鏉＄爜")]
+ public string FLOW_SN { get; set; }
+ /// <summary>
/// 鎵樼洏/杞藉叿鏉＄爜
/// </summary>
[DisplayName("鎵樼洏/杞藉叿鏉＄爜")]
- public string TRAY_SN { get; set; }
- /// <summary>
- /// 瀹瑰櫒/鍐呭寘瑁呮潯鐮�
- /// </summary>
- [DisplayName("瀹瑰櫒/鍐呭寘瑁呮潯鐮�")]
- public string CONTAINER_SN { get; set; }
- /// <summary>
- /// 澶栫鏉＄爜
- /// </summary>
- [DisplayName("澶栫鏉＄爜")]
- public string CARTON_SN { get; set; }
- /// <summary>
- /// 鏍堟澘鏉＄爜
- /// </summary>
- [DisplayName("鏍堟澘鏉＄爜")]
- public string PALLET_SN { get; set; }
- /// <summary>
- /// 鏄惁鍏ュ簱
- /// </summary>
- [DisplayName("鏄惁鍏ュ簱")]
- public string INV_FLAG { get; set; }
- /// <summary>
- /// 鍏ュ簱鏃ユ湡
- /// </summary>
- [DisplayName("鍏ュ簱鏃ユ湡")]
- public DateTime INV_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鎶曞叆鏃堕棿
- /// </summary>
- [DisplayName("鎶曞叆鏃堕棿")]
- public DateTime INLINE_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 浜у嚭鏃堕棿
- /// </summary>
- [DisplayName("浜у嚭鏃堕棿")]
- public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 褰撳墠鎿嶄綔鏃堕棿
- /// </summary>
- [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
- public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鐝埗缂栫爜
- /// </summary>
- [DisplayName("鐝埗缂栫爜")]
- public string SFTS_CODE { get; set; }
- /// <summary>
- /// 鐝缂栫爜
- /// </summary>
- [DisplayName("鐝缂栫爜")]
- public string SFT_CODE { get; set; }
- /// <summary>
- /// 鏃舵缂栫爜
- /// </summary>
- [DisplayName("鏃舵缂栫爜")]
- public string PRD_CODE { get; set; }
- /// <summary>
- /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
- /// </summary>
- [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")]
- public int OBA_STATUS { get; set; }
- /// <summary>
- /// 鎶芥鎵规鍙�
- /// </summary>
- [DisplayName("鎶芥鎵规鍙�")]
- public string OBA_BATCH { get; set; }
- /// <summary>
- /// 閿佸畾鎵规鍙�
- /// </summary>
- [DisplayName("閿佸畾鎵规鍙�")]
- public string LOCK_BATCH { get; set; }
- /// <summary>
- /// 鍑鸿揣鏃堕棿
- /// </summary>
- [DisplayName("鍑鸿揣鏃堕棿")]
- public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鍑鸿揣鍗曞彿
- /// </summary>
- [DisplayName("鍑鸿揣鍗曞彿")]
- public string SHIPPING_ORDER { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [DisplayName("澶囨敞")]
- public string REMARK { get; set; }
- /// <summary>
- /// 杩芥函淇℃伅
- /// </summary>
- [DisplayName("杩芥函淇℃伅")]
- public string TRACE_INFO { get; set; }
- #endregion
+ public string TRAY_SN { get; set; }
+ /// <summary>
+ /// 鍐呭寘瑁呮潯鐮�
+ /// </summary>
+ [DisplayName("鍐呭寘瑁呮潯鐮�")]
+ public string INNER_SN { get; set; }
+ /// <summary>
+ /// 澶栫鏉＄爜
+ /// </summary>
+ [DisplayName("澶栫鏉＄爜")]
+ public string CARTON_SN { get; set; }
+ /// <summary>
+ /// 鏍堟澘鏉＄爜
+ /// </summary>
+ [DisplayName("鏍堟澘鏉＄爜")]
+ public string PALLET_SN { get; set; }
+ /// <summary>
+ /// 鏄惁鍏ュ簱
+ /// </summary>
+ [DisplayName("鏄惁鍏ュ簱")]
+ public string INV_FLAG { get; set; }
+ /// <summary>
+ /// 鍏ュ簱鏃ユ湡
+ /// </summary>
+ [DisplayName("鍏ュ簱鏃ユ湡")]
+ public DateTime INV_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鎶曞叆鏃堕棿
+ /// </summary>
+ [DisplayName("鎶曞叆鏃堕棿")]
+ public DateTime INLINE_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 浜у嚭鏃堕棿
+ /// </summary>
+ [DisplayName("浜у嚭鏃堕棿")]
+ public DateTime OUTLINE_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 褰撳墠鎿嶄綔鏃堕棿
+ /// </summary>
+ [DisplayName("褰撳墠鎿嶄綔鏃堕棿")]
+ public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鐝埗缂栫爜
+ /// </summary>
+ [DisplayName("鐝埗缂栫爜")]
+ public string SFTS_CODE { get; set; }
+ /// <summary>
+ /// 鐝缂栫爜
+ /// </summary>
+ [DisplayName("鐝缂栫爜")]
+ public string SFT_CODE { get; set; }
+ /// <summary>
+ /// 鏃舵缂栫爜
+ /// </summary>
+ [DisplayName("鏃舵缂栫爜")]
+ public string PRD_CODE { get; set; }
+ /// <summary>
+ /// 鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
+ /// </summary>
+ [DisplayName("鎶芥鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)")]
+ public int OBA_STATUS { get; set; }
+ /// <summary>
+ /// 鎶芥鎵规鍙�
+ /// </summary>
+ [DisplayName("鎶芥鎵规鍙�")]
+ public string OBA_BATCH { get; set; }
+ /// <summary>
+ /// 閿佸畾鎵规鍙�
+ /// </summary>
+ [DisplayName("閿佸畾鎵规鍙�")]
+ public string LOCK_BATCH { get; set; }
+ /// <summary>
+ /// 鍑鸿揣鏃堕棿
+ /// </summary>
+ [DisplayName("鍑鸿揣鏃堕棿")]
+ public DateTime SHIPPING_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鍑鸿揣鍗曞彿
+ /// </summary>
+ [DisplayName("鍑鸿揣鍗曞彿")]
+ public string SHIPPING_ORDER { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// 杩芥函淇℃伅
+ /// </summary>
+ [DisplayName("杩芥函淇℃伅")]
+ public string TRACE_INFO { get; set; }
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- /// <summary>
- /// 鏄惁宸茬粡鑹搧杩囩珯
- /// </summary>
- [SugarColumn(IsIgnore = true)]
- public bool IsFinished => DFT_FLAG != "Y";
+ /// <summary>
+ /// 鏄惁宸茬粡鑹搧杩囩珯
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public bool IsFinished => DFT_FLAG != "Y";
#endregion
#region 澶栭敭灞炴��
@@ -327,52 +339,52 @@
/// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
/// </summary>
public enum STATUSs
- {
- [Description("鍒濆鍖�")]
- Init = 0,
- [Description("宸叉姇鍏�")]
- Input = 1,
- [Description("鑹搧杩囩珯")]
- OK = 2,
- [Description("涓嶈壇杩囩珯")]
- NG = 3,
- [Description("缁翠慨涓�")]
- Repair = 4,
- [Description("宸插畬宸�")]
- Finished = 5,
- [Description("宸叉姤搴�")]
- Scrap = 6,
- [Description("宸插叆搴�")]
- InStorage = 7,
- [Description("宸叉嫆鏀�")]
- Reject = 8,
- [Description("宸插嚭璐�")]
- Shipped = 9,
- }
+ {
+ [Description("鍒濆鍖�")]
+ Init = 0,
+ [Description("宸叉姇鍏�")]
+ Input = 1,
+ [Description("鑹搧杩囩珯")]
+ OK = 2,
+ [Description("涓嶈壇杩囩珯")]
+ NG = 3,
+ [Description("缁翠慨涓�")]
+ Repair = 4,
+ [Description("宸插畬宸�")]
+ Finished = 5,
+ [Description("宸叉姤搴�")]
+ Scrap = 6,
+ [Description("宸插叆搴�")]
+ InStorage = 7,
+ [Description("宸叉嫆鏀�")]
+ Reject = 8,
+ [Description("宸插嚭璐�")]
+ Shipped = 9,
+ }
- /// <summary>
- /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
- /// </summary>
- public enum OBA_STATUSs
- {
- [Description("鏈娊妫�")]
- Unsampled = 0,
- [Description("涓嶆娊妫�")]
- NoSampling = 1,
- [Description("寰呮楠�")]
- WaitCheck = 2,
- [Description("妫�楠屼腑")]
- Checking = 3,
- [Description("妫�楠屽畬")]
- Completed = 4,
- [Description("宸查攣瀹�")]
- Locked = 5,
- }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氭娊妫�鐘舵��(0Unsampled鏈娊妫�|1NoSampling涓嶆娊妫�|2WaitCheck寰呮楠寍3Checking妫�楠屼腑|4Completed妫�楠屽畬|5Locked宸查攣瀹�)
+ /// </summary>
+ public enum OBA_STATUSs
+ {
+ [Description("鏈娊妫�")]
+ Unsampled = 0,
+ [Description("涓嶆娊妫�")]
+ NoSampling = 1,
+ [Description("寰呮楠�")]
+ WaitCheck = 2,
+ [Description("妫�楠屼腑")]
+ Checking = 3,
+ [Description("妫�楠屽畬")]
+ Completed = 4,
+ [Description("宸查攣瀹�")]
+ Locked = 5,
+ }
+ #endregion
- #region 鍏叡鏂规硶
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
index 59f83d3..281ffce 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
@@ -6,129 +6,134 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("鐢熶骇鍖呰璁板綍")]
- [Serializable]
- [SugarTable("MES_WIP_PKG")]
- public class MES_WIP_PKG : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
- /// <summary>
- /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
- /// </summary>
- public MES_WIP_PKG() {}
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐢熶骇鍖呰璁板綍")]
+ [Serializable]
+ [SugarTable("MES_WIP_PKG")]
+ public class MES_WIP_PKG : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱敓浜у寘瑁呰褰�
+ /// </summary>
+ public MES_WIP_PKG() { }
+ #endregion
- #region 鍏叡灞炴��
- /// <summary>
- /// 鏉＄爜
- /// </summary>
- [DisplayName("鏉＄爜")]
- public string SN { get; set; }
- /// <summary>
- /// 鐖跺寘瑁呮潯鐮�
- /// </summary>
- [DisplayName("鐖跺寘瑁呮潯鐮�")]
- public string PARENT_SN { get; set; }
- /// <summary>
- /// 鍖呰绫诲瀷
- /// </summary>
- [DisplayName("鍖呰绫诲瀷")]
- public string PKG_TYPE { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [DisplayName("鏁伴噺")]
- public double QTY { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [DisplayName("鍗曚綅")]
- public string UNIT { get; set; }
- /// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
- [DisplayName("宸ュ崟鍙�")]
- public string WORK_ORDER { get; set; }
- /// <summary>
- /// 宸ュ崟鎵规鍙�
- /// </summary>
- [DisplayName("宸ュ崟鎵规鍙�")]
- public string BATCH_NO { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎缂栫爜
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎缂栫爜")]
- public string ROT_CODE { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣ID
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
- public string NODE_ID { get; set; }
- /// <summary>
- /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
- /// </summary>
- [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
- public string NODE_NAME { 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 string REMARK { get; set; }
- /// <summary>
- /// 杩芥函淇℃伅
- /// </summary>
- [DisplayName("杩芥函淇℃伅")]
- public string TRACE_INFO { get; set; }
- #endregion
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 琚寘瑁呮潯鐮�
+ /// </summary>
+ [DisplayName("琚寘瑁呮潯鐮�")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 鐖跺寘瑁呮潯鐮�(鏈�澶栧眰鍖呰鐣欑┖)
+ /// </summary>
+ [DisplayName("鐖跺寘瑁呮潯鐮�(鏈�澶栧眰鍖呰鐣欑┖)")]
+ public string PARENT_SN { get; set; }
+ /// <summary>
+ /// 鍦ㄥ埗鍝両D(涓嶆槸鏈�灏忓寘瑁呭垯鐣欑┖)
+ /// </summary>
+ [DisplayName("鍦ㄥ埗鍝両D(涓嶆槸鏈�灏忓寘瑁呭垯鐣欑┖)")]
+ public string WIP_ID { get; set; }
+ /// <summary>
+ /// 鍖呰绫诲瀷
+ /// </summary>
+ [DisplayName("鍖呰绫诲瀷")]
+ public string PKG_TYPE { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [DisplayName("鏁伴噺")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [DisplayName("鍗曚綅")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 宸ュ崟鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鍙�")]
+ public string WORK_ORDER { get; set; }
+ /// <summary>
+ /// 宸ュ崟鎵规鍙�
+ /// </summary>
+ [DisplayName("宸ュ崟鎵规鍙�")]
+ public string BATCH_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎缂栫爜
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎缂栫爜")]
+ public string ROT_CODE { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣ID
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣ID")]
+ public string NODE_ID { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎鑺傜偣鍚嶇О
+ /// </summary>
+ [DisplayName("宸ヨ壓璺嚎鑺傜偣鍚嶇О")]
+ public string NODE_NAME { 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 string REMARK { get; set; }
+ /// <summary>
+ /// 杩芥函淇℃伅
+ /// </summary>
+ [DisplayName("杩芥函淇℃伅")]
+ public string TRACE_INFO { get; set; }
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疢ES_WIP_PKG绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -139,10 +144,10 @@
[Navigate(typeof(MappingClass), nameof(MappingClass.MES_WIP_PKGId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- #endregion
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -151,12 +156,11 @@
Enum1,
}
*/
+ #endregion
- #endregion
+ #region 鍏叡鏂规硶
- #region 鍏叡鏂规硶
+ #endregion
- #endregion
-
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3