From 3b5d8077d2769992e41c72571342a966d4ecacba Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Wed, 24 Jan 2024 19:55:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=88=90=E6=9C=AC=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=92=8C=E6=88=90=E6=9C=AC=E6=AF=9B=E5=88=A9=E7=8E=87?=
 =?UTF-8?q?=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                  |  2 +-
 .../Response/Order/OrderCostResponse.cs       |  5 +++-
 BBWY.Client/Views/Order/OrderListControl.xaml | 26 ++++++++++++-------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index ef199a45..9978f5d2 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10231";
+            ClientVersion = "10232";
         }
 
 
diff --git a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
index a01f346c..58e2148b 100644
--- a/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/Order/OrderCostResponse.cs
@@ -34,7 +34,10 @@ namespace BBWY.Client.Models
         {
             get
             {
-                return TotalCost == 0 ? 0 : Math.Round(Profit / TotalCost * 100, 2);
+                if (SDCommissionAmount > 0 || SDOrderAmount > 0)
+                    return TotalCost == 0 ? 0 : Math.Round(Profit / TotalCost * 100, 2);
+                return PurchaseAmount == 0 ? 0 : Math.Round(Profit / PurchaseAmount * 100, 2);
+
             }
         }
 
diff --git a/BBWY.Client/Views/Order/OrderListControl.xaml b/BBWY.Client/Views/Order/OrderListControl.xaml
index 60967cce..b2afce6d 100644
--- a/BBWY.Client/Views/Order/OrderListControl.xaml
+++ b/BBWY.Client/Views/Order/OrderListControl.xaml
@@ -452,11 +452,14 @@
                                                                             <TextBlock Text="库存流水" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
                                                                         <Grid Background="{StaticResource Border.Background}" Grid.Column="1" Grid.ColumnSpan="2">
-                                                                            <TextBlock Text="商品成本" Style="{StaticResource middleTextBlock}"/>
+                                                                            <TextBlock Text="采购成本" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
-                                                                        <Grid Background="{StaticResource Border.Background}" Grid.Column="3" Grid.ColumnSpan="6">
+                                                                        <Grid Background="{StaticResource Border.Background}" Grid.Column="3" Grid.ColumnSpan="4">
                                                                             <TextBlock Text="期间成本" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
+                                                                        <Grid Background="{StaticResource Border.Background}" Grid.Column="7" Grid.ColumnSpan="2">
+                                                                            <TextBlock Text="销售成本" Style="{StaticResource middleTextBlock}"/>
+                                                                        </Grid>
                                                                         <Grid Background="{StaticResource Border.Background}" Grid.Column="9" Grid.RowSpan="2">
                                                                             <TextBlock Text="小计成本" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
@@ -476,7 +479,7 @@
                                                                             <TextBlock Text="打包耗材" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
                                                                         <Grid Background="{StaticResource Border.Background}" Grid.Column="5" Grid.Row="1">
-                                                                            <TextBlock Text="尾程费" Style="{StaticResource middleTextBlock}"/>
+                                                                            <TextBlock Text="包装人工" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
                                                                         <Grid Background="{StaticResource Border.Background}" Grid.Column="6" Grid.Row="1">
                                                                             <TextBlock Text="入库操作" Style="{StaticResource middleTextBlock}"/>
@@ -485,7 +488,7 @@
                                                                             <TextBlock Text="出库操作" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
                                                                         <Grid Background="{StaticResource Border.Background}" Grid.Column="8" Grid.Row="1">
-                                                                            <TextBlock Text="包装人工" Style="{StaticResource middleTextBlock}"/>
+                                                                            <TextBlock Text="尾程费" Style="{StaticResource middleTextBlock}"/>
                                                                         </Grid>
 
                                                                         <Border Grid.RowSpan="2" Grid.ColumnSpan="11" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"/>
@@ -496,6 +499,8 @@
                                                                         <Border Width="1" HorizontalAlignment="Right" Grid.Column="4" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
                                                                         <Border Width="1" HorizontalAlignment="Right" Grid.Column="5" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
                                                                         <Border Width="1" HorizontalAlignment="Right" Grid.Column="6" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
+                                                                        <Border Width="1" HorizontalAlignment="Right" Grid.Column="6" Background="{StaticResource Border.Brush}"/>
+                                                                        
                                                                         <Border Width="1" HorizontalAlignment="Right" Grid.Column="7" Grid.Row="1" Background="{StaticResource Border.Brush}"/>
                                                                         <Border Width="1" HorizontalAlignment="Right" Grid.Column="8" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
                                                                         <Border Width="1" HorizontalAlignment="Right" Grid.Column="9" Grid.RowSpan="2" Background="{StaticResource Border.Brush}"/>
@@ -511,8 +516,8 @@
                                                                             <DataTemplate>
                                                                                 <Grid Height="25">
                                                                                     <Grid.ColumnDefinitions>
-                                                                                        <ColumnDefinition Width="120"/>
-                                                                                        <ColumnDefinition Width="60"/>
+                                                                                        <ColumnDefinition Width="119.5"/>
+                                                                                        <ColumnDefinition Width="59.5"/>
                                                                                         <ColumnDefinition Width="60"/>
                                                                                         <ColumnDefinition Width="60"/>
                                                                                         <ColumnDefinition Width="60"/>
@@ -532,14 +537,15 @@
                                                                                                    Visibility="{Binding FirstFreight,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
                                                                                     <TextBlock Text="{Binding ConsumableAmount}" Grid.Column="4" Style="{StaticResource middleTextBlock}"
                                                                                                    Visibility="{Binding ConsumableAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
-                                                                                    <TextBlock Text="{Binding DeliveryExpressFreight}" Grid.Column="5" Style="{StaticResource middleTextBlock}"
-                                                                                                   Visibility="{Binding DeliveryExpressFreight,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
+                                                                                    <TextBlock Text="{Binding PackagingLaborAmount}" Grid.Column="5" Style="{StaticResource middleTextBlock}"
+               Visibility="{Binding PackagingLaborAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
+                                                                                    
                                                                                     <TextBlock Text="{Binding InStorageAmount}" Grid.Column="6" Style="{StaticResource middleTextBlock}"
                                                                                                    Visibility="{Binding InStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
                                                                                     <TextBlock Text="{Binding OutStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}"
                                                                                                    Visibility="{Binding OutStorageAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
-                                                                                    <TextBlock Text="{Binding PackagingLaborAmount}" Grid.Column="8" Style="{StaticResource middleTextBlock}"
-                                                                                                   Visibility="{Binding PackagingLaborAmount,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
+                                                                                    <TextBlock Text="{Binding DeliveryExpressFreight}" Grid.Column="8" Style="{StaticResource middleTextBlock}"
+               Visibility="{Binding DeliveryExpressFreight,ConverterParameter=0|0.0|0.00:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
                                                                                     <TextBlock Text="{Binding TotalCost2,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
                                                                                     <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
                                                                                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>