From 7a1496993b3ecae726bbbdb2f16508c8906cde8b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 02 一月 2025 22:04:32 +0800
Subject: [PATCH] 优化和修正打印逻辑及字段命名
---
Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
index ac6713f..9ef3162 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_ACT.cs
@@ -39,9 +39,9 @@
[DisplayName("杩囩珯鏉＄爜")]
public string SN { get; set; }
/// <summary>
- /// 鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// 鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
/// </summary>
- [DisplayName("鐘舵��(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)")]
+ [DisplayName("鐘舵��(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)")]
public int STATUS { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
@@ -194,6 +194,11 @@
[DisplayName("琛屼负鎿嶄綔鍊�5")]
public string ACT_VALUE_5 { get; set; }
/// <summary>
+ /// 琛屼负鍙橀噺瀛楀吀
+ /// </summary>
+ [DisplayName("琛屼负鍙橀噺瀛楀吀")]
+ public string ACT_VAR_DIC { get; set; }
+ /// <summary>
/// 琛屼负鏄惁鎴愬姛(Y/N)
/// </summary>
[DisplayName("琛屼负鏄惁鎴愬姛(Y/N)")]
@@ -203,6 +208,11 @@
/// </summary>
[DisplayName("澶囨敞")]
public string REMARK { get; set; }
+ /// <summary>
+ /// 鎿嶄綔鑰楁椂(s)
+ /// </summary>
+ [DisplayName("鎿嶄綔鑰楁椂(ms)")]
+ public long ELAPSED_TIME { get; set; } = 0;
/// <summary>
/// 杩芥函淇℃伅
/// </summary>
@@ -243,7 +253,7 @@
*/
/// <summary>
- /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東1Input宸叉姇鍏2OK鑹搧杩囩珯|3NG涓嶈壇杩囩珯|4Repair缁翠慨涓瓅5Finished宸插畬宸6Scrap宸叉姤搴焲7InStorage宸插叆搴搢8Reject宸叉嫆鏀秥9Shipped宸插嚭璐�)
+ /// 鏋氫妇锛氱姸鎬�(0Init鍒濆鍖東10Input宸叉姇鍏20OK鑹搧杩囩珯|30NG涓嶈壇杩囩珯|40Repair缁翠慨涓瓅50Output宸蹭骇鍑簗51WaitStorage寰呭叆搴搢52WaitShipment寰呭嚭璐60InStorage宸插叆搴搢61Reject宸叉嫆鏀秥80Shipped宸插嚭璐90Scrap宸叉姤搴焲91Offline寮傚父涓嬬嚎)
/// </summary>
public enum STATUSs
{
@@ -259,14 +269,16 @@
Repair = 4,
[Description("宸插畬宸�")]
Finished = 5,
- [Description("宸叉姤搴�")]
- Scrap = 6,
[Description("宸插叆搴�")]
- InStorage = 7,
+ InStorage = 6,
[Description("宸叉嫆鏀�")]
- Reject = 8,
+ Reject = 7,
[Description("宸插嚭璐�")]
- Shipped = 9,
+ Shipped = 8,
+ [Description("寮傚父涓嬬嚎")]
+ Offline = 9,
+ [Description("宸叉姤搴�")]
+ Scrap = 10,
}
/// <summary>
--
Gitblit v1.9.3