From ca57163bc5e65aa91fa8c439f682f9f7eb7fed99 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 22 May 2023 20:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5=E9=BD=90=E5=BA=93=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PackSkuSplitCountAndStoreWindow.xaml      | 12 ++++---
 .../BatchPurchase/BatchPurchaseBusiness.cs    | 32 +++++++++++++------
 .../Dto/Request/QiKu/PackSkuConfigRequest.cs  |  2 ++
 .../Dto/Request/Stock/StoreRequest.cs         |  2 ++
 4 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/BBWY.Client/Views/BatchPurchase/PackSkuSplitCountAndStoreWindow.xaml b/BBWY.Client/Views/BatchPurchase/PackSkuSplitCountAndStoreWindow.xaml
index e9bc7a4a..f8db9edd 100644
--- a/BBWY.Client/Views/BatchPurchase/PackSkuSplitCountAndStoreWindow.xaml
+++ b/BBWY.Client/Views/BatchPurchase/PackSkuSplitCountAndStoreWindow.xaml
@@ -42,11 +42,11 @@
             <c:BButton Content="京仓" Width="70"
                        Background="{Binding StoreTypeIndex,Converter={StaticResource objConverter},ConverterParameter=2:#8080FF:#F2F2F2}"
                        Foreground="{Binding StoreTypeIndex,Converter={StaticResource objConverter},ConverterParameter=2:White:#4A4A4A}"
-                       Command="{Binding SetStoreIndexCommand,ConverterParameter={StaticResource store_JingCang}}"/>
+                       Command="{Binding SetStoreIndexCommand}" CommandParameter="{StaticResource store_JingCang}"/>
             <c:BButton Content="云仓" Width="70"
                        Background="{Binding StoreTypeIndex,Converter={StaticResource objConverter},ConverterParameter=3:#8080FF:#F2F2F2}"
                        Foreground="{Binding StoreTypeIndex,Converter={StaticResource objConverter},ConverterParameter=3:White:#4A4A4A}"
-                       Command="{Binding SetStoreIndexCommand,ConverterParameter={StaticResource store_YunCang}}"/>
+                       Command="{Binding SetStoreIndexCommand}" CommandParameter="{StaticResource store_YunCang}"/>
             <c:BButton Content="聚水潭" Width="70"
                        Background="{Binding IsJST,Converter={StaticResource objConverter},ConverterParameter=true:#8080FF:#F2F2F2}"
                        Foreground="{Binding IsJST,Converter={StaticResource objConverter},ConverterParameter=true:White:#4A4A4A}"
@@ -54,7 +54,7 @@
             <c:BButton Content="商家仓" Width="70"
                        Background="{Binding StoreTypeIndex,Converter={StaticResource objConverter},ConverterParameter=1:#8080FF:#F2F2F2}"
                        Foreground="{Binding StoreTypeIndex,Converter={StaticResource objConverter},ConverterParameter=1:White:#4A4A4A}"
-                        Command="{Binding SetStoreIndexCommand,ConverterParameter={StaticResource store_ShangJiaCang}}"/>
+                        Command="{Binding SetStoreIndexCommand}" CommandParameter="{StaticResource store_ShangJiaCang}"/>
         </StackPanel>
 
         <TextBlock Text="件数:" HorizontalAlignment="Right" VerticalAlignment="Center"
@@ -63,11 +63,13 @@
                     Margin="5,0,10,0"/>
 
         <TextBlock Text="落仓去向:" HorizontalAlignment="Right" VerticalAlignment="Center"
-                   Grid.Row="4"/>
+                   Grid.Row="4"
+                   Visibility="{Binding IsJST,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
         <ComboBox x:Name="cbx_stroeList" Grid.Row="4" Grid.Column="1" Height="30"
                   Margin="5,0,10,0"
                   DisplayMemberPath="Name"
