1.出库单据、生成出库单据、计算物料时增加货架类型用于区分信息化货架和智能货架的物料 实现分开出

WCS.Model/ApiModel/InStore/QueryByMatSnRequest.cs

@@ -11,7 +11,6 @@ namespace WCS.Model
         public string MatSn { get; set; } = string.Empty;
         public string ShelfCode { get; set; } = string.Empty;
         public string IpAddress { get; set; } = string.Empty;
-
-        public bool IsSingleLightIn { get; set; } = false;
+        public bool SingleLightIn { get; set; } = false;
     }
 }

WCS.Model/ApiModel/MatInventoryDetail/GetMatInventorySummaryRequest.cs

@@ -10,12 +10,10 @@ namespace WCS.Model.ApiModel.MatInventoryDetail
 
         public string MatName { get; set; }
 
-        public string MatSpec { get; set; }
 
         public string MatBatch { get; set; }
 
-        public string MatSupplier { get; set; }
 
-        public string MatCustomer { get; set; }
+        public int ShelfTypeId { get; set; }
     }
 }

WCS.Model/ApiModel/MatInventoryDetail/MatInventorySummaryModel.cs

@@ -5,7 +5,7 @@ using System.Text;
 
 namespace WCS.Model.ApiModel.MatInventoryDetail
 {
-    public class MatInventorySummaryModel: INotifyPropertyChanged
+    public class MatInventorySummaryModel : INotifyPropertyChanged
     {
         public string MatCode { get; set; }
 
@@ -33,6 +33,9 @@ namespace WCS.Model.ApiModel.MatInventoryDetail
             }
         }
 
+        public string Info { get; set; }
+
+
 
         public bool IsSelected
         {

WCS.Model/ApiModel/OutStore/OutImportMatModel.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WCS.Model.ApiModel.OutStore
+{
+    public class OutImportMatModel
+    {
+        public string 物料编码 { get; set; }
+        public string 物料名称 { get; set; }
+        public string 物料批次 { get; set; }
+        public int 需求数量 { get; set; }
+    }
+}

WCS.Model/ApiModel/OutStore/SysOutOrderByMatCodeRequest.cs

@@ -17,6 +17,15 @@ namespace WCS.Model
         /// </summary>
         public string OrderType { get; set; }
 
+        /// <summary>
+        /// 货架类型Id
+        /// </summary>
+        public int ShelfTypeId { get; set; } = 0;
+        /// <summary>
+        /// 货架类型名称
+        /// </summary>
+        public string ShelfTypeName { get; set; } = string.Empty;
+
         public List<MatCodeItemList> ItemList { get; set; }
     }