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

10173 添加封箱任务发布时间

AddValidOverTime
506583276@qq.com 2 years ago
parent
f9ed63b3f0
commit
6eb7911eea
10 changed files with 49 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 2
      BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs
  3. 2
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs
  4. 2
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
  5. 2
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
  6. 8
      BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
  7. 16
      BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
  8. 8
      BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
  9. 7
      BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
  10. 14
      BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml

2
BBWY.Client/GlobalContext.cs
View File

@ -13,7 +13,7 @@ namespace BBWY.Client
{ {
ShopServiceGroupList = new List<string>(); ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>(); ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10172"; ClientVersion = "10173";
} }
private User user; private User user;

2
BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitSealBoxResponse.cs
View File

@ -67,7 +67,7 @@ namespace BBWY.Client.Models.APIModel
public class SealBoxSku public class SealBoxSku
{ {
public DateTime? CreateTime { get; set; }
/// <summary> /// <summary>
/// 任务Id /// 任务Id
/// </summary> /// </summary>

2
BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxResponse.cs
View File

@ -67,6 +67,8 @@ namespace BBWY.Client.Models.APIModel
public class WareSealBoxSku public class WareSealBoxSku
{ {
public DateTime? CreateTime { get; set; }
public TaskState TaskState { get; set; } public TaskState TaskState { get; set; }
/// <summary> /// <summary>
/// 任务Id /// 任务Id

2
BBWY.Client/Models/APIModel/Response/SealBox/GetWareSealBoxWaitConfigureResponse.cs
View File

@ -52,6 +52,8 @@ namespace BBWY.Client.Models.APIModel
public class WareNoSealBoxSku public class WareNoSealBoxSku
{ {
public DateTime? CreateTime { get; set; }
/// <summary> /// <summary>
/// 任务Id /// 任务Id
/// </summary> /// </summary>

2
BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitTransportResponse.cs
View File

@ -73,7 +73,7 @@ namespace BBWY.Client.Models.APIModel
} }
public class WaitTransportSku public class WaitTransportSku
{ {
public DateTime? CreateTime { get; set; }
///// <summary> ///// <summary>
///// 任务状态 ///// 任务状态
///// </summary> ///// </summary>

8
BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
View File

@ -203,12 +203,14 @@
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10"> <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="发布日期:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
<!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>-->
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5"> <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">

16
BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
View File

@ -254,7 +254,21 @@
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel>--> </StackPanel>-->
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5">
<StackPanel Orientation="Horizontal" >
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="发布日期:" />
</TextBlock>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
<!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/>-->
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,10,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="任务ID:" /> <Run Text="任务ID:" />
</TextBlock> </TextBlock>

8
BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
View File

@ -193,12 +193,14 @@
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10"> <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="发布日期:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
<!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>-->
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5"> <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">

7
BBWY.Client/Views/SealBox/WaitSealBoxControl.xaml
View File

@ -210,12 +210,13 @@
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10"> <StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
<StackPanel Orientation="Horizontal" > <StackPanel Orientation="Horizontal" >
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="货号:" /> <Run Text="发布日期:" />
</TextBlock> </TextBlock>
<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top" <TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
<!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>-->
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5"> <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,13,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">

14
BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml
View File

@ -210,7 +210,19 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18"
CommandParameter="{Binding ProductNo}" CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0"/>
</StackPanel>--> </StackPanel>-->
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5">
<StackPanel Orientation="Horizontal" >
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="发布日期:" />
</TextBlock>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
<!--<c:BButton Content="{Binding ProductNo}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Top"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
CommandParameter="{Binding ProductNo}"
Margin=" 5,0,0,0"/>-->
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,11,0,5">
<TextBlock Foreground="{StaticResource Text.Gray}"> <TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="任务ID:" /> <Run Text="任务ID:" />
</TextBlock> </TextBlock>

Write Preview
Loading…
Cancel
Save