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

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
8b88753637
commit
af421e94f4
16 changed files with 140 additions and 328 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. 12
      BBWY.Client/APIServices/PackTaskService.cs
  2. 4
      BBWY.Client/BBWYAppSettings.json
  3. 2
      BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs
  4. 28
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  5. 4
      BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
  6. 2
      BBWY.Client/Views/MainWindow.xaml
  7. 6
      BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml
  8. 7
      BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml.cs
  9. 104
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml
  10. 7
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs
  11. 264
      BBWY.Client/Views/PackTask/PrintWindow.xaml
  12. 9
      BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
  13. 6
      BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
  14. 5
      BBWY.Client/Views/PackTask/SetBarCode.xaml.cs
  15. 1
      BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
  16. 7
      BBWY.Client/Views/PackTask/SetSpuCerWindow.xaml.cs

12
BBWY.Client/APIServices/PackTaskService.cs
View File

@ -35,7 +35,7 @@ namespace BBWY.Client.APIServices
) )
{ {
return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNew2PackTaskList", new return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNewPackTaskList", new
{ {
SkuId = skuId, SkuId = skuId,
@ -59,7 +59,7 @@ namespace BBWY.Client.APIServices
) )
{ {
return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNew2PackTaskList", new return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNewPackTaskList", new
{ {
IsWorry = isWorry, IsWorry = isWorry,
DepartmentName = departmentName, DepartmentName = departmentName,
@ -95,7 +95,7 @@ namespace BBWY.Client.APIServices
{ {
HttpClientHelper helper = new HttpClientHelper(globalContext.QKApiHost); HttpClientHelper helper = new HttpClientHelper(globalContext.QKApiHost);
string url = $"{globalContext.QKApiHost}/api/PackTask/SearchProductNew?skuId={skuId}&ShopId={globalContext.User.Shop.ShopId}"; string url = $"{globalContext.QKApiHost}/api/PackTask/SearchProduct?skuId={skuId}&ShopId={globalContext.User.Shop.ShopId}";
var data = helper.Get(url); var data = helper.Get(url);
return JsonConvert.DeserializeObject<ApiResponse<ProductSkuResponse>>(data); return JsonConvert.DeserializeObject<ApiResponse<ProductSkuResponse>>(data);
@ -112,7 +112,7 @@ namespace BBWY.Client.APIServices
public ApiResponse<object> UpdateTask(CreateTaskRequest createTaskRequest) public ApiResponse<object> UpdateTask(CreateTaskRequest createTaskRequest)
{ {
return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/UpdatePackTaskNew", return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/UpdatePackTask",
createTaskRequest createTaskRequest
, null, HttpMethod.Post); , null, HttpMethod.Post);
} }
@ -132,7 +132,7 @@ namespace BBWY.Client.APIServices
public ApiResponse<object> CreateTask(CreateTaskRequest createTaskRequest) public ApiResponse<object> CreateTask(CreateTaskRequest createTaskRequest)
{ {
return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/CreatePackTaskNew", return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/CreatePackTask",
createTaskRequest createTaskRequest
, null, HttpMethod.Post); , null, HttpMethod.Post);
} }
@ -156,7 +156,7 @@ namespace BBWY.Client.APIServices
public ApiResponse<long> SaveCer(CerRequest cerRequest) public ApiResponse<long> SaveCer(CerRequest cerRequest)
{ {
return SendRequest<long>(globalContext.QKApiHost, "api/PackTask/CommitCerNew", cerRequest return SendRequest<long>(globalContext.QKApiHost, "api/PackTask/CommitCer", cerRequest
, null, HttpMethod.Post); , null, HttpMethod.Post);
} }
public ApiResponse<long> SaveSpuCer(CerRequest cerRequest) public ApiResponse<long> SaveSpuCer(CerRequest cerRequest)

4
BBWY.Client/BBWYAppSettings.json
View File

@ -4,6 +4,6 @@
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "", "JOSApiHost": "",
"1688ApiHost": "", "1688ApiHost": "",
"QKApiHost": "http://localhost:8080" //"QKApiHost": "http://localhost:8080"
//"QKApiHost": "http://qiku.qiyue666.com" "QKApiHost": "http://qiku.qiyue666.com"
} }

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

@ -48,6 +48,8 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
public BarCodeModel BarCodeModel { get; set; } public BarCodeModel BarCodeModel { get; set; }
/// <summary> /// <summary>
/// 合格证信息 /// 合格证信息
/// </summary> /// </summary>

28
BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
View File

@ -106,25 +106,9 @@ namespace BBWY.Client.ViewModels.PackTask
ExportCommand = new RelayCommand(Export); ExportCommand = new RelayCommand(Export);
SearchTaskTotal(); SearchTaskTotal();
//LoadShopList();
} }
private void LoadShopList()
{
//departmentList=new List<Department>();
//var response = shopService.GetDepartmentList();
//if (!response.Success)
// throw new Exception(response.Msg);
//departmentList = response.Data.Map<IList<Department>>();
//var shopList = new List<Shop>();
//foreach (var d in departmentList)
// shopList.AddRange(d.ShopList);
}
private void Export() private void Export()
{ {
@ -213,10 +197,7 @@ namespace BBWY.Client.ViewModels.PackTask
private void SearchTaskTotal() private void SearchTaskTotal()
{ {
if (IsBatchChecked)
{
BatchCheck();
}
PackTaskTotalList = new ObservableCollection<ShopTotal>(); PackTaskTotalList = new ObservableCollection<ShopTotal>();
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
@ -233,7 +214,10 @@ namespace BBWY.Client.ViewModels.PackTask
PackTaskTotalList.Add(shopTotal); PackTaskTotalList.Add(shopTotal);
}); });
} }
if (IsBatchChecked)
{
BatchCheck();
}
} }
IsLoading = false; IsLoading = false;

