From 5838dc53e145593028edd021e10c12d14559a69f Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 4 Sep 2023 17:48:19 +0800
Subject: [PATCH] 10178

---
 BBWY.Client/BBWYAppSettings.json              |   4 +-
 BBWY.Client/GlobalContext.cs                  |   2 +-
 .../Views/SealBox/WaitSealBoxControl.xaml     | 126 +++++++++++++++++-
 .../WareWaitTransportControl.xaml             | 113 ++++++++++++----
 4 files changed, 212 insertions(+), 33 deletions(-)

diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index e1b3dcff..9622efaf 100644
--- a/BBWY.Client/BBWYAppSettings.json
+++ b/BBWY.Client/BBWYAppSettings.json
@@ -4,6 +4,6 @@
   "MDSApiHost": "http://mdsapi.qiyue666.com",
   "JOSApiHost": "",
   "1688ApiHost": "",
-  "QKApiHost": "http://localhost:8080"
-  //"QKApiHost": "http://qiku.qiyue666.com"
+  //"QKApiHost": "http://localhost:8080"
+  "QKApiHost": "http://qiku.qiyue666.com"
 }
\ No newline at end of file
diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 4a57d6a3..deb6db8c 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 = "10177";
+            ClientVersion = "10178";
         }
 
         private User user;
diff --git a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
index f9a161c5..0a061060 100644
--- a/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
+++ b/BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
@@ -91,7 +91,89 @@
                                 <ColumnDefinition MinWidth="80"/>
                                 <ColumnDefinition Width="100"/>
                             </Grid.ColumnDefinitions>
-                            <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
+
+                            <Grid  Grid.Column="0" Grid.ColumnSpan="11">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <StackPanel Orientation="Horizontal" Grid.Column="0">
+                                    <TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
+                                    <c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding SealBoxId}"
+                                    Margin=" 5,0,7,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                    <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
+                                    <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding ShopName}"
+                                    Margin=" 5,0,7,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="2">
+                                    <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
+                                    <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                   CommandParameter="{Binding WareName}"
+                                   Margin=" 5,0,7,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="3">
+                                    <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
+                                    <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding DepartmentName}"
+                                    Margin=" 5,0,0,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="4">
+                                    <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
+                                    <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserName}" Margin="5,0,0,0" />
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left"  Margin="0" Grid.Column="5"
+     Visibility="{Binding SealBoxRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+>
+                                    <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+        Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+    >
+                                        <TextBlock  Text="剩余: " />
+                                        <TextBlock  Text="{Binding SealBoxRemainTime }"/>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical" Margin="10,5" VerticalAlignment="Center"  HorizontalAlignment="Center" 
+    Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+    >
+                                        <StackPanel  Orientation="Horizontal"    
+     
+    >
+                                            <TextBlock  Foreground="Red"  Text="超时: "/>
+                                            <TextBlock  Foreground="Red"  Text="{Binding  SealBoxRemainTime}"/>
+                                        </StackPanel>
+                                    </StackPanel>
+                                    <c:BButton Margin="0 0 0 0"    Content="{Binding SealBoxPackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+       >
+                                        <b:Interaction.Triggers>
+                                            <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                    <b:InvokeCommandAction.CommandParameter>
+                                                        <MultiBinding Converter="{StaticResource mptConverter}">
+                                                            <Binding Path="SealBoxId"/>
+                                                            <Binding Path="SealBoxPackOverTimeMarkMsg"/>
+                                                        </MultiBinding>
+                                                    </b:InvokeCommandAction.CommandParameter>
+                                                </b:InvokeCommandAction>
+                                            </b:EventTrigger>
+                                        </b:Interaction.Triggers>
+                                    </c:BButton>
+
+                                </StackPanel>
+
+                            </Grid>
+                            <!--<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
 
                                 <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
                                 <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
@@ -119,7 +201,49 @@
 
                                 <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
                                 <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserName}" Margin="5,0,0,0" />
+
+                                
                             </StackPanel>
+
+                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left"  Margin="150 0 0 0" Grid.Column="4"
+     Visibility="{Binding SealBoxRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+>
+                                <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+        Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+    >
+                                    <TextBlock  Text="剩余: " />
+                                    <TextBlock  Text="{Binding SealBoxRemainTime }"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Vertical" Margin="10,5" VerticalAlignment="Center"  HorizontalAlignment="Center" 
+    Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
+    >
+                                    <StackPanel  Orientation="Horizontal"    
+     
+    >
+                                        <TextBlock  Foreground="Red"  Text="超时: "/>
+                                        <TextBlock  Foreground="Red"  Text="{Binding  SealBoxRemainTime}"/>
+                                    </StackPanel>
+                                </StackPanel>
+                                <c:BButton Margin="0 0 0 0"    Content="{Binding SealBoxPackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+       >
+                                    <b:Interaction.Triggers>
+                                        <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                            <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                <b:InvokeCommandAction.CommandParameter>
+                                                    <MultiBinding Converter="{StaticResource mptConverter}">
+                                                        <Binding Path="SealBoxId"/>
+                                                        <Binding Path="SealBoxPackOverTimeMarkMsg"/>
+                                                    </MultiBinding>
+                                                </b:InvokeCommandAction.CommandParameter>
+                                            </b:InvokeCommandAction>
+                                        </b:EventTrigger>
+                                    </b:Interaction.Triggers>
+                                </c:BButton>
+
+                            </StackPanel>-->
+
+
+
                             <c:BButton Grid.Column="0" Grid.ColumnSpan="6" Background="Transparent"  HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1"
              Command="{Binding DataContext.LoadSealBoxSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
                   CommandParameter="{Binding}"
