添加报警窗口

出库流程调试、优化

WCS.Model/ApiModel/Stocktaking/GetStockTakingOrdersRequest.cs

@@ -7,15 +7,9 @@ namespace WCS.Model.ApiModel.Stocktaking
     public class GetStockTakingOrdersRequest : PageQueryRequestBase
     {
         public string StocktakingOrderNumber { get; set; }
+        public string StocktakingOrderSource { get; set; }
+        public string StocktakingOrderType { get; set; }
 
         public StocktakingOrderStatus? StocktakingOrderStatus { get; set; }
     }
-
-    public enum StocktakingOrderStatus
-    {
-        未盘点 = 0,
-        部分盘点 = 1,
-        盘点完成 = 2,
-        已提交 = 3
-    }
 }

WCS.Model/ApiModel/Stocktaking/StockTakingOrderModel.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Model.ApiModel.Stocktaking
+{
+    public class StockTakingOrderModel : INotifyPropertyChanged
+    {
+        public int Id { get; set; }
+
+        public string StocktakingOrderNumber { get; set; }
+
+        public StocktakingOrderStatus StocktakingOrderStatus { get; set; } = StocktakingOrderStatus.未盘点;
+
+        public string? StocktakingOrderSource { get; set; }
+
+        public DateTime CreateTime { get; set; } = DateTime.Now;
+
+        public string CreateUser { get; set; }
+
+        public int RowNumber { get; set; }
+
+        public bool IsSelected
+        {
+            get { return isSelected; }
+            set
+            {
+                isSelected = value;
+                OnPropertyChanged(nameof(IsSelected));
+            }
+        }
+        public bool isSelected;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
+    public enum StocktakingOrderStatus
+    {
+        未盘点 = 0,
+        部分盘点 = 1,
+        盘点完成 = 2,
+        已提交 = 3
+    }
+
+}

WCS.Model/WebSocketModel/SolveWarningRequesr.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.WebSocketModel
+{
+    public class SolveWarningRequest
+    {
+        public Guid Guid { get; set; }
+        public SolveTypeEnum SolveType { get; set; }
+    }
+
+    public enum SolveTypeEnum
+    {
+        处理 = 0,
+        忽略 = 1,
+    }
+}

WCS.Model/WebSocketModel/WebSocketMessageModel.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.WebSocketModel
+{
+    public class WebSocketMessageModel
+    {
+        public bool IsWarning { get; set; } = true;
+        public Guid Guid { get; set; } = Guid.NewGuid();
+        public WarningTypeEnum WarningType { get; set; }
+        public int StoreId { get; set; }
+        public string StoreCode { get; set; }
+        public int ModuleId { get; set; }
+        public string ModuleCode { get; set; }
+        public int ShelfId { get; set; }
+        public string ShelfCode { get; set; }
+        public string WarningMessage { get; set; }
+        /// <summary>
+        /// 发送到前端的地址
+        /// </summary>
+        public string ClientIp { get; set; }
+        public DateTime LastSendTime { get; set; }
+        public bool ClientIsReceived { get; set; }
+
+        //恢复正常需要消除的报警guid
+        public List<Guid> SolvedGuids { get; set; }
+    }
+
+    public enum WarningTypeEnum
+    {
+        进入入库未响应 = 0,
+        入库自检丢失 = 1,
+        入库自检未扫描上架 = 2,
+        入库中异常取出 = 3,
+        入库中未扫描上架 = 4,
+        退出入库未响应 = 5,
+        进入出库未响应 = 6,
+        出库自检丢失 = 7,
+        出库自检未扫描上架 = 8,
+        出库中丢失 = 9,
+        出库中未扫描上架 = 10,
+        退出出库未响应 = 11,
+        恢复正常 = 50,
+        通知刷新出库 = 51,
+    }
+}