4
BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
View File

@ -20,8 +20,8 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
public class PublishTaskViewModel : BaseVM, IDenpendency public class PublishTaskViewModel : BaseVM, IDenpendency
{ {
#region 属性 #region 属性
private string searchSkuId; private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } } public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }

2
BBWY.Client/Views/MainWindow.xaml
View File

@ -26,7 +26,7 @@
<!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/> <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>--> <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/> <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10104" Margin="5,0,0,0"/> <TextBlock Text="v10106" Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

6
BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml
View File

@ -29,7 +29,9 @@
Background="{StaticResource Border.Background}"> Background="{StaticResource Border.Background}">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border> </Border>
<DockPanel Grid.Row="1">
<local:BarcodeControl Grid.Row="1" model="{Binding BarCodeModel, Mode=TwoWay}"/>
<!--<DockPanel Grid.Row="1">
<Border Name="jingjian" Visibility="{Binding LabelModel,Converter={StaticResource objConverter},ConverterParameter=精简模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1"> <Border Name="jingjian" Visibility="{Binding LabelModel,Converter={StaticResource objConverter},ConverterParameter=精简模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
@ -100,7 +102,7 @@
</StackPanel> </StackPanel>
</Border> </Border>
</DockPanel> </DockPanel>-->
</Grid> </Grid>

7
BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml.cs
View File

@ -23,10 +23,15 @@ namespace BBWY.Client.Views.PackTask
{ {
InitializeComponent(); InitializeComponent();
} }
public BarCodeModel BarCodeModel { get; set; }
public void SetData(BarCodeModel BarCodeModel) public void SetData(BarCodeModel BarCodeModel)
{ {
this.DataContext = BarCodeModel; this.BarCodeModel = BarCodeModel;
this.DataContext = this;
} }
} }
} }

104
BBWY.Client/Views/PackTask/PackTaskTotal.xaml
View File

