From be51e4caa90767b04f0c17934ee821e7b19d5a38 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 10 Mar 2024 14:00:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=85=8D=E4=BB=B6=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E5=BB=BA=E6=A8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MergePurchaseSchemeGroupResponse.cs       | 14 +++++
 .../MergePurchaseSchemeProductSkuResponse.cs  | 54 +++++++++++++++++++
 .../Optimization/MergePurchaserResponse.cs    |  9 ++++
 3 files changed, 77 insertions(+)
 create mode 100644 BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaserResponse.cs

diff --git a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeGroupResponse.cs b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeGroupResponse.cs
index df14a0b..1000dd1 100644
--- a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeGroupResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeGroupResponse.cs
@@ -2,5 +2,19 @@
 {
     public class MergePurchaseSchemeGroupResponse
     {
+        /// <summary>
+		/// 分组Id
+		/// </summary>
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 组名
+        /// </summary>
+        public string GroupName { get; set; }
+
+        /// <summary>
+        /// 采购商集合
+        /// </summary>
+        public List<MergePurchaserResponse> PurchaserList { get; set; }
     }
 }
diff --git a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
index b9f8780..0d7b295 100644
--- a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaseSchemeProductSkuResponse.cs
@@ -9,5 +9,59 @@
         /// 采购商Id
         /// </summary>
         public string PurchaserId { get; set; }
+
+     
+        public string PurchaseSkuTitle { get; set; }
+
+        
+        public string PurchaseSkuLogo { get; set; }
+
+       
+        public decimal? PurchaseSkuPrice { get; set; }
+
+        /// <summary>
+        /// 是否失效 失效=1 其余情况默认为有效
+        /// </summary>
+        public int? IsInvalid { get; set; }
+
+        /// <summary>
+        /// 采购商品Id
+        /// </summary>
+        public string PurchaseProductId { get; set; }
+
+        /// <summary>
+        /// 采购商品的SkuId
+        /// </summary>
+        public string PurchaseSkuId { get; set; }
+
+        /// <summary>
+        /// 采购商品Sku的SpecId
+        /// </summary>
+        public string PurchaseSkuSpecId { get; set; }
+
+        /// <summary>
+        /// Sku采购方案Id
+        /// </summary>
+        public long SkuPurchaseSchemeId { get; set; }
+
+        /// <summary>
+        /// 采购比例
+        /// </summary>
+        public int? PurchaseRatio { get; set; } = 1;
+
+        /// <summary>
+        /// 实际单价
+        /// </summary>
+        public decimal? ActualPrice { get; set; }
+
+        /// <summary>
+        /// 最近议价日期
+        /// </summary>
+        public DateTime? LastBargainingTime { get; set; }
+
+        /// <summary>
+        /// 配件的最近采购价(配件单价)
+        /// </summary>
+        public decimal? LastPurchasePriceCost { get; set; }
     }
 }
diff --git a/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaserResponse.cs b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaserResponse.cs
new file mode 100644
index 0000000..bc4eefc
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Response/Optimization/MergePurchaserResponse.cs
@@ -0,0 +1,9 @@
+using BBWYB.Server.Model.Db;
+
+namespace BBWYB.Server.Model.Dto
+{
+    public class MergePurchaserResponse : Purchaser
+    {
+        public List<MergePurchaseSchemeProductSkuResponse> PurchaseSchemeProductSkuList { get; set; }
+    }
+}