Browse Source

Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

AddValidOverTime
shanji 2 years ago
parent
commit
990ae7e5b8
  1. 2
      BBWY.Client/GlobalContext.cs
  2. 4
      BBWY.Client/Models/APIModel/Request/CerRequest.cs
  3. 3
      BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs
  4. 13
      BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs
  5. 8
      BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs
  6. 2
      BBWY.Client/Models/SealBox/SealBoxWaitConfigureModel.cs
  7. 79
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  8. 2
      BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
  9. 2
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  10. 41
      BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml
  11. 78
      BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml
  12. 9
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs
  13. 2
      BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
  14. 26
      BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
  15. 14
      BBWY.Client/Views/PackTask/WareHouseList.xaml
  16. 9
      BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs
  17. 99
      BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml
  18. 18
      BBWY.Client/Views/SealBox/SealBoxWaitConfigureControl.xaml
  19. 2
      BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml

2
BBWY.Client/GlobalContext.cs

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

4
BBWY.Client/Models/APIModel/Request/CerRequest.cs

@ -79,6 +79,8 @@ namespace BBWY.Client.Models.APIModel.Request
public string PurchaseSkuId { get; set; }
public SaveType? SaveType { get; set; }
public string OrderId { get; set; }
}
}

3
BBWY.Client/Models/APIModel/Response/SealBox/GetWareWaitCompletedResponse.cs

@ -16,6 +16,9 @@ namespace BBWY.Client.Models.APIModel
public class WareWaitCompleted:NotifyObject
{
private bool isHideSkuList = true;//默认隐藏
public bool IsHideSkuList { get => isHideSkuList; set { Set(ref isHideSkuList, value); } }
public long SealBoxId { get; set; }
/// <summary>
/// 店铺Id

13
BBWY.Client/Models/FallWare/FallWareConfiguredModel.cs

@ -5,10 +5,13 @@ using System.Text;
namespace BBWY.Client.Models.FallWare
{
public class FallWareConfiguredModel:NotifyObject
{ /// <summary>
/// 商品名称
/// </summary>
public class FallWareConfiguredModel : NotifyObject
{
private bool isHideSkuList = true;//默认隐藏
public bool IsHideSkuList { get => isHideSkuList; set { Set(ref isHideSkuList, value); } }
/// <summary>
/// 商品名称
/// </summary>
public string ProductTitle { get; set; }
/// <summary>
/// 采购单号
@ -59,7 +62,7 @@ namespace BBWY.Client.Models.FallWare
private string setPurchaseOrderOverTimeMarkMsg;
public string SetPurchaseOrderOverTimeMarkMsg { get => setPurchaseOrderOverTimeMarkMsg; set { Set(ref setPurchaseOrderOverTimeMarkMsg, value); } }
private string fallWareRemainTime;
public string FallWareRemainTime { get => fallWareRemainTime; set { Set(ref fallWareRemainTime, value); } }

8
BBWY.Client/Models/SealBox/SealBoxConfiguredModel.cs

@ -3,12 +3,18 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Text;
using System.Windows;
namespace BBWY.Client.Models.SealBox
{
public class SealBoxConfiguredModel:NotifyObject
{
private bool isHideSealbox = true;//默认隐藏
public bool IsHideSealbox { get => isHideSealbox; set { Set(ref isHideSealbox, value); } }
private string sealBoxRemainTime;
public string SealBoxRemainTime { get => sealBoxRemainTime; set { Set(ref sealBoxRemainTime, value); } }
@ -71,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

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

79
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@ -290,8 +290,77 @@ namespace BBWY.Client.ViewModels.PackTask
SubmitOverTimeMarkMsgCommand = new RelayCommand<object>(SubmitOverTimeMarkMsg);
AddSealBoxProductCommand = new RelayCommand(AddSealBoxProduct);
LoadSealBoxSkuDataCommand = new RelayCommand<object>(LoadSealBoxSkuData);
this.productService = productService;
}
public void LoadSealBoxSkuData(object obj)
{
switch (TaskState.Value)
{
case Models.TaskState.:
{
if (obj is SealBoxConfiguredModel)
{
var data = obj as SealBoxConfiguredModel;
data.IsHideSealbox = !data.IsHideSealbox;
}
}
break;
case Models.TaskState.:
{
if (obj is WareWaitCompleted)
{
var data = obj as WareWaitCompleted;
data.IsHideSkuList = !data.IsHideSkuList;
}
}
break;
case Models.TaskState.:
break;
case Models.TaskState.:
break;
case Models.TaskState.:
{
if (SealBoxConfigureType== SealBoxConfigureType.)
{
if (obj is FallWareConfiguredModel)
{
var data = obj as FallWareConfiguredModel;
data.IsHideSkuList = !data.IsHideSkuList;
}
}
else
{
if (obj is FallWareConfiguredModel)
{
var data = obj as FallWareConfiguredModel;
data.IsHideSkuList = !data.IsHideSkuList;
}
}
}
break;
case Models.TaskState.:
break;
case Models.TaskState.:
break;
case Models.TaskState.:
break;
case Models.TaskState.:
break;
}
}
ProductService productService;
private void AddSealBoxProduct()
{
@ -448,6 +517,10 @@ namespace BBWY.Client.ViewModels.PackTask
#region 事件绑定
public ICommand LoadSealBoxSkuDataCommand { get; set; }
/// <summary>
/// 添加封箱商品
/// </summary>
@ -1075,7 +1148,7 @@ namespace BBWY.Client.ViewModels.PackTask
Task.Factory.StartNew(() =>
{
StoreGetSelfDataList = new ObservableCollection<StoreGetSelfData>();
var datas = packTaskService.SearchStoreGetSelfList(SearchTaskId, SearchOrderSn, SearchSpuId, SearchSkuId, null, null, PageIndex, PageSize, globalContext.User.Shop.ShopId.ToString());
var datas = packTaskService.SearchStoreGetSelfList(SearchTaskId, SearchOrderSn, SearchSpuId, SearchSkuId, null, null, PageIndex, PageSize, globalContext.User.Shop.ShopId.ToString());
if (datas != null && datas.Data != null && datas.Success)
{
var dataModel = datas.Data;
@ -1088,7 +1161,7 @@ namespace BBWY.Client.ViewModels.PackTask
}));
}
}
else
{
@ -1096,7 +1169,7 @@ namespace BBWY.Client.ViewModels.PackTask
{
MessageBox.Show(datas?.Msg);
}));
}
IsLoading = false;
});

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

