提交代码

WCS.Model/ApiModel/OutStore/GetOutOrderDetailRequest.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace WCS.Model
 {
-    public class GetOutOrderDetailRequest : ResponseBase
+    public class GetOutOrderDetailRequest : RequestBase
     {
         public int OrderId { get; set; }
         public string OrderNumber { get; set; }

WCS.Model/ApiModel/OutStore/GetOutOrderListRequest.cs

@@ -10,10 +10,8 @@ namespace WCS.Model
     {
         public string OrderNumber { get; set; }
 
-        public int OrderStatus { get; set; }
+        public string OrderSource { get; set; }
 
-        //public int PageNumber { get; set; }
-
-        //public int PageSize { get; set; }
+        public string OrderType { get; set; }
     }
 }

WCS.Model/ApiModel/OutStore/OutOrderDetailModel.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.ApiModel.OutStore
+{
+    public class OutOrderDetailModel
+    {
+        public int Id { get; set; }
+
+        public int OrderId { get; set; }
+
+        public string OrderNumber { get; set; }
+
+        public string MatCode { get; set; }
+
+        public string MatName { get; set; }
+
+        public string MatBatch { get; set; }
+
+        public int ReqQty { get; set; }
+
+        public int OutQty { get; set; }
+
+        public DateTime CreateTime { get; set; }
+
+        public string CreateUser { get; set; }
+
+        public int RowNumber { get; set; }
+    }
+}

WCS.Model/ApiModel/OutStore/OutOrderMatDetailModel.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.ApiModel.OutStore
+{
+    public class OutOrderMatDetailModel
+    {
+        public int Id { get; set; }
+
+        public int OrderId { get; set; }
+
+        public string OrderNumber { get; set; }
+
+        public int OutOrderDetailId { get; set; }
+
+        public int InventoryDetailId { get; set; }
+
+        #region 库位属性
+        public int StoreId { get; set; }
+
+        public string StoreCode { get; set; }
+
+
+        #endregion
+
+        #region 物料属性
+        public string MatSN { get; set; }
+        public string MatCode { get; set; }
+        public string MatName { get; set; }
+
+        public string MatSpec { get; set; }
+
+        public string MatBatch { get; set; }
+
+        public int MatQty { get; set; }
+
+        public string? MatSupplier { get; set; }
+
+        public string? MatCustomer { get; set; }
+        #endregion
+
+        public bool IsSended { get; set; } = false;
+
+        public DateTime CreateTime { get; set; } 
+
+        public string CreateUser { get; set; }
+
+        public int RowNumber { get; set; }
+    }
+}

WCS.Model/ApiModel/OutStore/OutOrderModel.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace WCS.Model.ApiModel.OutStore
+{
+    public class OutOrderModel : INotifyPropertyChanged
+    {
+        public int Id { get; set; }
+
+        public string OrderNumber { get; set; }
+        public OutOrderStatus OrderStatus { get; set; }
+
+        public OutOrderExeStatus OutOrderExeStatus { get; set; }
+
+        public string OrderSource { get; set; }
+
+        public string OrderType { get; set; }
+
+        public SyncTypeEnum SyncType { get; set; }
+
+        public DateTime CreateTime { get; set; }
+
+        public string CreateUser { get; set; }
+        public bool IsSelected
+        {
+            get { return isSelected; }
+            set
+            {
+                isSelected = value;
+                OnPropertyChanged(nameof(IsSelected));
+            }
+        }
+        public bool isSelected;
+        public int RowNumber { get; set; }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
+    public enum OutOrderStatus
+    {
+        未发料 = 0,
+        部分发料 = 1,
+        全部发料 = 2
+    }
+
+    public enum OutOrderExeStatus
+    {
+        待发料 = 0,
+        开始发料 = 1,
+        暂停发料 = 2,
+        发料完成 = 3
+    }
+
+    public enum SyncTypeEnum
+    {
+        ByMatCode = 0,
+        ByMatSn = 1
+    }
+}

WCS.Model/ApiModel/OutStore/SysOutOrderByMatCodeRequest.cs

@@ -23,6 +23,7 @@ namespace WCS.Model
     public class MatCodeItemList
     {
         public string MatCode { get; set; }
+        public string MatName { get; set; }
         public string MatBatch { get; set; }
         public int ReqQty { get; set; }
     }