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
3e9a073486
commit
0e105913ff
7 changed files with 130 additions and 44 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. 22
      BBWY.Client/Extensions/StringExtensions.cs
  2. 2
      BBWY.Client/GlobalContext.cs
  3. 21
      BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml
  4. 32
      BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs
  5. 40
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml
  6. 37
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs
  7. 20
      BBWY.Client/Views/FallWare/SetJDWareBoxWindow2.xaml.cs

22
BBWY.Client/Extensions/StringExtensions.cs
View File

@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Text;
using System.Text.RegularExpressions;
namespace BBWY.Client.Extensions
{
public static class StringExtensions
{
public static bool IsSpecialChar(this string str)
{
Regex regExp = new Regex("[ \\[ \\] \\^ \\-_*×――(^)$%~!＠@＃#$…&%￥—+=<>《》!！??？:：•`·、。，；,.;/\'\"{}（）‘’“”-]");
if (regExp.IsMatch(str))
{
return true;
}
return false;
}
}
}

2
BBWY.Client/GlobalContext.cs
View File

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

21
BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml
View File

@ -17,7 +17,7 @@
MinButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0" RightButtonGroupMargin="0,5,5,0"
Width="450" Height="380" Height="535" Width="272"
> >
<!--CloseButtonColor="{StaticResource WindowButtonColor}" --> <!--CloseButtonColor="{StaticResource WindowButtonColor}" -->
@ -32,7 +32,7 @@
Background="{StaticResource Border.Background}"> Background="{StaticResource Border.Background}">
<TextBlock Text="{Binding WareType,Converter={StaticResource objConverter},ConverterParameter=云仓:云仓箱唛:聚水潭箱唛}" FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/> <TextBlock Text="{Binding WareType,Converter={StaticResource objConverter},ConverterParameter=云仓:云仓箱唛:聚水潭箱唛}" FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/>
</Border> </Border>
<Grid Grid.Row="1" Name="jd_box"> <Grid Grid.Row="1" Name="jd_box" Height ="472" Width="266">
<Grid Name="box_margin" > <Grid Name="box_margin" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
@ -41,7 +41,7 @@
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -56,7 +56,8 @@
<Border Height="1" Background="Black" Grid.Row="6" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/> <Border Height="1" Background="Black" Grid.Row="6" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
<Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Left" Grid.RowSpan="7"/> <Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Left" Grid.RowSpan="7"/>
<Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Right" Grid.RowSpan="7"/> <Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Right" Grid.RowSpan="1"/>
<Border Width="1" Background="Black" Grid.Column="0" Grid.Row="2" HorizontalAlignment="Right" Grid.RowSpan="2"/>
<Border Width="1" Background="Black" Grid.Column="3" HorizontalAlignment="Right" Grid.RowSpan="7"/> <Border Width="1" Background="Black" Grid.Column="3" HorizontalAlignment="Right" Grid.RowSpan="7"/>
<Border Width="1" Background="Black" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/> <Border Width="1" Background="Black" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/>
@ -65,12 +66,14 @@
<TextBlock Style="{StaticResource middleTextBlock}" Text="店铺名称"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="店铺名称"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.ShopName}" Grid.Column="1" Grid.ColumnSpan="3"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareType,Converter={StaticResource taskStateToBoolean},ConverterParameter=云仓:CLPS采购单号:采购单号}" Grid.Row="1"/> <StackPanel Orientation="Vertical" Grid.Row="1" Grid.ColumnSpan="4" VerticalAlignment="Center">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding WareType,Converter={StaticResource taskStateToBoolean},ConverterParameter=云仓:CLPS采购单号:采购单号}" Grid.Row="1"/>
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Margin="2"> <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Margin="2">
<Image Stretch="Fill" Source="{Binding PurchaseOrderImage}"/> <Image Height="40" Source="{Binding PurchaseOrderImage}"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.PurchaseOrder ,Mode=TwoWay}" /> <TextBlock Margin="0 5 0 0" Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.PurchaseOrder ,Mode=TwoWay}" />
</StackPanel>
</StackPanel> </StackPanel>
<TextBlock Style="{StaticResource middleTextBlock}" Text="目的城市-仓库" Grid.Row="2"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="目的城市-仓库" Grid.Row="2"/>

