1

BBWY.Client/APIServices/OrderService.cs

@@ -119,7 +119,8 @@ namespace BBWY.Client.APIServices
                         osku.DeliveryExpressFreight,
                         osku.FirstFreight,
                         DeductionQuantity = osku.ItemTotal,
-                        osku.OperationAmount,
+                        osku.InStorageAmount,
+                        osku.OutStorageAmount,
                         osku.PurchaseFreight,
                         osku.ProductId,
                         osku.SkuAmount,

BBWY.Client/Models/APIModel/Response/PurchaseOrder/PurchaseOrderResponse.cs

@@ -74,5 +74,10 @@ namespace BBWY.Client.Models
         /// 单件头程运费
         /// </summary>
         public decimal SingleFirstFreight { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退货入仓单价
+        /// </summary>
+        public decimal SingleRefundInStorageAmount { get; set; } = 0.00M;
     }
 }

BBWY.Client/Models/Order/ManualEditCostOrderSku.cs

@@ -34,11 +34,11 @@ namespace BBWY.Client.Models
         private decimal firstFreight;
         private string firstFreightStr;
 
-        /// <summary>
+        private decimal inStorageAmount;
-        /// 操作费
+        private string inStorageAmountStr;
-        /// </summary>
+
-        private decimal operationAmount;
+        private decimal outStorageAmount;
-        private string operationAmountStr;
+        private string outStorageAmountStr;
 
         /// <summary>
         /// 耗材费
@@ -99,7 +99,6 @@ namespace BBWY.Client.Models
         }
         public decimal PurchaseFreight { get => purchaseFreight; set { if (Set(ref purchaseFreight, value)) { CalculationCost(); } } }
         public decimal FirstFreight { get => firstFreight; set { if (Set(ref firstFreight, value)) { CalculationCost(); } } }
-        public decimal OperationAmount { get => operationAmount; set { if (Set(ref operationAmount, value)) { CalculationCost(); } } }
         public decimal ConsumableAmount { get => consumableAmount; set { if (Set(ref consumableAmount, value)) { CalculationCost(); } } }
         public decimal StorageAmount { get => storageAmount; set { if (Set(ref storageAmount, value)) { CalculationCost(); } } }
         public decimal TotalCost
@@ -115,7 +114,7 @@ namespace BBWY.Client.Models
 
         private void CalculationCost()
         {
-            TotalCost = SkuAmount + PurchaseFreight + FirstFreight + OperationAmount + ConsumableAmount + StorageAmount;
+            TotalCost = SkuAmount + PurchaseFreight + FirstFreight + InStorageAmount + OutStorageAmount + ConsumableAmount + StorageAmount;
             UnitCost = ItemTotal == 0 ? 0 : TotalCost / ItemTotal;
         }
 
@@ -176,17 +175,6 @@ namespace BBWY.Client.Models
                 }
             }
         }
-        public string OperationAmountStr
-        {
-            get => operationAmountStr; set
-            {
-                if (Set(ref operationAmountStr, value))
-                {
-                    if (decimal.TryParse(operationAmountStr, out decimal d))
-                        OperationAmount = d;
-                }
-            }
-        }
 
         public string DeliveryExpressFreightStr
         {
@@ -199,5 +187,43 @@ namespace BBWY.Client.Models
                 }
             }
         }
+
+        public decimal InStorageAmount
+        {
+            get => inStorageAmount;
+            set
+            {
+                if (Set(ref inStorageAmount, value))
+                    CalculationCost();
+            }
+        }
+        public string InStorageAmountStr
+        {
+            get => inStorageAmountStr;
+            set
+            {
+                if (Set(ref inStorageAmountStr, value))
+                    if (decimal.TryParse(inStorageAmountStr, out decimal d))
+                        InStorageAmount = d;
+            }
+        }
+        public decimal OutStorageAmount
+        {
+            get => outStorageAmount; set
+            {
+                if (Set(ref outStorageAmount, value))
+                    CalculationCost();
+            }
+        }
+        public string OutStorageAmountStr
+        {
+            get => outStorageAmountStr;
+            set
+            {
+                if (Set(ref outStorageAmountStr, value))
+                    if (decimal.TryParse(outStorageAmountStr, out decimal d))
+                        OutStorageAmount = d;
+            }
+        }
     }
 }

BBWY.Client/Models/PurchaseOrder/PurchaseOrder.cs

