From b43efd19ffb0f6d4a9bbf8e9b6d738cd75c010f5 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 8 May 2023 22:05:04 +0800
Subject: [PATCH] 1

---
 BBWY.Client/BBWYAppSettings.json              |  4 +--
 .../Models/BatchPurchase/BatchPublishTask.cs  |  2 +-
 .../BatchPublishTaskViewModel.cs              |  2 +-
 .../PackTask/PackTaskTotalViewModel.cs        | 17 +++---------
 .../PackTask/WareHouseListViewModel.cs        | 11 ++------
 .../BatchPurchase/BatchPublishTaskWindow.xaml | 14 +++++-----
 .../BatchPurchase/BatchPurchaseOrderList.xaml |  4 +--
 .../BatchPurchase/BatchPurchaseBusiness.cs    | 27 -------------------
 8 files changed, 18 insertions(+), 63 deletions(-)

diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index 67d1c91b..5a9e962b 100644
--- a/BBWY.Client/BBWYAppSettings.json
+++ b/BBWY.Client/BBWYAppSettings.json
@@ -1,6 +1,6 @@
 {
-  //"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": "",
diff --git a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
index b08ed129..5c098e61 100644
--- a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
+++ b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
@@ -381,7 +381,7 @@ namespace BBWY.Client.Models
                 {
                     return;
                 }
-                Logo = skuResponse.Data[0].Logo;
+                Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");
                 SkuName = skuResponse.Data[0].Title;
 
 
diff --git a/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs b/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs
index d9fd7a8e..a197321b 100644
--- a/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs
@@ -153,7 +153,7 @@ namespace BBWY.Client.ViewModels
                 model.packTaskService = packTaskService;
                 model.SkuId = item.SkuId;
                 model.SkuCount = item.Quantity.Value;
-                model.Logo = item.Logo;
+                model.Logo = item.Logo.Replace("80x80", "200x200");
                 model.SpuId = item.ProductId;
                 model.SkuName = item.SkuTitle;
                 model.SearchSku(item.SkuId);
diff --git a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
index 6b5c21b7..35909122 100644
--- a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
@@ -72,7 +72,7 @@ namespace BBWY.Client.ViewModels.PackTask
 
         public ICommand BatchCheckedCommand { get; set; }
 
-        public ICommand CopyTextCommand { get; set; }
+
 
         public PackTaskTotalViewModel(PackTaskService packTaskService)
         {
@@ -80,6 +80,8 @@ namespace BBWY.Client.ViewModels.PackTask
 
             SearchTaskTotalCommand = new RelayCommand(SearchTaskTotal);
 
+            StartDate = DateTime.Now;
+            EndDate = DateTime.Now; 
 
             SetSearchDateCommand = new RelayCommand<int>(d =>
             {
@@ -95,19 +97,6 @@ namespace BBWY.Client.ViewModels.PackTask
             });
 
             BatchCheckedCommand = new RelayCommand(BatchCheck);
-            CopyTextCommand = new RelayCommand<object>((obj) =>
-            {
-                try
-                {
-                    Clipboard.SetText(obj.ToString());
-                }
-                catch (Exception ex)
-                {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine(ex);
-                    Console.ResetColor();
-                }
-            });
             BatchSettleCommand = new RelayCommand(BatchSettle);
             SettleCommand = new RelayCommand<long>(SettleTask);
             ExportCommand = new RelayCommand(Export);
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 94b8bd26..343b6380 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -242,15 +242,8 @@ namespace BBWY.Client.ViewModels.PackTask
             ///修改完成
             var model = packTaskService.UpdateTaskStatus(taskId, 1,orderId);
             if (model != null && model.Success&&!string.IsNullOrEmpty(orderId))
-            {
-                if (model.Data != null && Convert.ToBoolean(model.Data))
-                {
-                    //var res = batchPurchaseService.UpdatePurchaseOrderState(orderId, Models.PurchaseOrderState.待结算);
-                    //if (res.Success)
-                   new TipsWindow("修改成功").Show();
-                }
-               
-            }
+                SearchTaskList();
+        
         }
 
         public void SetTaskState(TaskState? taskState)
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml b/BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
index 124d5382..cd19b6c0 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
@@ -63,13 +63,13 @@
                         </Grid.ColumnDefinitions>
                         <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
                         <StackPanel Orientation="Vertical" Grid.Column="0">
-                            <c:BAsyncImage UrlSource="{Binding Logo}"
+                            <c:BAsyncImage UrlSource="{Binding Logo}" 
                                                            Width="150" DecodePixelWidth="150"
                                                            VerticalAlignment="Top" Margin="25 13 25 13"
                                                            Cursor="Hand">
                                 <b:Interaction.Triggers>
                                     <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                        <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
+                                        <b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Window}}}">
                                             <b:InvokeCommandAction.CommandParameter>
                                                 <MultiBinding Converter="{StaticResource mptConverter}">
                                                     <Binding Path="SkuId"/>
