From 5321419f5fddb4e877fe90ccd90ebdc1a115af64 Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期五, 18 七月 2025 17:29:26 +0800
Subject: [PATCH] 出库修改
---
wms/WMSModel.cs | 516 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 357 insertions(+), 159 deletions(-)
diff --git a/wms/WMSModel.cs b/wms/WMSModel.cs
index 49944b1..5c3a029 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;
+
}
@@ -68,10 +69,14 @@
/// </summary>
public string TOOLSTYPE { get; set; }
/// <summary>
- /// 宸烽亾
+ /// 宸烽亾 1-2-3 褰㈠紡
/// </summary>
public string ROADWAY { get; set; }
+ /// <summary>
+ /// 閫昏緫搴撳尯缂栫爜
+ /// </summary>
+ public string ZONECODE { get; set; }
}
[ST("璐т綅琛�)]
@@ -98,6 +103,11 @@
public string S_AREA_CODE { get; set; }
/// <summary>
+ /// 搴撳尯涓枃鍚嶇О
+ /// </summary>
+ public string S_AREA_Name { get; set; }
+
+ /// <summary>
/// 宸烽亾
/// </summary>
public int N_ROADWAY { get; set; }
@@ -120,7 +130,7 @@
/// <summary>
/// 瀹归噺
/// </summary>
- public string N_CAPACITY { get; set; }
+ public int N_CAPACITY { get; set; }
/// <summary>
/// 褰撳墠鏁伴噺
@@ -153,11 +163,12 @@
/// </summary>
public string C_ENABLE { get; set; }
+
/// <summary>
- /// 鐢熶骇鏃堕棿
+ /// 鎺ラ┏浣嶅搴斿贩閬� /// </summary>
- public DateTime PRODUCTIONDATE { get; set; }
-
+ public int CONNEC_ROADWAY { get; set; }
+
/// <summary>
/// 娣卞害
/// </summary>
@@ -178,7 +189,10 @@
/// </summary>
[SugarColumn(IsPrimaryKey = true)]
public string S_LOC_CODE { get; set; }
-
+
+
+
+
/// <summary>
/// 瀹瑰櫒缂栫爜
/// </summary>
@@ -474,14 +488,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 +529,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>
/// 浣滀笟浼樺厛绾�@@ -619,11 +646,7 @@
/// </summary>
public string S_B_STATE { get; set; }
- /// <summary>
- /// 椤哄簭鍙�- /// </summary>
- public string N_SORT_NO { get; set; }
-
+
/// <summary>
/// 浣滀笟缂栫爜
/// </summary>
@@ -637,12 +660,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 +696,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 +778,13 @@
/// </summary>
public string S_WORKSHOP_NO { get; set; }
+
/// <summary>
/// 杞﹂棿鍚嶇О
/// </summary>
public string S_WORKSHOP_NAME { get; set; }
+
+
internal static string GetStateStr(int state)
{
@@ -812,9 +848,18 @@
/// <summary>
/// 鍔ㄤ綔鐮� /// </summary>
- public string N_ACTION_CODE { get; set; }
+ public int N_ACTION_CODE { get; set; }
}
+
+ //[ST("灏忚溅涓婃姤鐘舵�缂撳瓨琛�)]
+ //public class AgvState : BaseModel
+ //{
+ // public int state { get; set; }
+ // public string task_no { get; set; }
+ // public string forklift_no { get; set; }
+ // public string ext_data { get; set; }
+ //}
[ST("瀹瑰櫒琛�)]
@@ -926,131 +971,126 @@
/// <summary>
/// MES浠诲姟璁板綍琛� /// </summary>
- //[ST("MES浠诲姟璁板綍琛�)]
- //public class MesTask : BaseModel
- //{
- // /// <summary>
- // /// 浠诲姟鍙�- // /// </summary>
- // public string task_no { get; set; }
- // /// <summary>
- // /// 浠诲姟绫诲瀷1:鍏ュ簱;2:鍑哄簱
- // /// </summary>
- // public int Task_type { get; set; }
- // /// <summary>
- // /// 鍛ㄨ浆鍗″彿
- // /// </summary>
- // public string TurnCardNum { get; set; }
- // /// <summary>
- // /// 鏍囧噯閲嶉噺
- // /// </summary>
- // public float standardWeight { get; set; }
- // /// <summary>
- // /// 宸ヨ绫诲瀷 鑳庝晶25,鍐呰‖35,鑳庝綋/甯樺竷45,甯︽潫55,鑳庡湀65,鑳庨潰15,绾ょ淮85锛岄挗涓�5
- // /// </summary>
- // public string TOOLS_TPYE { get; set; }
- // /// <summary>
- // /// 鍒跺搧缂栧彿
- // /// </summary>
- // public string PROD_NO { get; set; }
- // /// <summary>
- // /// 宸ヨ壓缂栧彿
- // /// </summary>
- // public string PROD_TECH { get; set; }
- // /// <summary>
- // /// 鍒跺搧瑙勬牸
- // /// </summary>
- // public string PROD_SPEC { get; set; }
- // /// <summary>
- // /// 鍒跺搧绫诲瀷
- // /// </summary>
- // public string PROD_BOM { get; set; }
- // /// <summary>
- // /// 鍒跺搧鐗瑰緛鍊�- // /// </summary>
- // public string PROD_Feature { get; set; }
- // /// <summary>
- // /// 宸ヨ缂栧彿
- // /// </summary>
- // public string TOOLS_NO { get; set; }
- // /// <summary>
- // /// 杞芥枡鏁伴噺
- // /// </summary>
- // public float ST_AMOUNT { get; set; }
- // /// <summary>
- // /// 褰撳墠鏁伴噺
- // /// </summary>
- // public float CURRENT_AMOUNT { get; set; }
- // /// <summary>
- // /// 璧峰搴撲綅缂栧彿
- // /// </summary>
- // public string Location_From { get; set; }
- // /// <summary>
- // /// 鐩殑搴撲綅缂栧彿
- // /// </summary>
- // public string Location_To { get; set; }
- // /// <summary>
- // /// 鐢熶骇鏃堕棿
- // /// </summary>
- // public DateTime PRODUCE_TIME { get; set; }
- // /// <summary>
- // /// 鐢熸晥鏃堕棿
- // /// </summary>
- // public DateTime SHELF_LIFE_TIME { get; set; }
- // /// <summary>
- // /// 澶辨晥鏃堕棿
- // /// </summary>
- // public DateTime EXPIRED_TIME { get; set; }
- // /// <summary>
- // /// 缂╃煭鎶ュ憡鏃堕棿
- // /// </summary>
- // public float SHELF_REP { get; set; }
- // /// <summary>
- // /// 寤堕暱鎶ュ憡鏃堕棿
- // /// </summary>
- // public float EXPIRED_REP { get; set; }
- // /// <summary>
- // /// 璐ㄦ鐘舵�浠ｇ爜
- // /// </summary>
- // public string CHECK_CODE { get; set; }
- // /// <summary>
- // /// 璐ㄦ鐘舵�
- // /// </summary>
- // public string CHECK_INFO { get; set; }
- // /// <summary>
- // /// 浼樺厛绾�-鏅�锛氫换鍔＄敓鎴愭椂锛屽潎涓烘绾у埆;1-鍔犳�;2-绱ф�
- // /// </summary>
- // public int Priority { get; set; }
- // /// <summary>
- // /// 浠诲姟鐘舵�0-鍒濆鐘舵�;1-杩涜涓�2-瀹屾垚;3-浠诲姟鍙栨秷
- // /// </summary>
- // public int Data_status { get; set; }
- // /// <summary>
- // /// 涓氬姟绫诲瀷
- // /// 1 鍗婃垚鍝佹弧鎵樺叆搴�- // /// 2 鎴愬瀷鏈哄崐妗跺洖搴�- // /// 3 鎴愬瀷鏈虹┖妗跺洖搴�- // /// 4 鎴愬瀷鏈烘弧鎵樺嚭搴�- // /// 5 鎴愬瀷鏈哄甫鏉熷洖搴�- // /// 6 鎴愬瀷鏈哄甫鏉熸弧鎵樺嚭搴�- // /// 7 鍗婃垚鍝佺┖鎵樺嚭搴�- // /// 8 鑳舵枡鍏ュ簱
- // /// 9 鍛煎彨鑳舵枡
- // /// 10 鍙犵洏鏈虹┖鎵樺叆搴�- // /// 11 鑳舵枡鍗婃《鍥炲簱
- // /// 12 绌烘灦瀛愬叆搴�- // /// 13 鑳庡湀绌烘墭鍏ヤ笉甯﹀灚鐗�- // /// 14 鑳庡湀绌烘墭鍑轰笉甯﹀灚鐗�- // /// 100 缁戝畾
- // /// 200 瑙ｇ粦
- // /// </summary>
- // public string BUSI_TYPE { get; set; }
+ [ST("MES浠诲姟璁板綍琛�)]
+ public class MesTask : BaseModel
+ {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string task_no { get; set; }
+ /// <summary>
+ /// 浠诲姟绫诲瀷1:鍏ュ簱;2:鍑哄簱
+ /// </summary>
+ public int Task_type { get; set; }
+ /// <summary>
+ /// 鍛ㄨ浆鍗″彿
+ /// </summary>
+ public string TurnCardNum { get; set; }
+ /// <summary>
+ /// 鏍囧噯閲嶉噺
+ /// </summary>
+ public float standardWeight { get; set; }
+ /// <summary>
+ /// 宸ヨ绫诲瀷 鑳庝晶25,鍐呰‖35,鑳庝綋/甯樺竷45,甯︽潫55,鑳庡湀65,鑳庨潰15,绾ょ淮85锛岄挗涓�5
+ /// </summary>
+ public string TOOLS_TPYE { get; set; }
+ /// <summary>
+ /// 鍒跺搧缂栧彿
+ /// </summary>
+ public string PROD_NO { get; set; }
+ /// <summary>
+ /// 宸ヨ壓缂栧彿
+ /// </summary>
+ public string PROD_TECH { get; set; }
+ /// <summary>
+ /// 鍒跺搧瑙勬牸
+ /// </summary>
+ public string PROD_SPEC { get; set; }
+ /// <summary>
+ /// 鍒跺搧绫诲瀷
+ /// </summary>
+ public string PROD_BOM { get; set; }
+ /// <summary>
+ /// 鍒跺搧鐗瑰緛鍊�+ /// </summary>
+ public string PROD_Feature { get; set; }
+ /// <summary>
+ /// 宸ヨ缂栧彿
+ /// </summary>
+ public string TOOLS_NO { get; set; }
+ /// <summary>
+ /// 杞芥枡鏁伴噺
+ /// </summary>
+ public float ST_AMOUNT { get; set; }
+ /// <summary>
+ /// 褰撳墠鏁伴噺
+ /// </summary>
+ public float CURRENT_AMOUNT { get; set; }
+ /// <summary>
+ /// 璧峰搴撲綅缂栧彿
+ /// </summary>
+ public string Location_From { get; set; }
+ /// <summary>
+ /// 鐩殑搴撲綅缂栧彿
+ /// </summary>
+ public string Location_To { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃堕棿
+ /// </summary>
+ public DateTime PRODUCE_TIME { get; set; }
+ /// <summary>
+ /// 鐢熸晥鏃堕棿
+ /// </summary>
+ public DateTime SHELF_LIFE_TIME { get; set; }
+ /// <summary>
+ /// 澶辨晥鏃堕棿
+ /// </summary>
+ public DateTime EXPIRED_TIME { get; set; }
+ /// <summary>
+ /// 缂╃煭鎶ュ憡鏃堕棿
+ /// </summary>
+ public float SHELF_REP { get; set; }
+ /// <summary>
+ /// 寤堕暱鎶ュ憡鏃堕棿
+ /// </summary>
+ public float EXPIRED_REP { get; set; }
+ /// <summary>
+ /// 璐ㄦ鐘舵�浠ｇ爜
+ /// </summary>
+ public string CHECK_CODE { get; set; }
+ /// <summary>
+ /// 璐ㄦ鐘舵�
+ /// </summary>
+ public string CHECK_INFO { get; set; }
+ /// <summary>
+ /// 浼樺厛绾�-鏅�锛氫换鍔＄敓鎴愭椂锛屽潎涓烘绾у埆;1-鍔犳�;2-绱ф�
+ /// </summary>
+ public int Priority { get; set; }
+ /// <summary>
+ /// 浠诲姟鐘舵�0-鍒濆鐘舵�;1-杩涜涓�2-瀹屾垚;3-浠诲姟鍙栨秷
+ /// </summary>
+ public int Data_status { get; set; }
+ /// <summary>
+ /// 涓氬姟绫诲瀷
+ /// </summary>
+ public string BUSI_TYPE { get; set; }
- // /// <summary>
- // /// 鍒涘缓鏃堕棿
- // /// </summary>
- // public DateTime CreateDate { get; set; }
- //}
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime CreateDate { get; set; }
+
+ /// <summary>
+ /// 杩斿洖淇℃伅mes
+ /// </summary>
+ public string errMsg { get; set; }
+
+ /// <summary>
+ /// 杩斿洖鐮乵es
+ /// </summary>
+ public int errCode { get; set; }
+
+ }
/// <summary>
@@ -1059,7 +1099,6 @@
[ST("绌烘墭鍑虹紦瀛樿〃")]
public class MesKtTask : BaseModel
{
-
/// <summary>
/// 宸ヨ绫诲瀷 鑳庝晶25,鍐呰‖35,鑳庝綋/甯樺竷45,甯︽潫55,鑳庡湀65,鑳庨潰15,绾ょ淮85锛岄挗涓�5
/// </summary>
@@ -1081,22 +1120,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; }
@@ -1109,6 +1132,12 @@
/// 绌烘墭浠诲姟鏄惁鍒涘缓 Y/N 榛樿N
/// </summary>
public string Status { get; set; }
+
+
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string task_no { get; set; }
}
@@ -1409,4 +1438,173 @@
/// </summary>
public string AgvErrorMsg { get; set; }
}
+
+ /// <summary>
+ /// 浠诲姟鎷︽埅琛�+ /// </summary>
+ [ST("浠诲姟鎷︽埅琛�)]
+ public class ManualTaskSwitch : BaseModel
+ {
+
+ /// <summary>
+ /// 浠诲姟鎷︽埅寮�叧 Y/N Y琛ㄧず鎷︽埅浠诲姟鎺ㄩ�
+ /// </summary>
+ public string State { get; set; }
+ }
+
+
+
+
+ /// <summary>
+ /// 閫昏緫搴撳尯璐т綅鍏宠仈琛�+ /// </summary>
+ [ST("閫昏緫搴撳尯璐т綅鍏宠仈琛�)]
+ public class ZoneLoc : BaseModel
+ {
+ //璐т綅缂栫爜
+ [SugarColumn(IsPrimaryKey = true)]
+ public string S_LOC_CODE { get; set; }
+ //閫昏緫搴撳尯缂栫爜
+ public string S_ZONE_CODE { get; set; }
+
+ [SugarColumn(IsIgnore = true)]
+ [Navigate(NavigateType.OneToOne, nameof(S_LOC_CODE), nameof(Location.S_CODE))]
+ public Location Loc { get; set; }
+ }
+
+
+ /// <summary>
+ /// 閫昏緫缂栫爜鐩稿叧閫昏緫搴撳尯鍏宠仈
+ /// </summary>
+ [ST("閫昏緫缂栫爜鍏宠仈琛�)]
+ public class Zone : BaseModel
+ {
+ public string S_NAME { get; set; }
+ public string S_NOTE { get; set; }
+ public string S_WH_CODE { get; set; }
+ public int N_EMPTY_MIN { get; set; }
+ public int N_EMPTY_MAX { get; set; }
+ [SugarColumn(IsPrimaryKey = true)]
+ public string S_CODE { get; set; }
+ public string S_AREA_CODE { get; set; }
+ public string S_LOC_RULE { get; set; }
+ public string S_ZONE_CLS_CODE { get; set; }
+ public int N_AVAILABLE_IN { get; set; }
+ public int N_TYPE { get; set; }
+ public string S_TYPE { get; set; }
+ public string S_ITEM_CODE { get; set; }
+ public string S_ITEM_NAME { get; set; }
+ public string S_BATCH_NO { get; set; }
+ public string S_ITEM_CATEGORY { get; set; }
+ public string S_OWNER_CODE { get; set; }
+ public string S_SUPPLIER_CODE { get; set; }
+ public int N_CONNECT_TYPE { get; set; }
+ public string S_CONNECT_TYPE { get; set; }
+ public int N_LOCK_STATE { get; set; }
+ public string S_LOCK_STATE { get; set; }
+ public string S_OWNER_NAME { get; set; }
+ public string S_SUPPLIER_NAME { get; set; }
+ public int N_STORE_MAX { get; set; }
+ public string S_STATE_PRE { get; set; }
+
+ public string C_IS_AREA { get; set; }
+ public string S_GROUP { get; set; }
+
+ [SugarColumn(IsIgnore = true)]
+ [Navigate(NavigateType.OneToMany, nameof(S_CODE), nameof(ZoneLoc.S_LOC_CODE))]
+ public List<ZoneLoc> ZoneLocs { get; set; }
+ }
+
+ /// <summary>
+ /// 鍑哄簱缁堢偣鏃犻檺鍒惰〃
+ /// </summary>
+ [ST("鍑哄簱缁堢偣鏃犻檺鍒惰〃")]
+ public class UnlimitedLoc : BaseModel {
+ public string Loc { get; set; }
+
+ /// <summary>
+ /// 鍚敤 Y/N
+ /// </summary>
+ public string Enable { get; set; }
+ }
+
+ /// <summary>
+ /// 鍏ュ簱浼樺厛绾ц〃
+ /// </summary>
+ [ST("鍏ュ簱浼樺厛绾ц〃")]
+ public class InPri : BaseModel
+ {
+ /// <summary>
+ /// 鍑哄簱绫诲瀷 0绌烘墭鍑�1婊℃墭鍑� 婊℃墭鍑烘壘绌烘墭鍏� 绌烘墭鍑烘壘婊℃墭鍏�+ /// </summary>
+ public string Type { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟缁堢偣
+ /// </summary>
+ public string OutEndLoc { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱浠诲姟璧风偣
+ /// </summary>
+ public string InStartLoc { get; set; }
+
+ /// <summary>
+ /// 鎻愰珮浼樺厛绾�+ /// </summary>
+ public int Pri { get; set; }
+
+ /// <summary>
+ /// 鍚敤 Y/N
+ /// </summary>
+ public string Enable { get; set; }
+ }
+
+ /// <summary>
+ /// 灏忚溅鍔ㄤ綔缂撳瓨琛�+ /// </summary>
+ [ST("灏忚溅鍔ㄤ綔缂撳瓨琛�)]
+ public class AgvActionState : BaseModel
+ {
+ /// <summary>
+ /// 鍔ㄤ綔鐮�+ /// </summary>
+ public int state { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string task_no { get; set; }
+ /// <summary>
+ /// 杞﹀彿
+ /// </summary>
+ public string forklift_no { get; set; }
+ public string ext_data { get; set; }
+ }
+
+ [ST("鍑哄簱浠诲姟鎻愰珮浼樺厛绾ц〃")]
+ public class OutMinutePriority : BaseModel
+ {
+ //鏃堕棿 鍒嗛挓
+ public int Minute { get; set; }
+
+ //鎻愰珮浼樺厛绾�鍒癕inute+Priority
+ public int Priority { get; set; }
+
+ /// <summary>
+ /// 鍚敤 Y/N
+ /// </summary>
+ public string Enable { get; set; }
+ }
+
+ [ST("搴撳尯琛�)]
+ public class Area : BaseModel
+ {
+ //搴撳尯缂栫爜
+ public string S_CODE { get; set; }
+
+ /// <summary>
+ /// 搴撳尯鍚嶇О
+ /// </summary>
+ public string S_NAME { get; set; }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1