@@ -132,8 +132,26 @@ namespace BBWY.Client.Models
             }
         }
 
-        public decimal SingleInStorageAmount { get => singleInStorageAmount; set { Set(ref singleInStorageAmount, value); } }
+        public decimal SingleInStorageAmount
-        public decimal SingleOutStorageAmount { get => singleOutStorageAmount; set { Set(ref singleOutStorageAmount, value); } }
+        {
+            get => singleInStorageAmount;
+            set
+            {
+                if (Set(ref singleInStorageAmount, value))
+                    RefreshUnitCost();
+            }
+        }
+        public decimal SingleOutStorageAmount
+        {
+            get => singleOutStorageAmount;
+            set
+            {
+                if (Set(ref singleOutStorageAmount, value))
+                    RefreshUnitCost();
+            }
+        }
+
+        public decimal SingleRefundInStorageAmount { get => singleRefundInStorageAmount; set { Set(ref singleRefundInStorageAmount, value); } }
 
         public void RefreshUnitCost()
         {
@@ -153,5 +171,6 @@ namespace BBWY.Client.Models
         private decimal singleStorageAmount;
         private decimal singleInStorageAmount;
         private decimal singleOutStorageAmount;
+        private decimal singleRefundInStorageAmount;
     }
 }

BBWY.Client/ViewModels/Order/OrderListViewModel.cs

@@ -629,7 +629,9 @@ namespace BBWY.Client.ViewModels
                         manualEditCostOrderSku.ConsumableAmount = orderCostDetailList.Sum(ocd => ocd.ConsumableAmount);
                         manualEditCostOrderSku.DeliveryExpressFreight = orderCostDetailList.Sum(ocd => ocd.DeliveryExpressFreight);
                         manualEditCostOrderSku.FirstFreight = orderCostDetailList.Sum(ocd => ocd.FirstFreight);
-                        manualEditCostOrderSku.OperationAmount = orderCostDetailList.Sum(ocd => ocd.OperationAmount);
+                        //manualEditCostOrderSku.OperationAmount = orderCostDetailList.Sum(ocd => ocd.OperationAmount);
+                        manualEditCostOrderSku.InStorageAmount = orderCostDetailList.Sum(ocd => ocd.InStorageAmount);
+                        manualEditCostOrderSku.OutStorageAmount = orderCostDetailList.Sum(ocd => ocd.OutStorageAmount);
                         manualEditCostOrderSku.PurchaseFreight = orderCostDetailList.Sum(ocd => ocd.PurchaseFreight);
                         manualEditCostOrderSku.SkuAmount = orderCostDetailList.Sum(ocd => ocd.SkuAmount);
                         manualEditCostOrderSku.StorageAmount = orderCostDetailList.Sum(ocd => ocd.StorageAmount);
@@ -639,7 +641,9 @@ namespace BBWY.Client.ViewModels
                     manualEditCostOrderSku.ConsumableAmountStr = manualEditCostOrderSku.ConsumableAmount.ToString();
                     manualEditCostOrderSku.DeliveryExpressFreightStr = manualEditCostOrderSku.DeliveryExpressFreight.ToString();
                     manualEditCostOrderSku.FirstFreightStr = manualEditCostOrderSku.FirstFreight.ToString();
-                    manualEditCostOrderSku.OperationAmountStr = manualEditCostOrderSku.OperationAmount.ToString();
+                    //manualEditCostOrderSku.OperationAmountStr = manualEditCostOrderSku.OperationAmount.ToString();
+                    manualEditCostOrderSku.InStorageAmountStr = manualEditCostOrderSku.InStorageAmount.ToString();
+                    manualEditCostOrderSku.OutStorageAmountStr = manualEditCostOrderSku.OutStorageAmount.ToString();
                     manualEditCostOrderSku.PurchaseFreightStr = manualEditCostOrderSku.PurchaseFreight.ToString();
                     manualEditCostOrderSku.SkuAmountStr = manualEditCostOrderSku.SkuAmount.ToString();
                     manualEditCostOrderSku.StorageAmountStr = manualEditCostOrderSku.StorageAmount.ToString();

BBWY.Client/Views/Ware/WareStock.xaml

@@ -7,7 +7,7 @@
       xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
       xmlns:sys="clr-namespace:System;assembly=mscorlib"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
+      d:DesignHeight="450" d:DesignWidth="1300"
       DataContext="{Binding WareStock,Source={StaticResource Locator}}"
       xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
       xmlns:ts="clr-namespace:BBWY.Client.TemplateSelectors"