32
BBWY.Client/Views/FallWare/SetCloudWareBoxWindow.xaml.cs
View File

@ -19,6 +19,7 @@ using System.Printing;
using System.Reflection; using System.Reflection;
using System.IO; using System.IO;
using System.Threading; using System.Threading;
using System.Drawing.Printing;
namespace BBWY.Client.Views.FallWare namespace BBWY.Client.Views.FallWare
{ {
@ -63,17 +64,32 @@ namespace BBWY.Client.Views.FallWare
} }
MyPrintHelper.SetDefaultPrint(printName);//设置默认打印机 MyPrintHelper.SetDefaultPrint(printName);//设置默认打印机
PrintDialog printDialog = new PrintDialog(); PrintDialog printDialog = new PrintDialog();
printDialog.PrintTicket.PageOrientation = PageOrientation.Landscape;//设置为横向打印 PageOrientation.Landscape Portrait为纵向 printDialog.PrintTicket.PageOrientation = PageOrientation.Portrait;//设置为横向打印 PageOrientation.Landscape Portrait为纵向
var pageWidth = (int)Math.Ceiling(printDialog.PrintableAreaWidth); PrintDocument document = new PrintDocument();
var pageHeight = (int)Math.Ceiling(printDialog.PrintableAreaHeight); document.PrinterSettings.PrinterName = printName;
var pageWidth = document.DefaultPageSettings.Bounds.Size.Width;
var pageHeight = document.DefaultPageSettings.Bounds.Size.Height;
//设置纸张大小
//var pageWidth = (int)Math.Ceiling(printDialog.PrintableAreaWidth);
//var pageHeight = (int)Math.Ceiling(printDialog.PrintableAreaHeight);
printDialog.PrintTicket.PageMediaSize = new PageMediaSize(pageWidth, pageHeight); printDialog.PrintTicket.PageMediaSize = new PageMediaSize(pageWidth, pageHeight);
var printAreaWidth = (int)Math.Ceiling(printDialog.PrintableAreaWidth);//打印区宽度
var printAreaHeight = (int)Math.Ceiling(printDialog.PrintableAreaHeight);//打印区高度
this.Height = pageHeight + 39;//492
this.Width = pageWidth;//227
this.Height = pageHeight + 39; // this.FontSize = 30;
this.Width = pageWidth; box_margin.Margin = new Thickness(2);
this.FontSize = 30; //this.jd_box.Arrange(new Rect(new Point(0, 0), new Size(pageWidth, pageHeight)));
box_margin.Margin = new Thickness(50, 50, 50, 50);
this.jd_box.Arrange(new Rect(new Point(0, 0), new Size(pageWidth, pageHeight)));
for (int i = 1; i <= JDWareBoxModel.BoxCount; i++) for (int i = 1; i <= JDWareBoxModel.BoxCount; i++)
{ {
this.Dispatcher.Invoke(() => { this.Dispatcher.Invoke(() => {

40
BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml
View File

@ -16,7 +16,7 @@
CloseButtonColor="{StaticResource WindowButtonColor}" CloseButtonColor="{StaticResource WindowButtonColor}"
MinButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"
Width="480" Height="480" Height="535" Width="272"
RightButtonGroupMargin="0,5,5,0"> RightButtonGroupMargin="0,5,5,0">
<!--CloseButtonColor="{StaticResource WindowButtonColor}" --> <!--CloseButtonColor="{StaticResource WindowButtonColor}" -->
<c:BWindow.Resources> <c:BWindow.Resources>
@ -42,19 +42,19 @@
Background="{StaticResource Border.Background}"> Background="{StaticResource Border.Background}">
<TextBlock Text="京仓箱唛" FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/> <TextBlock Text="京仓箱唛" FontSize="16" HorizontalAlignment="Left" Margin="10 0 0 0" VerticalAlignment="Center"/>
</Border> </Border>
<Grid Grid.Row="1" Name="jd_box" > <Grid Grid.Row="1" Name="jd_box" Height ="472" Width="266">
<Grid Name="box_margin" > <Grid Name="box_margin" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="2*"/> <RowDefinition Height="*"/>
<RowDefinition Height="2*" /> <RowDefinition Height="*" />
<RowDefinition Height="0"/> <RowDefinition Height="0"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition Width="90"/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -69,26 +69,34 @@
<Border Height="1" Background="Black" Grid.Row="6" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/> <Border Height="1" Background="Black" Grid.Row="6" VerticalAlignment="Bottom" Grid.ColumnSpan="4"/>
<Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Left" Grid.RowSpan="7"/> <Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Left" Grid.RowSpan="7"/>
<Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Right" Grid.RowSpan="7"/> <Border Width="1" Background="Black" Grid.Column="0" HorizontalAlignment="Right" Grid.RowSpan="1"/>
<Border Width="1" Background="Black" Grid.Column="0" Grid.Row="4" HorizontalAlignment="Right" Grid.RowSpan="4"/>
<Border Width="1" Background="Black" Grid.Column="3" HorizontalAlignment="Right" Grid.RowSpan="7"/> <Border Width="1" Background="Black" Grid.Column="3" HorizontalAlignment="Right" Grid.RowSpan="7"/>
<Border Width="1" Background="Black" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/> <Border Width="1" Background="Black" Grid.Column="1" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/>
<Border Width="1" Background="Black" Grid.Column="2" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/> <Border Width="1" Background="Black" Grid.Column="2" Grid.Row="6" HorizontalAlignment="Right" Grid.RowSpan="1"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="供应商名称"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="供应商名称"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.ProviderName,Mode=TwoWay}" Grid.Column="1" Grid.ColumnSpan="3"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.ProviderName,Mode=TwoWay}" Grid.Column="1" Grid.ColumnSpan="3"/>
<StackPanel Grid.Row="1" Grid.ColumnSpan="4" VerticalAlignment="Center">
<TextBlock Style="{StaticResource middleTextBlock}" Text="采购单号" Grid.Row="1"/> <TextBlock Style="{StaticResource middleTextBlock}" Text="采购单号" Grid.Row="1"/>
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Margin="2"> <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="3" Margin="2">
<Image Stretch="Fill" Source="{Binding PurchaseOrderImage}"/> <Image Width="250" Height="35" Source="{Binding PurchaseOrderImage}"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.PurchaseOrder ,Mode=TwoWay}" /> <TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.PurchaseOrder ,Mode=TwoWay}" />
</StackPanel>
</StackPanel> </StackPanel>
<TextBlock Style="{StaticResource middleTextBlock}" Text="预约单号" Grid.Row="2"/> <StackPanel Grid.Row="2" Grid.ColumnSpan="4" VerticalAlignment="Center">
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Margin="2"> <TextBlock Style="{StaticResource middleTextBlock}" Text="预约单号" Grid.Row="2"/>
<Image Stretch="Fill" Source="{Binding PrewOrderImage}"/> <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="3" Margin="2">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.PrewOrder,Mode=TwoWay}" /> <Image Height="45" Width="250" Source="{Binding PrewOrderImage}"/>
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding JDWareBoxModel.PrewOrder,Mode=TwoWay}" />
</StackPanel>
</StackPanel> </StackPanel>

37
BBWY.Client/Views/FallWare/SetJDWareBoxWindow.xaml.cs
View File

@ -36,7 +36,7 @@ namespace BBWY.Client.Views.FallWare
InitializeComponent(); InitializeComponent();
JDWareBoxModel = model; JDWareBoxModel = model;
PurchaseOrderImage = MyPrintHelper.GetBarcodeImageV2(model.PurchaseOrder, 420, 50); PurchaseOrderImage = MyPrintHelper.GetBarcodeImageV2(model.PurchaseOrder, 420, 50);
PrewOrderImage = MyPrintHelper.GetBarcodeImageV2(model.PrewOrder, 350, 50); PrewOrderImage = MyPrintHelper.GetBarcodeImageV2(model.PrewOrder, 420, 50);
this.DataContext =this; this.DataContext =this;
this.Dispatcher.Invoke(() => { this.Dispatcher.Invoke(() => {
tb_printcount.Text = "1"; tb_printcount.Text = "1";
@ -80,17 +80,34 @@ namespace BBWY.Client.Views.FallWare
MyPrintHelper.SetDefaultPrint(printName);//设置默认打印机 MyPrintHelper.SetDefaultPrint(printName);//设置默认打印机
PrintDialog printDialog = new PrintDialog(); PrintDialog printDialog = new PrintDialog();
printDialog.PrintTicket.PageOrientation = PageOrientation.Landscape;//设置为横向打印 PageOrientation.Landscape Portrait为纵向 printDialog.PrintTicket.PageOrientation = PageOrientation.Portrait;//设置为横向打印 PageOrientation.Landscape Portrait为纵向
//设置纸张大小
var pageWidth = (int)Math.Ceiling(printDialog.PrintableAreaWidth); PrintDocument document = new PrintDocument();
var pageHeight = (int)Math.Ceiling(printDialog.PrintableAreaHeight); document.PrinterSettings.PrinterName = printName;
var pageWidth = document.DefaultPageSettings.Bounds.Size.Width;
var pageHeight = document.DefaultPageSettings.Bounds.Size.Height;
//设置纸张大小
//var pageWidth = (int)Math.Ceiling(printDialog.PrintableAreaWidth);
//var pageHeight = (int)Math.Ceiling(printDialog.PrintableAreaHeight);
printDialog.PrintTicket.PageMediaSize = new PageMediaSize(pageWidth, pageHeight); printDialog.PrintTicket.PageMediaSize = new PageMediaSize(pageWidth, pageHeight);
this.Height = pageHeight + 39;//833
this.Width = pageWidth;//1123 var printAreaWidth = (int)Math.Ceiling(printDialog.PrintableAreaWidth);//打印区宽度
this.FontSize = 30; var printAreaHeight = (int)Math.Ceiling(printDialog.PrintableAreaHeight);//打印区高度
box_margin.Margin = new Thickness(50, 50, 50, 50);
this.Height = pageHeight+39;//492
this.Width = pageWidth;//227
// this.FontSize = 30;
box_margin.Margin = new Thickness(2);
//box_margin.Margin = new Thickness(10); //box_margin.Margin = new Thickness(10);
this.jd_box.Arrange(new Rect(new Point(0, 0), new Size(pageWidth, pageHeight))); //this.jd_box.Arrange(new Rect(new Point((printAreaWidth- pageWidth)/2, (printAreaHeight- pageHeight)/2), new Size(pageWidth, pageHeight)));
for (int i = 1; i <= JDWareBoxModel.BoxCount; i++) for (int i = 1; i <= JDWareBoxModel.BoxCount; i++)
{ {
this.Dispatcher.Invoke(() => { this.Dispatcher.Invoke(() => {

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

@ -1,4 +1,5 @@
using BBWY.Client.APIServices; using BBWY.Client.APIServices;
using BBWY.Client.Extensions;
using BBWY.Client.Models; using BBWY.Client.Models;
using BBWY.Client.Models.FallWare; using BBWY.Client.Models.FallWare;
using BBWY.Controls; using BBWY.Controls;
@ -162,6 +163,25 @@ namespace BBWY.Client.Views.FallWare
return; return;
} }
if (wareType == WareType.聚水潭齐越仓)
{
if (JDWareBoxModel.PurchaseOrder.IsNullOrEmpty())
{
MessageBox.Show("采购单不能为空!");
return;
}
if (JDWareBoxModel.PurchaseOrder.IsSpecialChar())
{
MessageBox.Show("采购单不能含特殊符号!");
return;
}
}
if (wareType == WareType.云仓 ) if (wareType == WareType.云仓 )
{ {
if (!JDWareBoxModel.PurchaseOrder.ToUpper().StartsWith("CPL")) if (!JDWareBoxModel.PurchaseOrder.ToUpper().StartsWith("CPL"))

Write Preview
Loading…
Cancel
Save