@ -124,7 +124,9 @@
<ColumnDefinition Width="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition MinWidth="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
@ -132,26 +134,26 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsBatchChecked,Mode=TwoWay}" Command="{Binding BatchCheckedCommand}" HorizontalContentAlignment="Center" Grid.Column="0"/> <CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsBatchChecked,Mode=TwoWay}" Command="{Binding BatchCheckedCommand}" HorizontalContentAlignment="Center" Grid.Column="0"/>
<TextBlock Text="任务ID" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="任务ID" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="日期" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="日期" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="状态" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="状态" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="部门" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="所属部门" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="店铺名" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="所属店铺" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="对接人员" Grid.Column="6" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="打包数量" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="采购SKU名称" Grid.Column="7" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="箱子" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU数量" Grid.Column="8" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="气泡纸" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增值服务" Grid.Column="9" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="胶带" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包服务" Grid.Column="10" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="其他" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="耗材服务" Grid.Column="11" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="耗材总价" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="原始金额" Grid.Column="12" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="打包单价" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="促销折扣" Grid.Column="13" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="打包总价" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="结算金额" Grid.Column="14" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="原价" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="15" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="促销折扣" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="16" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="总价" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="17" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
@ -171,10 +173,11 @@
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="17" Background="{StaticResource Border.Brush}" Grid.Row="0"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="17"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="18" Background="{StaticResource Border.Brush}" Grid.Row="0"/>
<ListBox x:Name="listbox_order" <ListBox x:Name="listbox_order"
Grid.Row="1" Grid.ColumnSpan="17" Grid.Row="1" Grid.ColumnSpan="18"
ItemsSource="{Binding PackTaskTotalList}" ItemsSource="{Binding PackTaskTotalList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}" BorderBrush="{StaticResource Border.Brush}"
@ -193,7 +196,9 @@
<ColumnDefinition Width="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition MinWidth="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
@ -201,7 +206,6 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Margin="0 0 1 0"> <Grid Margin="0 0 1 0">
@ -217,7 +221,7 @@
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="2" Margin="0 0 1 0"> <Grid Grid.Column="2" Margin="0 0 1 0">
<TextBlock Text="{Binding CreateTime,StringFormat=yyyy-MM-dd}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding CreateTime,StringFormat=MM-dd}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="3" Margin="0 0 1 0"> <Grid Grid.Column="3" Margin="0 0 1 0">
@ -228,70 +232,76 @@
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center" <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding DepartmentName}" CommandParameter="{Binding DepartmentName}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0">
<c:BButton.ToolTip>
<ToolTip>
<TextBlock Text="{Binding DepartmentName}"></TextBlock>
</ToolTip>
</c:BButton.ToolTip>
</c:BButton>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="5" Margin="0 0 1 0"> <Grid Grid.Column="5" Margin="0 0 1 0">
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center" <c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding ShopName}" CommandParameter="{Binding ShopName}"
Margin=" 5,0,0,0"/> Margin=" 5,0,0,0">
<c:BButton.ToolTip>
<ToolTip>
<TextBlock Text="{Binding ShopName}"></TextBlock>
</ToolTip>
</c:BButton.ToolTip>
</c:BButton>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="6" Margin="0 0 1 0"> <Grid Grid.Column="6" Margin="0 0 1 0">
<TextBlock Text="{Binding AcceptUserName}" TextWrapping="Wrap" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SkuCount}" TextWrapping="Wrap" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="7" Margin="0 0 1 0"> <Grid Grid.Column="7" Margin="0 0 1 0">
<TextBlock Text="{Binding SkuName}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis"> <TextBlock Text="{Binding BoxConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip> </TextBlock>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuName}"/>
</ToolTip>
</TextBlock.ToolTip>
</TextBlock>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="8" Margin="0 0 1 0"> <Grid Grid.Column="8" Margin="0 0 1 0">
<TextBlock Text="{Binding SkuCount}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding AirConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="9" Margin="0 0 1 0"> <Grid Grid.Column="9" Margin="0 0 1 0">
<TextBlock Text="{Binding IncreaseFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding TapeConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="10" Margin="0 0 1 0"> <Grid Grid.Column="10" Margin="0 0 1 0">
<TextBlock Text="{Binding PackFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding OtherConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="11" Margin="0 0 1 0" > <Grid Grid.Column="11" Margin="0 0 1 0" >
<TextBlock Text="{Binding ConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding ConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="12" Margin="0 0 1 0"> <Grid Grid.Column="12" Margin="0 0 1 0" >
<TextBlock Text="{Binding Price,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding PackSingleFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="13" Margin="0 0 1 0"> <Grid Grid.Column="13" Margin="0 0 1 0" >
<TextBlock Text="{Binding Discount,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding PackAllFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="14" Margin="0 0 1 0"> <Grid Grid.Column="14" Margin="0 0 1 0">
<TextBlock Text="{Binding DiscountPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding Price,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="15" Margin="0 0 1 0"> <Grid Grid.Column="15" Margin="0 0 1 0">
<TextBlock Text="{Binding MarkMessage}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis"> <TextBlock Text="{Binding Discount,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding MarkMessage}"/>
</ToolTip>
</TextBlock.ToolTip>
</TextBlock>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="16" Margin="0 0 1 0"> <Grid Grid.Column="16" Margin="0 0 1 0">
<TextBlock Text="{Binding DiscountPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="17" Margin="0 0 1 0">
<c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent" Foreground="#02a7f0" Grid.Row="1" Content="结清" <c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent" Foreground="#02a7f0" Grid.Row="1" Content="结清"
Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
@ -303,7 +313,7 @@
</Grid> </Grid>
<Border Grid.Row="1" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> <Border Grid.Row="1" Grid.Column="18" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>

