From 1f9a89458a66c12c1f7dfbceb2588ada8fbf16f4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期四, 13 十一月 2025 17:35:36 +0800
Subject: [PATCH] 新增移库页面与WebSocket支持，优化任务逻辑新增移库页面支持移库任务输入与提交。新增 WebSocket 支持（`websocket.js`、`WebSocketSetup.cs`），实现实时通信功能。 在任务状态枚举中新增 AGV 移库任务状`TaskStatusEnum.cs`）- 重构库存数据展示页面（`Home.vue`），新增数据总览与图表展示功能。 - 新增库存数据接口（`StockInfoService.cs`、`StockInfoController.cs`），支持库存统计与展示。 - 优化任务状态管理逻辑，支持 AGV 移库任务（`Dt_TaskService.cs`）。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 102 insertions(+), 11 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
index 151165b..bc336e9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
@@ -130,10 +130,16 @@
OutOther = 110,
/// <summary>
- /// 鍙枡鍑哄簱
+ /// 鐢熶骇棰嗘枡鍑哄簱
/// </summary>
- [Description("鍙枡鍑哄簱")]
- OutCall = 115,
+ [Description("鐢熶骇棰嗘枡鍑哄簱")]
+ MaterialRequisition = 115,
+
+ /// <summary>
+ /// 鍘熸潗鏂欏嚭搴�
+ /// </summary>
+ [Description("鍘熸潗鏂欏嚭搴�")]
+ RawMaterials = 120,
}
public enum TaskRelocationTypeEnum
@@ -416,16 +422,22 @@
SC_RelocationFinish = 315,
/// <summary>
+ /// 鏂板缓AGV绉诲簱浠诲姟
+ /// </summary>
+ [Description("鏂板缓AGV绉诲簱浠诲姟")]
+ RelocationNewAGV = 320,
+
+ /// <summary>
/// AGV绉诲簱鎵ц涓�
/// </summary>
[Description("AGV绉诲簱鎵ц涓�")]
- AGV_RelocationExecuting = 320,
+ AGV_RelocationExecuting = 325,
/// <summary>
/// AGV绉诲簱瀹屾垚
/// </summary>
[Description("AGV绉诲簱瀹屾垚")]
- AGV_RelocationFinish = 325,
+ AGV_RelocationFinish = 330,
/// <summary>
/// 绉诲簱浠诲姟瀹屾垚
@@ -582,19 +594,59 @@
#endregion 鍘熷鍗曟嵁鍚屾鐘舵��
- #region 鍏ュ簱鍗曟嵁鐘舵��
+ #region 鍗曟嵁鐘舵��
/// <summary>
- /// 鍏ュ簱鍗曟嵁鐘舵�� 0锛屾湭寮�濮� 1锛屽叆搴撲腑 2锛屽叆搴撳畬鎴�
+ /// 鍏ュ簱鍗曟嵁鐘舵�� 0锛屾湭寮�濮� 1锛屽凡瀹屾垚
/// </summary>
- public enum InboundStateEmun
+ public enum OrderStateEmun
{
+ [Description("鏈紑濮�")]
鏈紑濮� = 0,
- 鍏ュ簱涓� = 1,
- 鍏ュ簱瀹屾垚 = 2
+
+ [Description("寮�濮�")]
+ 寮�濮� = 1,
+
+ [Description("宸插畬鎴�")]
+ 宸插畬鎴� = 2,
}
- #endregion 鍏ュ簱鍗曟嵁鐘舵��
+ #endregion 鍗曟嵁鐘舵��
+
+ #region 鍗曟嵁绫诲瀷
+
+ public enum OrderTypeEmun
+ {
+ [Description("鐩樼偣鍑哄簱鍗�")]
+ 鐩樼偣鍑哄簱鍗� = 100,
+
+ [Description("璋冩嫧鍑哄簱鍗�")]
+ 璋冩嫧鍑哄簱鍗� = 105,
+
+ [Description("鍏朵粬鍑哄簱鍗�")]
+ 鍏朵粬鍑哄簱鍗� = 110,
+
+ [Description("鐢熶骇棰嗘枡鍗�")]
+ 鐢熶骇棰嗘枡鍗� = 115,
+
+ [Description("鍘熸潗鏂欓鏂欏崟")]
+ 鍘熸潗鏂欓鏂欏崟 = 120,
+ }
+
+ #endregion 鍗曟嵁绫诲瀷
+
+ #region 鍗曟嵁绫诲瀷
+
+ public enum OrderCreateTypeEmun
+ {
+ [Description("鎵嬪姩鍒涘缓")]
+ 鎵嬪姩鍒涘缓 = 0,
+
+ [Description("ERP鎺ㄩ��")]
+ ERP鎺ㄩ�� = 1,
+ }
+
+ #endregion 鍗曟嵁绫诲瀷
#region 缁勭洏绫诲瀷
@@ -616,14 +668,30 @@
/// </summary>
public enum StockStateEmun
{
+ [Description("缁勭洏鏆傚瓨")]
缁勭洏鏆傚瓨 = 1,
+
+ [Description("缁勭洏鎾ら攢")]
缁勭洏鎾ら攢 = 2,
+
+ [Description("鍏ュ簱纭")]
鍏ュ簱纭 = 3,
+
+ [Description("鍏ュ簱鎾ら攢")]
鍏ュ簱鎾ら攢 = 4,
+
+ [Description("宸插叆搴�")]
宸插叆搴� = 5,
+
+ [Description("鍏ュ簱瀹屾垚")]
鍏ュ簱瀹屾垚 = 6,
+
+ [Description("鍑哄簱閿佸畾")]
鍑哄簱閿佸畾 = 7,
+
+ [Description("鍑哄簱瀹屾垚")]
鍑哄簱瀹屾垚 = 8,
+
}
#endregion 搴撳瓨鐘舵��
@@ -645,4 +713,27 @@
鑷姩瀹屾垚 = 6,
}
#endregion
+
+ #region 鐩樼偣鐘舵��
+ public enum InventoryStatus
+ {
+ /// <summary>
+ /// 姝ｅ父
+ /// </summary>
+ [Description("姝ｅ父")]
+ Normal =0,
+
+ /// <summary>
+ /// 鐩樼泩
+ /// </summary>
+ [Description("鐩樼泩")]
+ Panying = 1,
+
+ /// <summary>
+ /// 鐩樹簭
+ /// </summary>
+ [Description("鐩樹簭")]
+ InventoryShortage = 2,
+ }
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3