diff --git a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
index f10bdca6..be06dfa9 100644
--- a/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
+++ b/BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
@@ -91,37 +91,92 @@
                                 <ColumnDefinition MinWidth="80"/>
                                 <ColumnDefinition Width="100"/>
                             </Grid.ColumnDefinitions>
-                            <StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
-                                <TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
-                                <c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding SealBoxId}"
-                                                                   Margin=" 5,0,7,0"/>
-                                <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
-                                <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding ShopName}"
-                                                                   Margin=" 5,0,7,0"/>
-
-
-                                <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
-                                <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding WareName}"
-                                                                   Margin=" 5,0,7,0"/>
-
-
-                                <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
-                                <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
-                                                                   CommandParameter="{Binding DepartmentName}"
-                                                                   Margin=" 5,0,0,0"/>
+                            <Grid  Grid.Column="0" Grid.ColumnSpan="11">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="100"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+
+                                <StackPanel Orientation="Horizontal" Grid.Column="0">
+                                    <TextBlock VerticalAlignment="Center" Text="封箱ID:" Margin="16,0,0,0" />
+                                    <c:BButton Content="{Binding SealBoxId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding SealBoxId}"
+                                    Margin=" 5,0,7,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="1">
+                                    <TextBlock Text="店铺:" Style="{StaticResource middleTextBlock}" Margin="10 0 0 0"/>
+                                    <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding ShopName}"
+                                    Margin=" 5,0,7,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="2">
+                                    <TextBlock VerticalAlignment="Center" Text="仓库:" Margin="16,0,0,0" />
+                                    <c:BButton Content="{Binding WareName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                   Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                   CommandParameter="{Binding WareName}"
+                                   Margin=" 5,0,7,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="3">
+                                    <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
+                                    <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
+                                    CommandParameter="{Binding DepartmentName}"
+                                    Margin=" 5,0,0,0"/>
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="4">
+                                    <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
+                                    <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
+                                </StackPanel>
+                                <StackPanel Orientation="Horizontal" Grid.Column="5">
+                                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  HorizontalAlignment="Left"  Grid.Column="4"
+Visibility="{Binding WaitTransportRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+>
+                                        <StackPanel Margin="10,5" Orientation="Horizontal"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+        Visibility="{Binding IsWaitTransportOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
+    >
+                                            <TextBlock  Text="剩余: " />
+                                            <TextBlock  Text="{Binding  WaitTransportRemainTime}"/>
+                                        </StackPanel>
+                                        <StackPanel Orientation="Vertical" Margin="10,5"  VerticalAlignment="Center"  HorizontalAlignment="Center" 
+     Visibility="{Binding IsWaitTransportOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}">
+                                            <StackPanel  Orientation="Horizontal"    
+    >
+                                                <TextBlock  Foreground="Red"  Text="超时: "/>
+                                                <TextBlock  Foreground="Red"  Text="{Binding  WaitTransportRemainTime}"/>
+                                            </StackPanel>
+                                        </StackPanel>
+                                        <c:BButton Margin="0 0 0 0"    Content="{Binding TransportOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
+       >
+                                            <b:Interaction.Triggers>
+                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
+                                                    <b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
+                                                        <b:InvokeCommandAction.CommandParameter>
+                                                            <MultiBinding Converter="{StaticResource mptConverter}">
+                                                                <Binding Path="SealBoxId"/>
+                                                                <Binding Path="TransportOverTimeMarkMsg"/>
+                                                            </MultiBinding>
+                                                        </b:InvokeCommandAction.CommandParameter>
+                                                    </b:InvokeCommandAction>
+                                                </b:EventTrigger>
+                                            </b:Interaction.Triggers>
+                                        </c:BButton>
 
-                                <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
-                                <TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
+                                    </StackPanel>
+                                    <c:BButton Grid.Column="0" Grid.ColumnSpan="6"   HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1" Background="Transparent"
+ Command="{Binding DataContext.LoadTransportSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
+      CommandParameter="{Binding}"
+/>
+                                </StackPanel>
+
+                            </Grid>
 
-                               
-                            </StackPanel>
                             <c:BButton Grid.Column="0" Grid.ColumnSpan="6"   HorizontalAlignment="Stretch"  BorderThickness="0" Panel.ZIndex="-1" Background="Transparent"
  Command="{Binding DataContext.LoadTransportSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
       CommandParameter="{Binding}"