@@ -43,9 +43,11 @@
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
+                    <ColumnDefinition Width="50"/>
+                    <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="90"/>
+                    <ColumnDefinition Width="70"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Text="{Binding PurchasePlatform}" Style="{StaticResource middleTextBlock}"/>
 
@@ -53,18 +55,20 @@
                 <TextBlock Text="{Binding SingleSkuAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
                 <TextBlock Text="{Binding SingleFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
 
-                <TextBlock Text="{Binding SingleFirstFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding SingleFirstFreight}" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="{Binding SingleOperationAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding SingleInStorageAmount}" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding SingleOutStorageAmount}" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="{Binding SingleStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding SingleRefundInStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="{Binding SingleDeliveryFreight}" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding SingleStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding SingleDeliveryFreight}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
 
-                <TextBlock Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
-                <TextBlock Text="{Binding UnitCost,Mode=OneWay}" Grid.Column="11" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
+                <TextBlock Text="{Binding UnitCost,Mode=OneWay}" Grid.Column="13" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
-                <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
+                <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
 
-                <StackPanel Grid.Column="13" HorizontalAlignment="Center" Orientation="Horizontal">
+                <StackPanel Grid.Column="15" HorizontalAlignment="Center" Orientation="Horizontal">
                     <c:BButton Content="编辑" Style="{StaticResource LinkButton}"
                                Command="{Binding DataContext.EditPurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" 
                                CommandParameter="{Binding }">
@@ -87,7 +91,10 @@
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
-                <Border Height="1" Grid.ColumnSpan="14" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
+                <Border Height="1" Grid.ColumnSpan="16" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom"/>
             </Grid>
         </DataTemplate>
         <DataTemplate x:Key="purchaseOrderTemplate_edit">
@@ -105,9 +112,11 @@
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
+                    <ColumnDefinition Width="50"/>
+                    <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="60"/>
                     <ColumnDefinition Width="80"/>
-                    <ColumnDefinition Width="90"/>
+                    <ColumnDefinition Width="70"/>
                 </Grid.ColumnDefinitions>
                 <!--<c:BTextBox Text="{Binding PurchasePlatform}"/>-->
                 <ComboBox ItemsSource="{Binding Source={StaticResource platformProvider}}"
@@ -122,17 +131,19 @@
                 <c:BTextBox Text="{Binding SingleFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="3" BorderThickness="0"/>
 
                 <c:BTextBox Text="{Binding SingleFirstFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="4" BorderThickness="0"/>
-                <c:BTextBox Text="{Binding SingleOperationAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="5" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding SingleInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="5" BorderThickness="0"/>
-                <c:BTextBox Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="6" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding SingleOutStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="6" BorderThickness="0"/>
-                <c:BTextBox Text="{Binding SingleStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding SingleRefundInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/>
-                <c:BTextBox Text="{Binding SingleDeliveryFreight,Converter={StaticResource inputNumberConverter}}" Grid.Column="8" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="8" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding SingleStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="9" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding SingleDeliveryFreight,Converter={StaticResource inputNumberConverter}}" Grid.Column="10" BorderThickness="0"/>
 
-                <c:BTextBox Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="9" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" BorderThickness="0"/>
-                <c:BTextBox Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" BorderThickness="0"/>
+                <c:BTextBox Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="12" BorderThickness="0"/>
-                <TextBlock Text="{Binding UnitCost,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
+                <TextBlock Text="{Binding UnitCost,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="13" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
-                <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="12" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
+                <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="14" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
 
-                <StackPanel Grid.Column="13" HorizontalAlignment="Center" Orientation="Horizontal">
+                <StackPanel Grid.Column="15" HorizontalAlignment="Center" Orientation="Horizontal">
                     <c:BButton Content="保存" Style="{StaticResource LinkButton}"
                                Command="{Binding DataContext.SavePurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" 
                                CommandParameter="{Binding }" />
@@ -154,7 +165,9 @@
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
-                <Border Height="1" Grid.ColumnSpan="14" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
+                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
+                <Border Height="1" Grid.ColumnSpan="16" Background="{StaticResource Border.Brush}" VerticalAlignment="Bottom"/>
             </Grid>
         </DataTemplate>
     </Page.Resources>