7
BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs
View File

@ -34,10 +34,10 @@ namespace BBWY.Client.Views.PackTask
} }
public ShopService shopService; public ShopService shopService;
private void Load(object sender, RoutedEventArgs e) private void Load(object sender, RoutedEventArgs e)
{ {
var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var applicationPath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var builder = new ConfigurationBuilder().SetBasePath(applicationPath).AddJsonFile("BBWYAppSettings.json", false, true); var builder = new ConfigurationBuilder().SetBasePath(applicationPath).AddJsonFile("BBWYAppSettings.json", false, true);
@ -90,10 +90,7 @@ namespace BBWY.Client.Views.PackTask
} }
} }
List<string> departments = new List<string>(); List<string> departments = new List<string>();
private void tb_TextChanged(object sender, TextChangedEventArgs e) private void tb_TextChanged(object sender, TextChangedEventArgs e)
{ {
try try

264
BBWY.Client/Views/PackTask/PrintWindow.xaml
View File

@ -7,7 +7,7 @@
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask" xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
mc:Ignorable="d" mc:Ignorable="d"
Style="{StaticResource bwstyle}" Style="{StaticResource bwstyle}"
Height="532" Width="486" Height="525" Width="486"
xmlns:hc="https://handyorg.github.io/handycontrol" xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors" xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
xmlns:ctr="clr-namespace:BBWY.Client.Converters" xmlns:ctr="clr-namespace:BBWY.Client.Converters"
@ -18,8 +18,16 @@
MinButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0" RightButtonGroupMargin="0,5,5,0"
ResizeMode="NoResize"
> >
<Window.Resources>
<ResourceDictionary >
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Window.Resources>
<!-- DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"--> <!-- DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"-->
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -32,230 +40,42 @@
<TextBlock Text="打印设置" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="打印设置" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border> </Border>
<Grid Grid.Row="1"> <StackPanel Orientation="Vertical" Grid.Row="1" Margin="0 20 0 0">
<TextBlock Margin="33,28" VerticalAlignment="Top" HorizontalAlignment="Left" Height="15" Width="43" Text="打印机:"/> <StackPanel Orientation="Horizontal">
<ComboBox x:Name="cbPrints" Margin="81,23,0,0" Width="197" Height="25" VerticalAlignment="Top" HorizontalAlignment="Left" /> <TextBlock Margin="48,0,10,0" VerticalAlignment="Center" HorizontalAlignment="Left" Height="15" Width="43" Text="打印机:"/>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Margin="41,70,0,0" Width="30" Height="15" Text="数量:"/>
<c:BTextBox x:Name="tbCount" Width="197" Margin="81,65,0,0" Height="25" VerticalAlignment="Top" HorizontalAlignment="Left"/>
<!--<DockPanel Grid.Row="2">
<local:BarcodeControl x:Name="bar" BarCodeData="{Binding BarCodeModel,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<local:CerControl x:Name="cer" CerData="{Binding CertificateModel,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</DockPanel>-->
<Grid Name="bar" Visibility="Collapsed" Grid.Row="1" >
<Border Name="jingjian" Visibility="{Binding LabelModel,Converter={StaticResource objConverter},ConverterParameter=精简模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Width="371" Margin="38,113,38,29">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BrandName}"/>
</TextBlock>
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding SkuName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,25,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding SkuId}"/>
</TextBlock>
</StackPanel>
</Border>
<Border Name="biaozhun" Visibility="{Binding LabelModel,Converter={StaticResource objConverter},ConverterParameter=标准模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Width="371" Height="240" Margin="5">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding Brand}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BrandName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="型号:"/>
<Run Text="{Binding ProductNo}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding SkuName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding SkuId}"/>
</TextBlock>
</StackPanel>
</Border>
<Border Name="wuxinghao" Visibility="{Binding LabelModel,Converter={StaticResource objConverter},ConverterParameter=无型号模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Width="371" Height="240" Margin="5">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding Brand}"/>
</TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BrandName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding SkuName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,10,10,0"/>
<TextBlock Text="POP" HorizontalAlignment="Center" Margin="10,0,10,0" FontSize="15" FontWeight="Black" >
<Run Text="{Binding SkuId}"/>
</TextBlock>
<Border BorderBrush="{StaticResource Border.Brush}" Height="30" BorderThickness="1">
<ComboBox x:Name="cbPrints" BorderThickness="0" Width="200" Height="30" VerticalAlignment="Top" HorizontalAlignment="Left" />
</StackPanel>
</Border> </Border>
</Grid> </StackPanel>
<Grid x:Name="cer" Grid.Row="1" Margin="0,110,0,0" Width="384" Height="333"> <StackPanel Orientation="Horizontal" Margin="0 10 0 10">
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Margin="60,0,0,0" Width="30" Height="15" Text="数量:"/>
<hc:TabControl Grid.Row="1" ItemsSource="{Binding GoodsNumberCerList,Mode=TwoWay}" IsAnimationEnabled="True" IsDraggable="True" IsTabFillEnabled="True" Name="tab" DockPanel.Dock="Bottom"> <c:BTextBox x:Name="tbCount" Width="203" Margin="11,0,0,0" Height="30" VerticalAlignment="Top" HorizontalAlignment="Left"/>
<hc:TabControl.Resources> </StackPanel>
<ResourceDictionary >
<ResourceDictionary.MergedDictionaries> <StackPanel Margin="0 10 0 0">
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/> <Grid Name="bar" Visibility="Collapsed" Grid.Row="1" Width="371">
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/> <local:BarcodeControl model="{Binding BarCodeModel, Mode=TwoWay}" />
</Grid>
</ResourceDictionary.MergedDictionaries> <Grid x:Name="cer" Grid.Row="1" Width="384" Height="333">
</ResourceDictionary> <hc:TabControl Grid.Row="1" ItemsSource="{Binding GoodsNumberCerList,Mode=TwoWay}" IsAnimationEnabled="True" IsDraggable="True" IsTabFillEnabled="True" Name="tab" DockPanel.Dock="Bottom">
</hc:TabControl.Resources> <TabControl.ItemTemplate>
<TabControl.ItemTemplate> <DataTemplate>
<DataTemplate> <TextBlock HorizontalAlignment="Center" Text="{Binding CertificateModel.GoodsNumber,StringFormat=配件{0}}"/>
<TextBlock HorizontalAlignment="Center" Text="{Binding CertificateModel.GoodsNumber,StringFormat=配件{0}}"/> </DataTemplate>
</DataTemplate> </TabControl.ItemTemplate>
</TabControl.ItemTemplate> <TabControl.ContentTemplate>
<TabControl.ContentTemplate> <DataTemplate>
<DataTemplate> <local:CerControl model="{Binding CertificateModel,Mode=TwoWay}"/>
<local:CerControl model="{Binding CertificateModel,Mode=TwoWay}"/> </DataTemplate>
</DataTemplate> </TabControl.ContentTemplate>
</TabControl.ContentTemplate> </hc:TabControl>
</hc:TabControl> </Grid>
</StackPanel>
<!--<Border Name="shiyongnianling" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=适用年龄:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12,0,0" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Brand}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65,0,0"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,70,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding BrandName}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,65,0,0"/>
<TextBlock Text="材质:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,112,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Shader}" Width="116" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,107,0,0"/>
<TextBlock Text="适用年龄:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="179,112,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding ApplyAge}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,107,0,0"/>
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStanderFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding ProductShop}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,241,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" TextWrapping ="Wrap" AcceptsReturn="True"
Height="44" Text="{Binding ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
<Border Name="no3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准无3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12,0,0" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Brand}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65,0,0"/>
<TextBlock Text="型号:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,70,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding ProductNo}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,65,0,0"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,112,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding BrandName}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,107,0,0"/>
<TextBlock Text="材质:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,112,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Shader}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,107,0,0"/>
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStanderFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding ProductShop}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,246,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" TextWrapping ="Wrap" AcceptsReturn="True"
Height="44" Text="{Binding ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
<Border Name="is3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准有3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid >
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding Brand}" Height="25" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,85,0,0"/>
<TextBlock Text="型号:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,90,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding ProductNo}" Height="25" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,85,0,0"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,127,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding BrandName}" Height="25" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,122,0,0"/>
<TextBlock Text="材质:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,127,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Shader}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,122,0,0"/>
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,154,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
Text="{Binding ExcuteStanderFormat}" Height="40" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,153,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding ProductShop}" Height="25" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,246,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" TextWrapping ="Wrap" AcceptsReturn="True" Text="{Binding ProductAdress}" Height="44" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
--><!--<TextBlock Text="工厂编号:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,60,0,0" />--><!--
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding FactoryNumber}" Height="25" Width="100" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="259,55,0,0"/>
<Image Source="pack://siteoforigin:,,,/Resources/Images/3c.png" Width="54" Height="42" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="282,6,0,0" />
</Grid>
</Border>
<Border Name="noxinghao" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=无型号:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12,0,0" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Brand}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65,0,0"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,70,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding BrandName}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,65,0,0"/>
<TextBlock Text="材质:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,112,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Shader}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,107,0,0"/>
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStanderFormat}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding ProductShop}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,246,0,0" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" TextWrapping ="Wrap" AcceptsReturn="True"
Height="44" Text="{Binding ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>-->
</Grid>
</Grid> </StackPanel>
<Border Grid.Row="2" Height="1" VerticalAlignment="Top" BorderBrush="{StaticResource Border.Background}" BorderThickness="1"/> <Border Grid.Row="2" Height="1" VerticalAlignment="Top" BorderBrush="{StaticResource Border.Background}" BorderThickness="1"/>
<c:BButton Background="{StaticResource Button.Background}" Grid.Row="2" Content="打印" HorizontalAlignment="Right" Width="100" VerticalAlignment="Top" Click="BButton_Click" Height="30" Margin="1" <c:BButton Background="{StaticResource Button.Background}" Grid.Row="2" Content="打印" HorizontalAlignment="Right" Width="100" VerticalAlignment="Top" Click="BButton_Click" Height="30" Margin="1"
/> />

