From 65ddd36c0036014ff656417767b4a9438efb76b1 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期四, 15 五月 2025 17:32:31 +0800
Subject: [PATCH] bug处理
---
wms/WMSModel.cs | 79 +++++++++++++++++++++++++++------------
1 files changed, 55 insertions(+), 24 deletions(-)
diff --git a/wms/WMSModel.cs b/wms/WMSModel.cs
index 49944b1..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)
{
@@ -1059,7 +1094,6 @@
[ST("绌烘墭鍑虹紦瀛樿〃")]
public class MesKtTask : BaseModel
{
-
/// <summary>
/// 宸ヨ绫诲瀷 鑳庝晶25,鍐呰‖35,鑳庝綋/甯樺竷45,甯︽潫55,鑳庡湀65,鑳庨潰15,绾ょ淮85锛岄挗涓�5
/// </summary>
@@ -1081,22 +1115,6 @@
/// <summary>
/// 涓氬姟绫诲瀷
- /// 1 鍗婃垚鍝佹弧鎵樺叆搴�- /// 2 鎴愬瀷鏈哄崐妗跺洖搴�- /// 3 鎴愬瀷鏈虹┖妗跺洖搴�- /// 4 鎴愬瀷鏈烘弧鎵樺嚭搴�- /// 5 鎴愬瀷鏈哄甫鏉熷洖搴�- /// 6 鎴愬瀷鏈哄甫鏉熸弧鎵樺嚭搴�- /// 7 鍗婃垚鍝佺┖鎵樺嚭搴�- /// 8 鑳舵枡鍏ュ簱
- /// 9 鍛煎彨鑳舵枡
- /// 10 鍙犵洏鏈虹┖鎵樺叆搴�- /// 11 鑳舵枡鍗婃《鍥炲簱
- /// 12 绌烘灦瀛愬叆搴�- /// 13 鑳庡湀绌烘墭鍏ヤ笉甯﹀灚鐗�- /// 14 鑳庡湀绌烘墭鍑轰笉甯﹀灚鐗�- /// 100 缁戝畾
- /// 200 瑙ｇ粦
/// </summary>
public string BUSI_TYPE { get; set; }
@@ -1409,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