pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

库存管理调整

pjzs_starttask_update
shanji 2 years ago
parent
abbbec1e74
commit
79933ba04d
2 changed files with 172 additions and 62 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 232
      BBWY.Client/Views/Ware/WareStock.xaml

2
BBWY.Client/GlobalContext.cs
View File

@ -13,7 +13,7 @@ namespace BBWY.Client
{
ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10224";
ClientVersion = "10225";
}

232
BBWY.Client/Views/Ware/WareStock.xaml
View File

@ -41,7 +41,7 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="60"/>
@ -54,21 +54,21 @@
<TextBlock Text="{Binding PurchaseOrderId}" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<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}" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleInStorageAmount}" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleOutStorageAmount}" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SinglePackagingLaborAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleFirstFreight}" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleInStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleOutStorageAmount}" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="{Binding SingleRefundInStorageAmount}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SinglePackagingLaborAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding SingleDeliveryFreight}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<!--<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 SingleDeliveryFreight}" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding UnitCost,Mode=OneWay}" Grid.Column="10" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
<TextBlock Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<StackPanel Grid.Column="13" HorizontalAlignment="Center" Orientation="Horizontal">
<StackPanel Grid.Column="14" HorizontalAlignment="Center" Orientation="Horizontal">
<c:BButton Content="编辑" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.EditPurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }">
@ -92,6 +92,7 @@
<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 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>
@ -108,7 +109,7 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="60"/>
@ -127,21 +128,23 @@
<c:BTextBox Text="{Binding SingleSkuAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}"
Grid.Column="2" BorderThickness="0"/>
<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 SingleInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="5" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleOutStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="6" BorderThickness="0"/>
<c:BTextBox Text="{Binding SinglePackagingLaborAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="4" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="5" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleFirstFreight,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="6" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleOutStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="8" BorderThickness="0"/>
<!--<c:BTextBox Text="{Binding SingleRefundInStorageAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/>-->
<c:BTextBox Text="{Binding SingleConsumableAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="7" BorderThickness="0"/>
<c:BTextBox Text="{Binding SinglePackagingLaborAmount,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged,Converter={StaticResource inputNumberConverter}}" Grid.Column="8" BorderThickness="0"/>
<c:BTextBox Text="{Binding SingleDeliveryFreight,Converter={StaticResource inputNumberConverter}}" Grid.Column="9" BorderThickness="0"/>
<TextBlock Text="{Binding UnitCost,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
<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="12" BorderThickness="0"/>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Grid.Column="13" Style="{StaticResource middleTextBlock}" Foreground="Gray"/>
<c:BTextBox Text="{Binding PurchaseQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" BorderThickness="0"/>
<c:BTextBox Text="{Binding RemainingQuantity,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Column="11" BorderThickness="0"/>
<!--<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"/>
<StackPanel Grid.Column="13" HorizontalAlignment="Center" Orientation="Horizontal">
<StackPanel Grid.Column="14" HorizontalAlignment="Center" Orientation="Horizontal">
<c:BButton Content="保存" Style="{StaticResource LinkButton}"
Command="{Binding DataContext.SavePurchaseOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
CommandParameter="{Binding }" />
@ -211,7 +214,7 @@
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="60"/>
<!--<ColumnDefinition Width="60"/>-->
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="70"/>
</Grid.ColumnDefinitions>
@ -219,52 +222,158 @@
<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}" TextAlignment="Center">
<Run Text="采购运"/>
<LineBreak/>
<Run Text="单价"/>
</TextBlock>
<TextBlock Grid.Column="6" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="入仓头程"/>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="4">
<TextBlock Style="{StaticResource middleTextBlock}">
<Run Text="采购"/>
<LineBreak/>
<Run Text="单价"/>
</TextBlock>
<TextBlock Grid.Column="7" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="入库"/>
<LineBreak/>
<Run Text="操作费"/>
</TextBlock>
<TextBlock Grid.Column="8" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="根据采购时所支付的货款金额除以件数填写单价"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="5">
<TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="采购运"/>
<LineBreak/>
<Run Text="单价"/>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="厂家发至齐越的总物流费（包含货拉拉费用）除以件数，厂家包邮的填0"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="6">
<TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="包装人"/>
<LineBreak/>
<Run Text="工单价"/>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="根据齐库账单填写人工费用单价"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="7">
<TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="包装耗"/>
<LineBreak/>
<Run Text="材单价"/>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="根据齐库账单填写耗材费用单价，自采购耗材的根据采购费用填写。"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="8">
<TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="入仓头"/>
<LineBreak/>
<Run Text="程单价"/>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="齐越发至京东仓或云仓的费用;厂家发至京东仓的费用，结合产品重量、合同版本填写对应费用"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="9">
<TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="入库"/>
<LineBreak/>
<Run Text="操作费"/>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="结合产品重量填写对应入库操作费"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="10">
<TextBlock Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="出库"/>
<LineBreak/>
<Run Text="操作费"/>
</TextBlock>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="结合产品重量填写对应出库操作费"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<!--<TextBlock Grid.Column="9" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="退货"/>
<LineBreak/>
<Run Text="入仓单价"/>
</TextBlock>-->
<TextBlock Grid.Column="9" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="包装耗材"/>
<LineBreak/>
<Run Text="单价"/>
</TextBlock>
<TextBlock Grid.Column="10" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="包装人工"/>
<LineBreak/>
<Run Text="单价"/>
</TextBlock>
<TextBlock Grid.Column="11" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="尾程"/>
<LineBreak/>
<Run Text="快递费"/>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Grid.Column="11">
<TextBlock Grid.Column="11" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="尾程"/>
<LineBreak/>
<Run Text="快递费"/>
</TextBlock>
<Path Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}" ToolTipService.InitialShowDelay="0">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="结合产品重量以及所签合同版本填写对应快递费，入单仓的以跨区费用为准，入多仓的以同区费用为准"/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<TextBlock Grid.Column="12" Style="{StaticResource middleTextBlock}" TextAlignment="Center">
<Run Text="单件"/>
<LineBreak/>
<Run Text="总成本"/>
</TextBlock>
<TextBlock Text="库存" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="剩余库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="库存" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="剩余库存" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="均摊单价" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="采购时间" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="采购时间" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@ -282,6 +391,7 @@
<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"/>
</Grid>
</Border>

Write Preview
Loading…
Cancel
Save