9
BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
View File

@ -83,25 +83,21 @@ namespace BBWY.Client.Views.PackTask
// PrintData data = new PrintData(); // PrintData data = new PrintData();
if (CertificateModel != null) if (CertificateModel != null)
{ {
GoodsNumberCerList = new ObservableCollection<GoodsNumberCer>(); GoodsNumberCerList = new ObservableCollection<GoodsNumberCer>();
foreach (CertificateModel certificateModel in CertificateModel) foreach (CertificateModel certificateModel in CertificateModel)
GoodsNumberCerList.Add(new GoodsNumberCer GoodsNumberCerList.Add(new GoodsNumberCer
{ {
CertificateModel = certificateModel.Copy(), CertificateModel = certificateModel.Copy(),
}); });
this.DataContext = this;
bar.Visibility = Visibility.Collapsed; bar.Visibility = Visibility.Collapsed;
cer.Visibility = Visibility.Visible; cer.Visibility = Visibility.Visible;
} }
if (BarCodeModel != null) if (BarCodeModel != null)
{ {
this.DataContext = BarCodeModel;
cer.Visibility = Visibility.Collapsed; cer.Visibility = Visibility.Collapsed;
bar.Visibility = Visibility.Visible; bar.Visibility = Visibility.Visible;
} }
this.DataContext = this;
} }
public CertificateModel[] CertificateModel { get; set; } public CertificateModel[] CertificateModel { get; set; }
@ -136,7 +132,6 @@ namespace BBWY.Client.Views.PackTask
{ {
PrintData(printCount, printName,null,cer); PrintData(printCount, printName,null,cer);
System.Threading.Thread.Sleep(100); System.Threading.Thread.Sleep(100);
// MyPrintHelper.PrintCertificate(ref args, cer, font);
} }
} }
@ -177,7 +172,7 @@ namespace BBWY.Client.Views.PackTask
{ {
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>
{ {
new TipsWindow("打印失败").ShowDialog(); new TipsWindow($"打印失败,{ex.Message}").Show();
}); });
} }

