From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 80918c0..82074a3 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -46,6 +46,10 @@
/// </summary>
public string DFT_CODE { get; set; }
/// <summary>
+ /// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑閫夐」
+ /// </summary>
+ public Dictionary<string, string> Options { get; set; } = new Dictionary<string, string>();
+ /// <summary>
/// 褰撳墠鎿嶄綔闇�瑕佹彁浜ょ殑鏁版嵁
/// </summary>
public string Data { get; set; }
@@ -148,6 +152,10 @@
/// </summary>
public int PkgLevel { get; set; }
/// <summary>
+ /// 鏄惁闇�瑕�
+ /// </summary>
+ public bool RealPrint { get; set; } = true;
+ /// <summary>
/// 褰撳墠闇�瑕佹墦鍗扮殑鍖呰灞傜骇鐨勬爣绛句俊鎭�
/// </summary>
public BAS_LABEL_TEMP PrintLable { get; set; }
@@ -169,6 +177,7 @@
public WeightInfo WeightInfo { get; set; } = new WeightInfo();
public bool IsFinished => Item.IsFinished;
public bool IsReachedEndNode { get; set; } = false;
+ public BAS_LABEL_TEMP InStoreLabel { get; set; }
}
/// <summary>
@@ -182,6 +191,7 @@
public int PKG_LEVEL { get; set; }
public int PKG_QTY { get; set; }
public string LABEL_CODE { get; set; }
+ public string SN { get; set; }
public MES_WIP_PKG Package { get; set; }
public bool IsFinished { get; set; } = false;
public List<WipPkgItem> Items { get; set; } = new List<WipPkgItem>();
--
Gitblit v1.9.3