Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Core/Dto/Erp/OutStock/ErpOutStockSaveDto.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.Erp.OutStock
+{
+    /// <summary>
+    /// 出库单同步金蝶
+    /// </summary>
+    public class ErpOutStockSaveDto
+    {
+    }
+}

src/WMS.Web.Core/Dto/OutStock/SaveOutStockRequest.cs

@@ -11,40 +11,21 @@ namespace WMS.Web.Core.Dto.OutStock
    public class SaveOutStockRequest
     {
         /// <summary>
-        /// 来源单号
+        /// 出库任务单Id
         ///</summary> 
-        [Required(ErrorMessage = "来源单号不能为空")]
-        public string SourceBillNo { get; set; }
-        /// <summary>
-        /// 销售订单号
-        ///</summary> 
-        [Required(ErrorMessage = "销售订单号不能为空")]
-        public string SaleBillNo { get; set; }
-        /// <summary>
-        /// 发货组织
-        ///</summary> 
-        [Required(ErrorMessage = "发货组织不能为空")]
-        public int DeliveryOrgId { get; set; }
-        /// <summary>
-        /// 收货客户
-        ///</summary> 
-        [Required(ErrorMessage = "收货客户不能为空")]
-        public int ReceiptCustomerId { get; set; }
+        [Required(ErrorMessage = "出库单不能为空")]
+        public int TaskId { get; set; }
+        public List<SaveOutStockDetailsRequest> Details { get; set; } = new List<SaveOutStockDetailsRequest>();
+
+    }
+    public class SaveOutStockDetailsRequest
+    {
         /// <summary>
         /// 物料Id
         ///</summary> 
         [Required(ErrorMessage = "物料不能为空")]
         public int MaterialId { get; set; }
         /// <summary>
-        /// 仓库ID
-        ///</summary> 
-        [Required(ErrorMessage = "仓库不能为空")]
-        public int StockId { get; set; }
-        /// <summary>
-        /// 仓位ID
-        ///</summary> 
-        public int? SubStockId { get; set; }
-        /// <summary>
         /// 出库数量
         ///</summary> 
         [Required(ErrorMessage = "出库数量不能为空")]

src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs

@@ -21,11 +21,6 @@ namespace WMS.Web.Core.Dto.TakeStock
         [Required(ErrorMessage = "物料不能为空")]
         public int MaterialId { get; set; }
         /// <summary>
-        /// 单位ID
-        /// </summary>
-        [Required(ErrorMessage = "单位不能为空")]
-        public int UnitId { get; set; }
-        /// <summary>
         /// 仓库ID
         /// </summary>
         [Required(ErrorMessage = "仓库不能为空")]