6
BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
View File

@ -214,9 +214,9 @@
<Grid Grid.Row="1" Grid.Column="4"> <Grid Grid.Row="1" Grid.Column="4">
<Grid.Resources> <Grid.Resources>
</Grid.Resources> </Grid.Resources>
<hc:CheckComboBox BorderThickness="0" IsTextSearchEnabled="True" ItemsSource="{Binding IncreateList}" <hc:CheckComboBox BorderThickness="0" ShowSelectAllButton="False" IsTextSearchEnabled="True" ItemsSource="{Binding IncreateList}"
ShowClearButton="True" ShowClearButton="True"
MinWidth="90" MinWidth="90"
Height="25" Height="25"
@ -235,7 +235,7 @@
</hc:CheckComboBox.ItemContainerStyle> </hc:CheckComboBox.ItemContainerStyle>
</hc:CheckComboBox> </hc:CheckComboBox>
</Grid> </Grid>
<Grid Grid.Row="1" Grid.Column="5" > <Grid Grid.Row="1" Grid.Column="5" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedBarCodeList}" Text="{Binding IsNeedBarCode,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"> <ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedBarCodeList}" Text="{Binding IsNeedBarCode,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">

5
BBWY.Client/Views/PackTask/SetBarCode.xaml.cs
View File

@ -65,16 +65,13 @@ namespace BBWY.Client.Views.PackTask
}); });
if (resData == null || !resData.Success) if (resData == null || !resData.Success)
{ {
//IsSetBarCode = false;
return; return;
} }
BarCodeModel.Id = resData.Data; BarCodeModel.Id = resData.Data;
if (SaveResult != null) if (SaveResult != null)
SaveResult(BarCodeModel); SaveResult(BarCodeModel);
// IsNeedBarCode = "需要";
//IsSetBarCode = false;
// setBarCodeWindow.Close();
this.Close(); this.Close();
} }