@@ -134,10 +134,10 @@
                                     </ComboBox>
                                 </StackPanel>
 
-                                <TextBox   HorizontalAlignment="Left" Text="{Binding MarkMessage}"    VerticalAlignment="Top" Height="100" Width="350"
-                                      Margin="400 64 0 0 " AcceptsReturn="True" TextWrapping="Wrap">
+                                <c:BTextBox   HorizontalAlignment="Left" Text="{Binding MarkMessage}"    VerticalAlignment="Top" Height="100" Width="350"
+                                    WaterRemark="备注信息"    Margin="400 64 0 0 " AcceptsReturn="True" TextWrapping="Wrap">
                                    
-                                </TextBox>
+                                </c:BTextBox>
                                 <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Height="25"
                                             Margin="19 118 0 0">
                                     <TextBlock Text="落仓去向:" VerticalAlignment="Center"/>
@@ -155,10 +155,10 @@
                                         <ColumnDefinition Width="77"/>
                                         <ColumnDefinition MinWidth="77"/>
                                         <ColumnDefinition Width="77"/>
-                                        <ColumnDefinition Width="100"/>
-                                        <ColumnDefinition Width="77"/>
+                                        <ColumnDefinition Width="140"/>
                                         <ColumnDefinition Width="77"/>
                                         <ColumnDefinition Width="77"/>
+                                        <ColumnDefinition Width="100"/>
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="35"/>
diff --git a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
index 6c88b651..23738f9c 100644
--- a/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
+++ b/BBWY.Client/Views/BatchPurchase/BatchPurchaseOrderList.xaml
@@ -103,7 +103,7 @@
                     <Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchPurchaseOrderCommand}"
                            Grid.RowSpan="2" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
                     <Button Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
-                               Visibility="{Binding Visibility,ElementName=listbox_order}" Background="#1CC2A2" BorderThickness="0" Foreground="White"/>
+                               Visibility="{Binding Visibility,ElementName=listbox_purchaseOrder}" Background="#1CC2A2" BorderThickness="0" Foreground="White"/>
                     <!--<Button Content="同步" Command="{Binding SyncOrderCommand}" Width="50" Grid.Column="1" Grid.Row="1"
                                Visibility="{Binding Visibility,ElementName=listbox_order}" Background="#02A7F0" BorderThickness="0" Foreground="White"/>-->
                 </Grid>
@@ -241,7 +241,7 @@
                                          Foreground="{StaticResource Text.Color}">
                                     <ListBox.ItemTemplate>
                                         <DataTemplate>
-                                            <Grid Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
+                                            <Grid Width="{Binding ActualWidth,ElementName=listbox_purchaseOrderSku}">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="90"/>
                                                     <ColumnDefinition/>
diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
index 0809b516..afe3ec68 100644
--- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
+++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs
@@ -439,16 +439,6 @@ namespace BBWY.Server.Business
             };
         }
 
-        public UpdatePackStateResponse UpdatePackState(UpdatePackStateRequest request)
-        {
-
-            var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
-            fsql.Update<PurchaseOrderV2>(order)
-  .Set(a => a.PackState, request.PackState)
-  .ExecuteAffrows();
-            return new UpdatePackStateResponse();
-        }
-
         public UpdatePackStateResponse UpdatePurchaseOrderState(UpdatePurchaseOrderStateRequest request)
         {
 
@@ -461,22 +451,5 @@ namespace BBWY.Server.Business
             return new UpdatePackStateResponse();
         }
 
-        public UpdatePackStateResponse UpdatePackMoney(UpdatePackMoneyRequest request)
-        {
-            var skuOrder = fsql.Select<PurchaseOrderSku>().Where(p => p.SkuId == request.SkuId && p.PurchaseOrderId == request.OrderId).ToOne();
-            fsql.Update<PurchaseOrderSku>(skuOrder)
-  .Set(p => p.ConsumableAmount, request.PackMoney)
-  .ExecuteAffrows();//设置sku耗材费
-
-
-            var orderSkus = fsql.Select<PurchaseOrderSku>().Where(p => p.PurchaseOrderId == request.OrderId).ToList();
-
-
-            var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
-            fsql.Update<PurchaseOrderV2>(order)
-  .Set(a => a.ConsumableAmount, orderSkus.Select(o => o.ConsumableAmount).Sum())
-  .ExecuteAffrows();//设置订单耗材费
-            return new UpdatePackStateResponse();
-        }
     }
 }