同步物流单功能

This commit is contained in:
wule committed 2026-09-24 10:29:44 +08:00
1 parent 78ef8eedf3
commit ce8fb3f311
21 files changed
+952 -198

No files matched your search

@@ -973,6 +973,62 @@
Style="{StaticResource LinkButton}" />
</WrapPanel>
</wpf:TitleContent>
<wpf:TitleContent Title="同步物流:" Visibility="{Binding ItemOrder.SyncWaybillId, Converter={StaticResource HasTextVisibility}}">
<WrapPanel Orientation="Horizontal">
<!--<uc:UcWaterMarkTextBox1
Margin="-2,2"
Padding="0"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="{Binding ItemOrder.OutExpressNoBrush}"
IsReadOnly="True"
Text="{Binding ItemOrder.out_express_company}"
TextWrapping="Wrap"
WaterMark="外采物流" />-->
<!--<uc:UcWaterMarkTextBox1
Margin="-2,2"
Padding="0"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="{Binding ItemOrder.OutExpressNoBrush}"
IsReadOnly="True"
Text="-"
TextWrapping="Wrap"
WaterMark="-" />-->
<uc:UcWaterMarkTextBox1
Margin="-2,2,4,2"
Padding="0"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding ItemOrder.SyncWaybillId}"
TextWrapping="Wrap"
WaterMark="同步物流" />
<uc:UcWaterMarkTextBox1
Margin="-2,2,4,2"
Padding="0"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
IsReadOnly="True"
Text="{Binding ItemOrder.SyncWaybillPickNo}"
TextWrapping="Wrap"
WaterMark="取件码" />
<!--<Button
x:Name="btnGetSyncWaybillDetail"
Margin="4,0,0,0"
Padding="0,0,0,0"
d:Content="查看"
Click="btnGetSyncWaybillDetail_Click"
Content="{Binding LatestDirectEWaybill.StatusStr}"
Style="{StaticResource LinkButton}" />-->
</WrapPanel>
</wpf:TitleContent>
<!-- 买家退货 -->
<wpf:TitleContent Title="买家退货:" Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
@@ -1111,7 +1167,7 @@
x:Name="btnPddRefundTransitWarehouseRejectOrder"
d:Visibility="Visible"
Click="btnPddRefundTransitWarehouseRejectOrder_Click"
Content="测试退货"
Content="测试拒收"
Style="{StaticResource LinkButton}"
Visibility="Collapsed" />
</WrapPanel>
@@ -1141,6 +1197,8 @@
x:Name="txtInterceptReturnInfoStr"
Margin="0,1,0,1"
VerticalAlignment="Top"
d:Text="拦截失败原因"
d:Visibility="Visible"
Background="Transparent"
BorderThickness="1"
IsReadOnly="True"
@@ -1242,34 +1300,45 @@
</wpf:SpacingStackPanel>
<!-- 操作 -->
<wpf:SpacingStackPanel
Grid.Column="8"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Vertical"
HorizontalSpacing="1"
ItemHorizontalAlignment="Right"
ItemVerticalAlignment="Center"
Orientation="Horizontal"
VerticalSpacing="6">
<wpf:TitleContent>
<Button
x:Name="btnMapSkus"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
Click="btnMapSkus_Click"
Content="选择SKU"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding MapSkusBtnVisibility}" />
</wpf:TitleContent>
<!-- 操作按钮行(原 Row 1) -->
<wpf:TitleContent>
<WrapPanel HorizontalAlignment="Center" Orientation="Vertical">
<wpf:SpacingStackPanel
Grid.Column="8"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="6">
<wpf:TitleContent>
<Button
x:Name="btnMapSkus"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Click="btnMapSkus_Click"
Content="选择SKU"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding MapSkusBtnVisibility}" />
</wpf:TitleContent>
<wpf:TitleContent>
<Button
x:Name="btnBuyOrder"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Background="{StaticResource pageColorLightBrush}"
d:BorderBrush="{StaticResource pageColorBrush}"
@@ -1285,73 +1354,125 @@
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
</wpf:TitleContent>
<wpf:TitleContent>
<Button
x:Name="btnVoidTransitOrder"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnVoidTransitOrder_Click"
Content="作废重拍"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="Collapsed" />
</wpf:TitleContent>
<wpf:TitleContent>
<Button
x:Name="btnAbnormalOrderRebuy"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAbnormalOrderRebuy_Click"
Content="异常重拍"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="Collapsed" />
</WrapPanel>
</wpf:TitleContent>
</wpf:TitleContent>
<!-- 直发拍单 -->
<wpf:TitleContent>
<Button
x:Name="btnDirectBuyOrder"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
Click="btnDirectBuyOrder_Click"
Content="直发拍单"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnDirectBuyOrderVisibility}" />
</wpf:TitleContent>
<!-- 礼品发货 -->
<wpf:TitleContent>
<Button
x:Name="btnShipGift"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btn_ShipGiftCommand"
Content="礼品发货"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:TitleContent>
<wpf:TitleContent>
<!-- 直发拍单 -->
<wpf:TitleContent>
<Button
x:Name="btnDirectBuyOrder"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Click="btnDirectBuyOrder_Click"
Content="直发拍单"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnDirectBuyOrderVisibility}" />
</wpf:TitleContent>
<!-- 礼品发货 -->
<wpf:TitleContent>
<Button
x:Name="btnShipGift"
Height="22"
MinWidth="38"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btn_ShipGiftCommand"
Content="礼品发货"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:TitleContent>
</wpf:SpacingStackPanel>
<wpf:SpacingStackPanel
Grid.Column="8"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Orientation="Vertical"
VerticalSpacing="4">
<Button
x:Name="btnChangeWaybill"
Height="22"
MinWidth="38"
Margin="4,0,0,0"
Margin="0,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnChangeWaybill_Click"
Content="修改物流"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
</wpf:TitleContent>
<Button
x:Name="btnAddEditTransitWarehouseReject_New"
MinWidth="38"
MinHeight="22"
Margin="0,0,0,0"
Padding="0"
HorizontalAlignment="Center"
d:Visibility="Visible"
Click="btnAddEditTransitWarehouseReject_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
<TextBlock>
云仓拒收<LineBreak />
退回总店</TextBlock>
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n1"
MinWidth="38"
MinHeight="22"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
<TextBlock>
拒收失败<LineBreak />
转寄总店</TextBlock>
</Button>
<Button
x:Name="btnAddEditTransitWarehouseAfterSale_n2"
MinWidth="38"
MinHeight="22"
Margin="0,0,0,0"
Padding="0"
Click="btnAddEditTransitWarehouseAfterSale_Click"
Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
<TextBlock>
出库拦截<LineBreak />
退回仓库</TextBlock>
</Button>
</wpf:SpacingStackPanel>
</wpf:SpacingStackPanel>
</Grid>
</Grid>