@ -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

@ -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) =>
{

41
BBWY.Client/Views/FallWare/FallWareConfiguredControl.xaml

@ -78,10 +78,10 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="68">
>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition MinHeight="68"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions>
@ -108,11 +108,31 @@
<Grid Grid.Column="1">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
</Grid>
<!--<Grid Grid.Column="2">
<c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
</Grid>-->
<Grid Grid.Column="2">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PurchaseOrder}"/>
</Grid>
<Grid Grid.Column="3">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PrewOrder}"/>
</Grid>
<Grid Grid.Column="4">
<c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
</Grid>
<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}"
/>
<Grid Grid.Column="5" Panel.ZIndex="-2">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}" FontWeight="Bold"
Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment="Right" Margin="0 0 20 0"
/>
</Grid>
</Grid>
<Grid Grid.Row="1">
<Grid Grid.Row="1" Visibility="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="100"/>
@ -154,7 +174,7 @@
</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"
@ -183,6 +203,13 @@
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>

78
BBWY.Client/Views/FallWare/FallWareWaitConfigureControl.xaml

@ -37,7 +37,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="260"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="80"/>
</Grid.ColumnDefinitions>
@ -76,16 +76,16 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="68">
>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition MinHeight="68"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="260"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="80"/>
</Grid.ColumnDefinitions>
@ -103,18 +103,68 @@
CommandParameter="{Binding SealBoxId}"
Margin=" 5,0,7,0"/>
</StackPanel>
<Grid Grid.Column="1">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
</Grid>
<!--<Grid Grid.Column="2">
<c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
</Grid>-->
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2" Orientation="Horizontal"
Visibility="{Binding FallWareRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding FallWareRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Vertical" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
>
<StackPanel Orientation="Horizontal" >
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding FallWareRemainTime}"/>
</StackPanel>
</StackPanel>
<c:BButton Margin="0 0 0 0" Content="{Binding SetPurchaseOrderOverTimeMarkMsg ,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="SetPurchaseOrderOverTimeMarkMsg"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</StackPanel>
<Grid Grid.Column="3">
<c:BButton Style="{StaticResource LinkButton}" Content="设置" Command="{Binding DataContext.SetFallWareConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
</Grid>
<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}"
/>
<Grid Grid.Column="4" Panel.ZIndex="-2">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}" FontWeight="Bold"
Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment="Right" Margin="0 0 20 0"
/>
</Grid>
</Grid>
<Grid Grid.Row="1">
<Grid Grid.Row="1" Visibility="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="260"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="80"/>
</Grid.ColumnDefinitions>
@ -151,7 +201,7 @@
</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"
@ -180,7 +230,15 @@
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>

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

@ -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))

2
BBWY.Client/Views/FallWare/WareFallWareListControl.xaml

