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

添加业务端封箱任务创建时间显示

AddValidOverTime
506583276@qq.com 2 years ago
parent
c54c81f1f4
commit
e3fc577705
13 changed files with 92 additions and 43 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. 2
      BBWY.Client/Models/APIModel/Request/CerRequest.cs
  3. 2
      BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs
  4. 2
      BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs
  5. 2
      BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
  6. 2
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  7. 9
      BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
  8. 10
      BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
  9. 9
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs
  10. 7
      BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
  11. 9
      BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs
  12. 53
      BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml
  13. 18
      BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml

2
BBWY.Client/GlobalContext.cs
View File

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

2
BBWY.Client/Models/APIModel/Request/CerRequest.cs
View File

@ -80,5 +80,7 @@ namespace BBWY.Client.Models.APIModel.Request
public SaveType? SaveType { get; set; }
public string OrderId { get; set; }
}
}

2
BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs
View File

@ -77,5 +77,7 @@ namespace BBWY.Client.Models.SealBox
/// </summary>
public TaskState? TaskState { get; set; }
public DateTime? CreateTime { get; set; }
}
}

2
BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs
View File

@ -35,5 +35,7 @@ namespace BBWY.Client.Models
public WareType? WareType { get; set; }
public DateTime? CreateTime { get; set; }
}
}

2
BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
View File

@ -436,7 +436,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (!string.IsNullOrEmpty(BrandName))
model.CerDTO.BrandName = BrandName;
QualitySetCerWindow setCerWindow = new QualitySetCerWindow(false);
QualitySetCerWindow setCerWindow = new QualitySetCerWindow(false,OrderId);
setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType);
setCerWindow.SaveResult = (s, PackCerState) =>
{

2
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
View File

@ -606,7 +606,7 @@ namespace BBWY.Client.ViewModels
isNeedClick = model.IsSetCertificate;
}
QualitySetCerWindow setCerWindow = new QualitySetCerWindow(isNeedClick);
QualitySetCerWindow setCerWindow = new QualitySetCerWindow(isNeedClick,OrderId);
setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, saveType);
setCerWindow.SaveResult = (s, PackCerState) =>
{

9
BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
View File

@ -174,7 +174,7 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment=
</b:Interaction.Triggers>
</c:BAsyncImage>
<StackPanel Grid.Column="1" Grid.ColumnSpan="2" Orientation="Vertical" Margin="8,10,0,10">
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,10,0,10">
<StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
@ -203,6 +203,13 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment=
CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 0 0 0 ">
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="发布日期:" />
</TextBlock>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
</StackPanel>
</StackPanel>
</Grid>

10
BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
View File

@ -201,7 +201,7 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment=
</b:Interaction.Triggers>
</c:BAsyncImage>
<StackPanel Grid.Column="1" Grid.ColumnSpan="2" Orientation="Vertical" Margin="8,10,0,10">
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,10,0,10">
<StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
@ -230,8 +230,16 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment=
CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 0 0 0 ">
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="发布日期:" />
</TextBlock>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
</StackPanel>
</StackPanel>
</Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>

9
BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs
View File

@ -94,8 +94,15 @@ namespace BBWY.Client.Views.FallWare
{
if (wareType == WareType.京仓)
if (wareType == WareType.京仓)//EPL
{
if (!JDWareBoxModel.PurchaseOrder.ToUpper().StartsWith("EPL"))
{
MessageBox.Show("入库采购单号必须以EPL开头");
return;
}
JDWareBoxModel.PurchaseOrder= JDWareBoxModel.PurchaseOrder.ToUpper();
if (string.IsNullOrEmpty(JDWareBoxModel.ProductTitle) ||
string.IsNullOrEmpty(JDWareBoxModel.PrewOrder) ||
string.IsNullOrEmpty(JDWareBoxModel.PurchaseOrder))

7
BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
View File

@ -217,6 +217,13 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment=
CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Margin="0 10 0 0 ">
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="发布日期:" />
</TextBlock>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
</StackPanel>
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包装:Red:black}" Text="{Binding TaskState}"/>

9
BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs
View File

@ -45,7 +45,10 @@ namespace BBWY.Client.Views.QualityTask
public QualitySetCerWindow( bool IsQualityTask)
string orderId { get; set; }
public QualitySetCerWindow( bool IsQualityTask, string orderId)
{
InitializeComponent();
SetPackCerStateCommand = new RelayCommand<PackCerState>(SetPackCerState);
@ -58,6 +61,7 @@ namespace BBWY.Client.Views.QualityTask
IsShowProductAdress = true;
}
this.orderId = orderId;
}
private void ShowData(string obj)
@ -230,7 +234,8 @@ namespace BBWY.Client.Views.QualityTask
GoodsNumber = CertificateModel.GoodsNumber,
ProduceDate = CertificateModel.ProduceDate,
PurchaseSkuId = CertificateModel.PurchaseSkuId,
SaveType = SaveType
SaveType = SaveType,
OrderId = orderId
});
if (resData == null || !resData.Success)
{

53
BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml
View File

@ -148,21 +148,26 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18"
ItemsSource="{Binding SealBoxConfigureTasks}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="0,0,0,0"
BorderThickness="0,0,0,0" Grid.ColumnSpan="2" Grid.Column="0"
Foreground="{StaticResource Text.Color}"
>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid MinHeight="68" Width="{Binding ActualWidth,ElementName=listbox_orerSku}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="62"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<c:BAsyncImage UrlSource="{Binding Logo}"
Width="48" DecodePixelWidth="48"
VerticalAlignment="Top" Margin="14,10,0,10"
<c:BAsyncImage UrlSource="{Binding Logo}" VerticalContentAlignment="Center"
Width="70" HorizontalAlignment="Center"
Cursor="Hand">
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
@ -193,7 +198,16 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18"
</TextBlock.ToolTip>
<Run Text="SKU名称:"/>
<Run Text="{Binding SkuName}"/>
</TextBlock>
</TextBlock>
<StackPanel Orientation="Horizontal" Margin="0 13 0 0 ">
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="发布日期:" />
</TextBlock>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
</StackPanel>
</StackPanel>
@ -210,10 +224,16 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18"
<Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待排单|待包装:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>
</StackPanel>
</Grid>
<Grid MinHeight="68" Grid.Column="1" Width="{Binding ActualWidth,ElementName=listbox_skuCount}">
<Grid Grid.Column="1">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareHourseCount}"/>
</Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
@ -222,24 +242,7 @@ Foreground="{StaticResource Text.Link.Color}" FontSize="18"
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
<ListBox Grid.Column="1" Name="listbox_skuCount"
ItemsSource="{Binding SealBoxConfigureTasks}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="0,0,0,0"
Foreground="{StaticResource Text.Color}"
>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid MinHeight="68" Grid.Column="1" Width="{Binding ActualWidth,ElementName=listbox_skuCount}">
<Grid Grid.Column="1">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareHourseCount}"/>
</Grid>
<Border Grid.Row="0" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<Grid Grid.Column="2" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"