@@ -185,7 +198,7 @@
                     Background="#F2F2F2">
                 <Grid>
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="351"/>
+                        <ColumnDefinition Width="300"/>
                         <ColumnDefinition Width="80"/>
                         <ColumnDefinition Width="80"/>
                         <ColumnDefinition Width="1*"/>
@@ -198,34 +211,42 @@
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
+                        <ColumnDefinition Width="50"/>
+                        <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="60"/>
                         <ColumnDefinition Width="80"/>
-                        <ColumnDefinition Width="90"/>
+                        <ColumnDefinition Width="70"/>
                     </Grid.ColumnDefinitions>
                     <TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="仓储平台" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="采购平台" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="采购订单号" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
                     <TextBlock Text="采购单价" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Grid.Column="5"  Style="{StaticResource middleTextBlock}">
+                    <TextBlock Grid.Column="5"  Style="{StaticResource middleTextBlock}" TextAlignment="Center">
                        <Run Text="采购运"/>
                         <LineBreak/>
                         <Run Text="单价"/>
                     </TextBlock>
                     <TextBlock Text="头程单价" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="操作单价" Grid.Column="7"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="入仓单价" Grid.Column="7"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="耗材单价" Grid.Column="8"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="出仓单价" Grid.Column="8"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="仓储单价" Grid.Column="9"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Grid.Column="9" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
-                    <TextBlock Grid.Column="10"  Style="{StaticResource middleTextBlock}">
+                        <Run Text="退货"/>
+                        <LineBreak/>
+                        <Run Text="入仓单价"/>
+                    </TextBlock>
+                    <TextBlock Text="耗材单价" Grid.Column="10"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="仓储单价" Grid.Column="11"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Grid.Column="12"  Style="{StaticResource middleTextBlock}" TextAlignment="Center">
                         <Run Text="销售运"/>
                         <LineBreak/>
                         <Run Text="单价"/>
                     </TextBlock>
-                    <TextBlock Text="库存" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="剩余库存" Grid.Column="12"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="剩余库存" Grid.Column="14"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="均摊单价" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="均摊单价" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="采购时间" Grid.Column="14"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="采购时间" Grid.Column="16"  Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="操作" Grid.Column="15"  Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="操作" Grid.Column="17" Style="{StaticResource middleTextBlock}"/>
 
 
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@@ -243,6 +264,8 @@
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/>
                 </Grid>
             </Border>
 
@@ -289,7 +312,7 @@
                                                 Width="{Binding ActualWidth,ElementName=listbox_sku}">
                                             <Grid Height="150">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="350"/>
+                                                    <ColumnDefinition Width="299"/>
                                                     <!--350-->
                                                     <ColumnDefinition Width="80"/>
                                                     <ColumnDefinition/>
@@ -377,7 +400,6 @@
                                                 </ListBox>
                                             </Grid>
                                         </Border>
-
                                     </DataTemplate>
                                 </ListBox.ItemTemplate>
                             </ListBox>

BBWY.Server.Business/PurchaseOrder/PurchaseOrderBusiness.cs

@@ -96,6 +96,7 @@ namespace BBWY.Server.Business
                                                                    .Set(po => po.SingleFirstFreight, editPurchaseOrderRequest.SingleFirstFreight)
                                                                    .Set(po => po.SingleInStorageAmount, editPurchaseOrderRequest.SingleInStorageAmount)
                                                                    .Set(po => po.SingleOutStorageAmount, editPurchaseOrderRequest.SingleOutStorageAmount)
+                                                                   .Set(po=> po.SingleRefundInStorageAmount,editPurchaseOrderRequest.SingleRefundInStorageAmount)
                                                                    .Set(po => po.SingleConsumableAmount, editPurchaseOrderRequest.SingleConsumableAmount)
                                                                    .Set(po => po.SingleStorageAmount, editPurchaseOrderRequest.SingleStorageAmount)
                                                                    .Set(po => po.SingleDeliveryFreight, editPurchaseOrderRequest.SingleDeliveryFreight)

BBWY.Server.Model/Dto/Request/PurchaseOrder/EditPurchaseOrderRequest.cs

@@ -54,5 +54,10 @@
         /// 单件出仓操作费
         /// </summary>
         public decimal SingleOutStorageAmount { get; set; } = 0.00M;
+
+        /// <summary>
+        /// 退货入仓费
+        /// </summary>
+        public decimal SingleRefundInStorageAmount { get; set; } = 0.00M;
     }
 }