diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index e1b3dcff..3c6663c7 100644
--- a/BBWY.Client/BBWYAppSettings.json
+++ b/BBWY.Client/BBWYAppSettings.json
@@ -1,9 +1,9 @@
{
- //"BBWYApiHost": "http://localhost:5000",
- "BBWYApiHost": "http://bbwytest.qiyue666.com",
+ "BBWYApiHost": "http://localhost:5000",
+ //"BBWYApiHost": "http://bbwytest.qiyue666.com",
"MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "",
"1688ApiHost": "",
- "QKApiHost": "http://localhost:8080"
- //"QKApiHost": "http://qiku.qiyue666.com"
+ //"QKApiHost": "http://localhost:8080"
+ "QKApiHost": "http://qiku.qiyue666.com"
}
\ No newline at end of file
diff --git a/BBWY.Client/Models/QiKu/PackSkuConfig.cs b/BBWY.Client/Models/QiKu/PackSkuConfig.cs
index 619a3757..d02c3370 100644
--- a/BBWY.Client/Models/QiKu/PackSkuConfig.cs
+++ b/BBWY.Client/Models/QiKu/PackSkuConfig.cs
@@ -10,6 +10,7 @@ namespace BBWY.Client.Models.QiKu
}
private int splitCount;
+ private string remarkMessage;
public string SkuId { get; set; }
@@ -17,6 +18,8 @@ namespace BBWY.Client.Models.QiKu
public string Title { get; set; }
+
+
///
/// 采购数量
///
@@ -27,6 +30,8 @@ namespace BBWY.Client.Models.QiKu
///
public int SplitCount { get => splitCount; set { Set(ref splitCount, value); } }
+ public string RemarkMessage { get => remarkMessage; set { Set(ref remarkMessage, value); } }
+
public ObservableCollection PackSkuSplitConfigList { get; set; }
}
diff --git a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
index b208bd6e..c98e7518 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml
@@ -137,7 +137,7 @@
-
+
@@ -237,7 +237,7 @@
Height="18"
Command="{Binding DataContext.SubtractQuantityCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Window}}}"
CommandParameter="{Binding }"/>
-
+
@@ -49,6 +50,7 @@
+
@@ -116,10 +118,13 @@
+
+
-
+
+
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 1c598771..b5cbc30b 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -11,6 +11,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
+using System.Net.Mail;
using System.Text;
using System.Threading.Tasks;
using Yitter.IdGenerator;
@@ -330,16 +331,19 @@ namespace BBWY.Server.Business
};
insertPurchaseOrderSkuList.Add(purchaseOrderSku);
+
if (purchasePlatform == Enums.Platform.拳探)
{
var skuPackConfig = request.PackSkuConfigList?.FirstOrDefault(s => s.SkuId == firstProductParam.BelongSkuId);
+
if (skuPackConfig != null)
{
+
skuPackConfigList.Add(new
{
skuId = firstProductParam.BelongSkuId,
skuCount = skuPackConfig.PurchaseCount,
- markMessage = string.Empty,
+ markMessage = skuPackConfig.RemarkMessage,
wareHourses = skuPackConfig.PackSkuSplitConfigList.Select(x => new
{
wareId = x.Store.Id,
diff --git a/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs b/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs
index 6c3e9256..44d7f1d2 100644
--- a/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs
@@ -8,7 +8,10 @@ namespace BBWY.Server.Model.Dto
{
}
-
+ ///
+ /// 采购备注信息
+ ///
+ public string RemarkMessage { get; set; }
///
/// 店铺Sku
///