1

BBWY.Client/BBWYAppSettings.json

@@ -1,9 +1,9 @@
 {
-  //"BBWYApiHost": "http://localhost:5000",
+  "BBWYApiHost": "http://localhost:5000",
-  "BBWYApiHost": "http://bbwytest.qiyue666.com",
+  //"BBWYApiHost": "http://bbwytest.qiyue666.com",
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  "QKApiHost": "http://localhost:8080"
+  //"QKApiHost": "http://localhost:8080"
-  //"QKApiHost": "http://qiku.qiyue666.com"
+  "QKApiHost": "http://qiku.qiyue666.com"
 }

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; }
 
+        
+
         /// <summary>
         /// 采购数量
         /// </summary>
@@ -27,6 +30,8 @@ namespace BBWY.Client.Models.QiKu
         /// </summary>
         public int SplitCount { get => splitCount; set { Set(ref splitCount, value); } }
 
+        public string RemarkMessage { get => remarkMessage; set { Set(ref remarkMessage, value); } }
+
         public ObservableCollection<PackSkuSplitConfig> PackSkuSplitConfigList { get; set; }
     }
 

BBWY.Client/Views/BatchPurchase/BatchCreateNewPurchaseOrder.xaml

@@ -137,7 +137,7 @@
                                         </TextBlock>
                                         <TextBlock Margin="10,0,0,0">
                                             <Run Text="数量:"/>
-                                            <Run Text="{Binding Quantity}"/>
+                                            <Run Text="{Binding Quantity,Mode=TwoWay}"/>
                                         </TextBlock>
                                     </StackPanel>
 

BBWY.Client/Views/BatchPurchase/PackSkuConfigWindow.xaml

@@ -33,6 +33,7 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <Grid Width="{Binding ActualWidth,ElementName=listbox,Converter={StaticResource widthConverter},ConverterParameter=3}">
+                       
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="140"/>
                             <ColumnDefinition/>
@@ -49,6 +50,7 @@
                                 <RowDefinition Height="30"/>
                                 <RowDefinition Height="30"/>
                                 <RowDefinition/>
+                                <RowDefinition/>
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="Auto"/>
@@ -116,10 +118,13 @@
                                         </Grid>
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
+                                
                             </ListBox>
+                            <c:BTextBox Grid.Row="3" Text="{Binding RemarkMessage,Mode=TwoWay}" WaterRemark="打包配置" AcceptsReturn="True" TextWrapping="Wrap" Grid.ColumnSpan="2" Height="70" Margin="5"/>
                         </Grid>
                        
                         <Border Grid.ColumnSpan="2" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
+                  
                         <Border HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
                     </Grid>
                 </DataTemplate>

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,

BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs

@@ -8,7 +8,10 @@ namespace BBWY.Server.Model.Dto
         {
 
         }
-
+        /// <summary>
+        /// 采购备注信息
+        /// </summary>
+        public string RemarkMessage { get; set; }
         /// <summary>
         /// 店铺Sku
         /// </summary>