@ -121,7 +121,7 @@
</Grid>
<StackPanel Orientation="Horizontal" Grid.Row="1">
<RadioButton Content="已配置" Height="35" Width="130" Tag="{Binding FallWareConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
<RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待贴单:待封箱}" Height="35" Width="130" Tag="{Binding FallWareConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.已配置}"
/>
<RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待同步采购单:待配置}" Height="35" Width="130" Tag="{Binding FallWareWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"

26
BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml

@ -77,10 +77,10 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="100">
>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition MinHeight="90"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions>
@ -111,18 +111,27 @@
Margin=" 5,0,7,0"/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,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"/>
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />-->
</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}"
/>
<Grid Grid.Column="5" Panel.ZIndex="-2">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}" FontWeight="Bold"
Foreground="{StaticResource Text.Link.Color}" FontSize="18" HorizontalAlignment="Right" Margin="0 0 20 0"
/>
</Grid>
</Grid>
<Grid Grid.Row="1">
<Grid Grid.Row="1" Visibility="{Binding IsHideSkuList,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/>
@ -208,6 +217,13 @@
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}"/>

14
BBWY.Client/Views/PackTask/WareHouseList.xaml

@ -20,7 +20,7 @@
Title="TaskList">
<Page.Resources>
<Style TargetType="RadioButton">
<Setter Property="IsChecked" Value="False" />
<Setter Property="Background" Value="#8080FF" />
<Setter Property="Foreground" Value="Black" />
@ -44,7 +44,7 @@
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Tag}" Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
</StackPanel>
@ -78,7 +78,7 @@
<RowDefinition Height="30"/>
<!---->
</Grid.RowDefinitions>
<StackPanel Grid.RowSpan="1" HorizontalAlignment="Left" Orientation="Horizontal">
<RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" Content="全部" Command="{Binding SetTaskStateCommand}"
@ -111,14 +111,14 @@
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待转运}" Content="待转运" Tag="{Binding WaitTransportCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待转运}" Content="待转运" Tag="{Binding WaitTransportCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:True:False}"
/>
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待完结" Tag="{Binding WaitOutbound,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:True:False}"
/>

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

@ -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)
{

99
BBWY.Client/Views/SealBox/SealBoxConfiguredControl.xaml

@ -76,10 +76,10 @@
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="68">
>
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition MinHeight="68"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid Background="#F2F2F2" >
<Grid.ColumnDefinitions>
@ -104,11 +104,39 @@
<Grid Grid.Column="1">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding SealBoxTotalCount}"/>
</Grid>
<!--<Grid Grid.Column="2">
<c:BButton Style="{StaticResource LinkButton}" Content="修改"/>
</Grid>-->
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2"
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 Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsSealBoxOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding SealBoxRemainTime}"/>
</StackPanel>
</StackPanel>
<Grid Grid.Column="3">
<c:BButton Style="{StaticResource LinkButton}" Content="修改" Command="{Binding DataContext.UpdateSealBoxConfiguredCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type UserControl}}}" CommandParameter="{Binding}"/>
</Grid>
<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}"
/>
<Grid Grid.Column="4" Panel.ZIndex="-2">
<TextBlock Style="{StaticResource middleTextBlock}" HorizontalAlignment="Right" Margin="0 0 20 0" Text="{Binding IsHideSealbox,Converter={StaticResource objConverter},ConverterParameter=true:∧:∨}" FontWeight="Bold"
Foreground="{StaticResource Text.Link.Color}" FontSize="18"
/>
</Grid>
</Grid>
<Grid Grid.Row="1">
<Grid Grid.Row="1" Visibility="{Binding IsHideSealbox,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="100"/>
@ -120,21 +148,26 @@
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">
@ -165,11 +198,20 @@
</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>
<StackPanel Orientation="Vertical" Grid.Column="2" Margin="20,10,0,10">
<StackPanel Orientation="Horizontal" Margin="0 0 0 13">
<TextBlock Text="任务ID:" Style="{StaticResource middleTextBlock}" />
@ -182,36 +224,25 @@
<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>
</ListBox.ItemTemplate>
</ListBox>
<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"
@ -237,7 +268,7 @@
</Grid>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="0"/>
<Grid Grid.Column="4" >
</Grid>

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

@ -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>

2
BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml

@ -66,7 +66,7 @@
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal">
<RadioButton Content="已配置" Height="35" Width="130" Tag="{Binding SealBoxConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
<RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待贴单:待封箱}" Height="35" Width="130" Tag="{Binding SealBoxConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.已配置}"
/>
<RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待同步采购单:待配置}" Height="35" Width="130" Tag="{Binding SealBoxWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"

Loading…
Cancel
Save