Merge branch 'feature/智能货架'

WCS.Model/ApiModel/MatBaseInfo/GetMatInfoRequest.cs

@@ -13,5 +13,9 @@ namespace WCS.Model.ApiModel.MatBaseInfo
         public string MatSpec { get; set; }
 
         public string MatSN { get; set; }
+
+        public string MatBatch { get; set; }
+
+        public bool? IsPrinted { get; set; }
     }
 }

WCS.Model/ApiModel/MatBaseInfo/MatInfoModel.cs

@@ -30,6 +30,8 @@ namespace WCS.Model.ApiModel.MatBaseInfo
 
         public bool IsPrinted { get; set; }
 
+        public int PrintedTimes { get; set; }
+
         public string? ModifyUser { get; set; }
 
         public DateTime? ModifyTime { get; set; } = DateTime.Now;

WCS.Model/ApiModel/MatBaseInfo/PrintedMatInfoRequest.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.ApiModel.MatBaseInfo
+{
+    public class PrintedMatInfoRequest : RequestBase
+    {
+        public List<int> PrintedMatInfoIds { get; set; }
+    }
+}

WCS.Model/ApiModel/StoreInfo/GetModulesRequest.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.ApiModel.StoreInfo
+{
+    public class GetModulesRequest : PageQueryRequestBase
+    {
+        public string ShelfCode { get; set; }
+
+        public string ModuleCode { get; set; }
+    }
+}

WCS.Model/ApiModel/StoreInfo/GetStoresRequest.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.ApiModel.StoreInfo
+{
+    public class GetStoresRequest : PageQueryRequestBase
+    {
+        public string ShelfCode { get; set; }
+        public string ModuleCode { get; set; }
+        public string StoreCode { get; set; }
+        public string CurrentMatSN { get; set; }
+    }
+}

WCS.Model/ApiModel/StoreInfo/ModuleInfoModel.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Model.ApiModel.StoreInfo
+{
+    public class ModuleInfoModel : INotifyPropertyChanged
+    {
+        public int Id { get; set; }
+
+        public string ModuleCode { get; set; }
+        public int ShelfId { get; set; }
+
+        public string ShelfCode { get; set; }
+
+        public int BoardId { get; set; }
+
+        public int LightCount { get; set; }
+
+        public string CleintIp { get; set; }
+
+        public string R { get; set; }
+
+        public string C { get; set; }
+
+        public string? Bigshelfcode { get; set; }
+
+        public bool IsEnable { get; set; }
+
+        //public Mode CurrentMode { get; set; } = Mode.待机模式;
+        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));
+        }
+    }
+}

WCS.Model/ApiModel/StoreInfo/StoreInfoModel.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Model.ApiModel.StoreInfo
+{
+    public class StoreInfoModel : INotifyPropertyChanged
+    {
+        public int Id { 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 int BoardId { get; set; }
+        public int LightNumber { get; set; }
+        public int Priority { get; set; }
+        public string CurrentMatSn { get; set; }
+        public decimal CurrentVoltage { get; set; }
+        public decimal StandardVoltage { get; set; }
+        public decimal OffsetVoltage { 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));
+        }
+    }
+}