18
BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml
View File

@ -96,7 +96,7 @@
<!--{Binding Logo}-->
<c:BAsyncImage UrlSource="{Binding Logo}"
Width="80" DecodePixelWidth="80"
VerticalAlignment="Top" Margin="11,10,0,10"
VerticalAlignment="Center" Margin="11,10,0,10"
Cursor="Hand">
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
@ -111,8 +111,8 @@
</b:Interaction.Triggers>
</c:BAsyncImage>
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,15,0,10">
<StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<StackPanel Grid.Column="1" Orientation="Vertical" Margin="8,10,0,10">
<StackPanel Orientation="Horizontal" Margin="0 0 0 10">
<TextBlock Text="SKU:" Style="{StaticResource middleTextBlock}" />
<c:BButton Content="{Binding SkuId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
@ -128,20 +128,26 @@
<Run Text="SKU名称:"/>
<Run Text="{Binding SkuName}"/>
</TextBlock>
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,13,0 0">
<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="品名:"/>
<Run Text="{Binding BrandName}"/>
</TextBlock>
<StackPanel Orientation="Horizontal" Margin="0 10 0 0 ">
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="发布日期:" />
</TextBlock>
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd }" VerticalAlignment="Center" Margin="5,0,0,0"/>
</StackPanel>
</StackPanel>
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,15,0,10">
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,10,0,10">
<StackPanel Orientation="Horizontal" >
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,5">
<StackPanel Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,0">
<TextBlock Foreground="{StaticResource Text.Gray}">
<Run Text="任务ID:" />
</TextBlock>

Write Preview
Loading…
Cancel
Save