1
BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
View File

@ -158,6 +158,7 @@ namespace BBWY.Client.Views.PackTask
cer.CertificateModel.Shader = SpuCertificateModel.Shader; cer.CertificateModel.Shader = SpuCertificateModel.Shader;
cer.CertificateModel.ProductShop = SpuCertificateModel.ProductShop; cer.CertificateModel.ProductShop = SpuCertificateModel.ProductShop;
cer.CertificateModel.ApplyAge = SpuCertificateModel.ApplyAge; cer.CertificateModel.ApplyAge = SpuCertificateModel.ApplyAge;
cer.CertificateModel.ProduceDate = SpuCertificateModel.ProduceDate;
} }

7
BBWY.Client/Views/PackTask/SetSpuCerWindow.xaml.cs
View File

@ -62,11 +62,10 @@ namespace BBWY.Client.Views.PackTask
ProductAdress = SpuCertificateModel.ProductAdress, ProductAdress = SpuCertificateModel.ProductAdress,
ProductShop = SpuCertificateModel.ProductShop, ProductShop = SpuCertificateModel.ProductShop,
Shader = SpuCertificateModel.Shader, Shader = SpuCertificateModel.Shader,
SkuId = SpuCertificateModel.SkuId, //SkuId = SpuCertificateModel.SkuId,
ApplyAge = SpuCertificateModel.ApplyAge, ApplyAge = SpuCertificateModel.ApplyAge,
ProduceDate=SpuCertificateModel.ProduceDate,
}); });
if (resData == null || !resData.Success) if (resData == null || !resData.Success)
{ {

Write Preview
Loading…
Cancel
Save