From fa36bc9df424211bc3ab1788cf98cf40c8bc6f5f Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 13 八月 2024 16:29:02 +0800
Subject: [PATCH] 增加短消息实体，包装实体增加重量字段
---
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 4 ++
Tiger.Model.Net/Entitys/WMS/WMS_ITEM_PKG.cs | 10 +++++
Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs | 10 +++++
Tiger.Model.Net/Entitys/Api/Base.cs | 43 +++++++++++++++++++++
4 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/Tiger.Model.Net/Entitys/Api/Base.cs b/Tiger.Model.Net/Entitys/Api/Base.cs
index 97ec4ea..19c437f 100644
--- a/Tiger.Model.Net/Entitys/Api/Base.cs
+++ b/Tiger.Model.Net/Entitys/Api/Base.cs
@@ -1,4 +1,5 @@
锘縰sing System.Collections.Generic;
+using System.ComponentModel;
namespace Tiger.Model
{
@@ -24,4 +25,46 @@
public int total { get; set; }
}
+ public class ShortMessage
+ {
+ public string Content { get; set; }
+ public Types Type { get; set; }
+
+ /// <summary>
+ /// 淇℃伅绫诲瀷
+ /// </summary>
+ public enum Types
+ {
+ /// <summary>
+ /// 榛樿淇℃伅
+ /// </summary>
+ [Description("榛樿淇℃伅")]
+ Normal,
+ /// <summary>
+ /// 鎴愬姛淇℃伅
+ /// </summary>
+ [Description("鎴愬姛淇℃伅")]
+ Success,
+ /// <summary>
+ /// 璀﹀憡淇℃伅
+ /// </summary>
+ [Description("璀﹀憡淇℃伅")]
+ Warning,
+ /// <summary>
+ /// 閿欒淇℃伅
+ /// </summary>
+ [Description("閿欒淇℃伅")]
+ Error,
+ /// <summary>
+ /// 澶辫触淇℃伅
+ /// </summary>
+ [Description("澶辫触淇℃伅")]
+ Failed,
+ /// <summary>
+ /// 寮傚父淇℃伅
+ /// </summary>
+ [Description("寮傚父淇℃伅")]
+ Exception,
+ }
+ }
}
\ 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 281ffce..a3c6336 100644
--- a/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
+++ b/Tiger.Model.Net/Entitys/MES/MES_WIP_PKG.cs
@@ -114,6 +114,16 @@
[DisplayName("鍔犲伐娈�")]
public string SEGMENT { get; set; }
/// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ [DisplayName("閲嶉噺")]
+ public double WEIGHT { get; set; }
+ /// <summary>
+ /// 閲嶉噺鍗曚綅
+ /// </summary>
+ [DisplayName("閲嶉噺鍗曚綅")]
+ public string WEIGHT_UNIT { get; set; }
+ /// <summary>
/// 澶囨敞
/// </summary>
[DisplayName("澶囨敞")]
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index 2f46498..6a43f7f 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -54,6 +54,10 @@
/// </summary>
public bool IsFinished { get; set; } = false;
/// <summary>
+ /// 鐭秷鎭�
+ /// </summary>
+ public ShortMessage ShortMsg { get; set; }
+ /// <summary>
/// 褰撳墠鎿嶄綔鐨勫伐鍗曞璞�
/// </summary>
public BIZ_MES_WO CurWO { get; set; }
diff --git a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_PKG.cs b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_PKG.cs
index 8861582..d52396a 100644
--- a/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_PKG.cs
+++ b/Tiger.Model.Net/Entitys/WMS/WMS_ITEM_PKG.cs
@@ -120,6 +120,16 @@
/// </summary>
public string PRINT_USER { get; set; }
/// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ [DisplayName("閲嶉噺")]
+ public double WEIGHT { get; set; }
+ /// <summary>
+ /// 閲嶉噺鍗曚綅
+ /// </summary>
+ [DisplayName("閲嶉噺鍗曚綅")]
+ public string WEIGHT_UNIT { get; set; }
+ /// <summary>
/// 澶囨敞
/// </summary>
public string REMARK { get; set; }
--
Gitblit v1.9.3