-                  VerticalContentAlignment="Center"/>
+                  VerticalContentAlignment="Center"
+                  Visibility="{Binding IsJST,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
 
         <c:BButton x:Name="btn_save" Content="保存" Width="80" HorizontalAlignment="Right" Grid.Row="5"
                    Margin="0,0,5,0" Click="btn_save_Click"
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index db719bc0..00aca985 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -329,9 +329,10 @@ namespace BBWY.Server.Business
                                     markMessage = string.Empty,
                                     wareHourses = skuPackConfig.PackSkuSplitConfigList.Select(x => new
                                     {
-                                        wareId = x.Store.Id,
-                                        wareName = x.Store.Name,
-                                        count = x.PackCount
+                                        wareId = x.IsJST ? "qiyuejushuitan" : x.Store.Id,
+                                        wareName = x.IsJST ? "齐越聚水潭" : x.Store.Name,
+                                        count = x.PackCount,
+                                        wareType = x.IsJST ? 3 : GetQiKuWareType(x.Store.Type)
                                     })
                                 });
                             }
@@ -430,6 +431,17 @@ namespace BBWY.Server.Business
             };
         }
 
+        private int GetQiKuWareType(Enums.StockType stockType)
+        {
+            if (stockType == Enums.StockType.京仓)
+                return 0;
+            if (stockType == Enums.StockType.云仓)
+                return 1;
+            if (stockType == Enums.StockType.商家仓)
+                return 2;
+            return 0;
+        }
+
         public PurchaseOrderV2ListResponse GetPurchaseOrderList(SearchPurchaseOrderV2Request request)
         {
             if (request.EndDate != null)
@@ -516,8 +528,8 @@ namespace BBWY.Server.Business
                 var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
 
                 fsql.Update<PurchaseOrderV2>(order)
-      .Set(a => a.OrderState, payOrderResponse.PurchaseOrderState)
-      .ExecuteAffrows();
+        .Set(a => a.OrderState, payOrderResponse.PurchaseOrderState)
+        .ExecuteAffrows();
             }
 
             return new PayPurchaseOrderResponse()
@@ -552,7 +564,7 @@ namespace BBWY.Server.Business
                 {
                     nLogManager.GetLogger($"取消打包任务-{request.OrderId}").Error(ex, JsonConvert.SerializeObject(request));
                 }
-                
+
             }
 
 
@@ -570,8 +582,8 @@ namespace BBWY.Server.Business
 
             var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
             fsql.Update<PurchaseOrderV2>(order)
-  .Set(a => a.OrderState, request.PurchaseOrderState)
-  .ExecuteAffrows();
+        .Set(a => a.OrderState, request.PurchaseOrderState)
+        .ExecuteAffrows();
             return new UpdatePackStateResponse();
         }
 
@@ -579,8 +591,8 @@ namespace BBWY.Server.Business
         {
             var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
             fsql.Update<PurchaseOrderV2>(order)
-  .Set(a => a.PackState, request.PackState)
-  .ExecuteAffrows();
+        .Set(a => a.PackState, request.PackState)
+        .ExecuteAffrows();
             return new UpdatePackStateResponse();
         }
     }
diff --git a/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs b/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs
index 6c3e9256..5b10c605 100644
--- a/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/QiKu/PackSkuConfigRequest.cs
@@ -30,5 +30,7 @@ namespace BBWY.Server.Model.Dto
         public int PackCount { get; set; }
 
         public StoreRequest Store { get; set; }
+
+        public bool IsJST { get; set; }
     }
 }
diff --git a/BBWY.Server.Model/Dto/Request/Stock/StoreRequest.cs b/BBWY.Server.Model/Dto/Request/Stock/StoreRequest.cs
index 91b053b4..62589032 100644
--- a/BBWY.Server.Model/Dto/Request/Stock/StoreRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/Stock/StoreRequest.cs
@@ -5,5 +5,7 @@
         public string Id { get; set; }
 
         public string Name { get; set; }
+
+        public Enums.StockType Type { get; set; }
     }
 }