From 90e4f87fcff67b8833d838fef6703c71de864bce Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期二, 20 五月 2025 17:33:05 +0800
Subject: [PATCH] 金坛
---
wms/WMSModel.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 99 insertions(+), 9 deletions(-)
diff --git a/wms/WMSModel.cs b/wms/WMSModel.cs
index 7dcbfd1..3f26360 100644
--- a/wms/WMSModel.cs
+++ b/wms/WMSModel.cs
@@ -20,6 +20,7 @@
public DateTime T_CREATE { get; set; } = DateTime.Now;
public DateTime T_MODIFY { get; set; } = DateTime.Now;
+
}
@@ -96,6 +97,11 @@
/// 搴撳尯缂栫爜
/// </summary>
public string S_AREA_CODE { get; set; }
+
+ /// <summary>
+ /// 搴撳尯涓枃鍚嶇О
+ /// </summary>
+ public string S_AREA_Name { get; set; }
/// <summary>
/// 宸烽亾
@@ -178,7 +184,10 @@
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public string S_LOC_CODE { get; set; }
-
+
+
+
+
/// <summary>
/// 瀹瑰櫒缂栫爜
/// </summary>
@@ -474,14 +483,14 @@
public string S_OP_DEF_NAME { get; set; }
/// <summary>
- /// 浠诲姟寮�鏃堕棿
+ /// 寮�鏃堕棿
/// </summary>
- public DateTime T_START_TIME { get; set; }
+ public DateTime? T_START_TIME { get; set; } = null;
/// <summary>
- /// 浠诲姟缁撴潫鏃堕棿
+ /// 缁撴潫鏃堕棿
/// </summary>
- public DateTime T_END_TIME { get; set; }
+ public DateTime? T_END_TIME { get; set; } = null;
/// <summary>
/// 瀹瑰櫒缂栫爜
@@ -515,6 +524,19 @@
/// </summary>
public string S_END_AREA { get; set; }
+
+ /// <summary>
+ /// 璧风偣搴撳尯鍚嶇О
+ /// </summary>
+ public string S_START_AREA_NAME { get; set; }
+ /// <summary>
+ /// 缁堢偣搴撳尯鍚嶇О
+ /// </summary>
+ public string S_END_AREA_NAME { get; set; }
+ /// <summary>
+ /// 鎺ラ┏浣嶅簱鍖哄悕绉�+ /// </summary>
+ public string CONNECTION_AREA { get; set; }
/// <summary>
/// 浣滀笟浼樺厛绾�@@ -637,12 +659,12 @@
/// <summary>
/// 寮�鏃堕棿
/// </summary>
- public DateTime T_START_TIME { get; set; }
+ public DateTime? T_START_TIME { get; set; } = null;
/// <summary>
/// 缁撴潫鏃堕棿
/// </summary>
- public DateTime T_END_TIME { get; set; }
+ public DateTime? T_END_TIME { get; set; } = null;
/// <summary>
/// 璋冨害绫诲瀷鍊�@@ -673,6 +695,16 @@
/// 璧峰搴撳尯缂栧彿
/// </summary>
public string S_START_AREA { get; set; }
+
+ /// <summary>
+ /// 璧峰搴撳尯缂栧彿
+ /// </summary>
+ public string S_START_AREA_NAME { get; set; }
+
+ /// <summary>
+ /// 鐩殑搴撳尯缂栧彿
+ /// </summary>
+ public string S_END_AREA_NAME { get; set; }
/// <summary>
/// 璧风偣
@@ -745,10 +777,13 @@
/// </summary>
public string S_WORKSHOP_NO { get; set; }
+
/// <summary>
/// 杞﹂棿鍚嶇О
/// </summary>
public string S_WORKSHOP_NAME { get; set; }
+
+
internal static string GetStateStr(int state)
{
@@ -1053,10 +1088,52 @@
//}
+ /// <summary>
+ /// 绌烘墭鍑虹紦瀛樿〃
+ /// </summary>
+ [ST("绌烘墭鍑虹紦瀛樿〃")]
+ public class MesKtTask : BaseModel
+ {
/// <summary>
- /// 涓婁笅鏋惰〃
+ /// 宸ヨ绫诲瀷 鑳庝晶25,鍐呰‖35,鑳庝綋/甯樺竷45,甯︽潫55,鑳庡湀65,鑳庨潰15,绾ょ淮85锛岄挗涓�5
/// </summary>
- [ST("涓婁笅鏋惰褰�)]
+ public string TOOLS_TPYE { get; set; }
+
+ /// <summary>
+ /// 璧峰搴撳尯缂栧彿
+ /// </summary>
+ public string Location_From_Area { get; set; }
+ /// <summary>
+ /// 鐩殑搴撲綅缂栧彿
+ /// </summary>
+ public string Location_To { get; set; }
+
+ /// <summary>
+ /// 浼樺厛绾�-鏅�锛氫换鍔＄敓鎴愭椂锛屽潎涓烘绾у埆;1-鍔犳�;2-绱ф�
+ /// </summary>
+ public int Priority { get; set; }
+
+ /// <summary>
+ /// 涓氬姟绫诲瀷
+ /// </summary>
+ public string BUSI_TYPE { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime CreateDate { get; set; }
+
+ /// <summary>
+ /// 绌烘墭浠诲姟鏄惁鍒涘缓 Y/N 榛樿N
+ /// </summary>
+ public string Status { get; set; }
+ }
+
+
+ /// <summary>
+ /// 涓婁笅鏋惰〃
+ /// </summary>
+ [ST("涓婁笅鏋惰褰�)]
public class RecordUpAndDown : BaseModel
{
@@ -1350,4 +1427,17 @@
/// </summary>
public string AgvErrorMsg { get; set; }
}
+
+ /// <summary>
+ /// 浠诲姟鎷︽埅琛�+ /// </summary>
+ [ST("浠诲姟鎷︽埅琛�)]
+ public class ManualTaskSwitch : BaseModel
+ {
+
+ /// <summary>
+ /// 浠诲姟鎷︽埅寮�叧 Y/N Y琛ㄧず鎷︽埅浠诲姟鎺ㄩ�
+ /// </summary>
+ public string State { get; set; }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1