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

addcermodel

AddValidOverTime
506583276@qq.com 2 years ago
parent
337614ff44
commit
1abfcb15aa
15 changed files with 215 additions and 143 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 93
      BBWY.Client/Helpers/MyPrintHelper.cs
  2. 5
      BBWY.Client/Models/APIModel/Request/CerRequest.cs
  3. 3
      BBWY.Client/Models/Enums.cs
  4. 43
      BBWY.Client/Models/PackTask/CertificateModel.cs
  5. 5
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  6. 11
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  7. 2
      BBWY.Client/Views/MainWindow.xaml
  8. 48
      BBWY.Client/Views/PackTask/LookCerWindow.xaml
  9. 19
      BBWY.Client/Views/PackTask/LookCerWindow.xaml.cs
  10. 82
      BBWY.Client/Views/PackTask/PrintWindow.xaml
  11. 10
      BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
  12. 27
      BBWY.Client/Views/PackTask/SetCerControl.xaml
  13. 1
      BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
  14. 7
      QuanTan.SDK/Client/BaseClient.cs
  15. 2
      QuanTan.SDK/Model/Request/Order/QuanTanCreateOrderRequest.cs

93
BBWY.Client/Helpers/MyPrintHelper.cs
View File

@ -1,9 +1,12 @@
using BarcodeLib;
using BBWY.Client.Extensions;
using BBWY.Client.Models;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.Drawing.Printing;
using System.IO;
using System.Linq;
using System.Text;
@ -32,17 +35,17 @@ namespace BBWY.Client.Helpers
case BarcodeLabelModel.精简模板:
font = new Font("宋体", 10, System.Drawing.FontStyle.Regular);
//SetBar(barCode, ref args, font, 15);
SetBarSimplify(barCode, ref args, font);
break;
case BarcodeLabelModel.无型号模板:
font = new Font("宋体", 10, System.Drawing.FontStyle.Regular);
SetBar(barCode, ref args, font,7);
SetBar(barCode, ref args, font, 7);
break;
default:
break;
}
}
@ -152,6 +155,7 @@ namespace BBWY.Client.Helpers
public static void PrintCertificate(ref PrintPageEventArgs args, CertificateModel certificate, Font font)
{
args.Graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
args.Graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
var sige = args.Graphics.VisibleClipBounds;// 宽:236 高:157 打印可视化区域
@ -170,11 +174,16 @@ namespace BBWY.Client.Helpers
case CertificateLabelModel.无型号:
SetCerNoXingHao(ref args, certificate, font);
break;
case CertificateLabelModel.适用年龄:
SetCerNoXingHao(ref args, certificate, font);
break;
default:
break;
}
}
private static void SetCerStander(ref PrintPageEventArgs args, CertificateModel certificate, Font font)
@ -212,8 +221,6 @@ namespace BBWY.Client.Helpers
StringBuilder sb = new StringBuilder();
var excutes = certificate.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
int hangCount = excutes.Count() / 2 + excutes.Count() % 2;//获取行数
for (int i = 0; i < excutes.Count(); i++)
@ -250,36 +257,21 @@ namespace BBWY.Client.Helpers
args.Graphics.DrawString(productStr, font, System.Drawing.Brushes.Black, rect);
verHeight += 2 * smallSize.Height + heightSpace;
}
var productShop = args.Graphics.MeasureString("生产商", font);
var adress = args.Graphics.MeasureString("地 址", font);
//var format = new StringFormat
//{
// LineAlignment = StringAlignment.Far,
// // Alignment = StringAlignment.Center
//};
var rect1 = new RectangleF(10 + productShop.Width - adress.Width, verHeight, 220, smallSize.Height * 3 + heightSpace);
args.Graphics.DrawString($"地 址: {certificate.ProductAdress}", font, System.Drawing.Brushes.Black, rect1);
var rect1 = new RectangleF(10, verHeight, 220, smallSize.Height * 3 + heightSpace);
args.Graphics.DrawString($"地址: {certificate.ProductAdress}", font, System.Drawing.Brushes.Black, rect1);
//certificate.ExcuteStander =;
//args.Graphics.DrawImage(img, 1, 68, 234, 60);
}
private static void SetCerNoXingHao(ref PrintPageEventArgs args, CertificateModel certificate, Font font)
{
int bigJiange = 20;//合格证与品牌的高度差
var heightSpace = 4;//所有行间隔高度
int standerSpace = 1;//执行标准之间的
//if (certificate.IsLogo == 1)//含图标
//{
// string appPath = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
// string path = appPath + $"/Resources/Images/3c.png";
// Image image = Image.FromFile(path);
// args.Graphics.DrawImage(image, 190, 7, 28, 21);
// args.Graphics.DrawString(certificate.FactoryNumber, font, System.Drawing.Brushes.Black, 188, 28);
//}
var fontBig = new Font("宋体", 14, System.Drawing.FontStyle.Regular);
string cerName = "合格证";
@ -295,14 +287,28 @@ namespace BBWY.Client.Helpers
verHeight += (smallSize.Height + heightSpace);
args.Graphics.DrawString($"材质: {certificate.Shader}", font, System.Drawing.Brushes.Black, new PointF(10, verHeight));
switch (certificate.LabelModel)
{
case CertificateLabelModel.标准无3c:
break;
case CertificateLabelModel.标准有3c:
break;
case CertificateLabelModel.无型号:
break;
case CertificateLabelModel.适用年龄:
var twoWidth = args.Graphics.MeasureString("适用", font);
args.Graphics.DrawString($"适用年龄: {certificate.ApplyAge}", font, System.Drawing.Brushes.Black, new PointF(122 - twoWidth.Width, verHeight));
break;
default:
break;
}
//args.Graphics.DrawString($"材质: {certificate.Shader}", font, System.Drawing.Brushes.Black, new PointF(122, verHeight));
StringBuilder sb = new StringBuilder();
var excutes = certificate.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
int hangCount = excutes.Count() / 2 + excutes.Count() % 2;//获取行数
for (int i = 0; i < excutes.Count(); i++)
{
if (i % 2 == 0 && i > 0)//间隔两个换行
@ -337,19 +343,28 @@ namespace BBWY.Client.Helpers
args.Graphics.DrawString(productStr, font, System.Drawing.Brushes.Black, rect);
verHeight += 2 * smallSize.Height + heightSpace;
}
var productShop = args.Graphics.MeasureString("生产商", font);
var adress = args.Graphics.MeasureString("地 址", font);
var rect1 = new RectangleF(10 + productShop.Width - adress.Width, verHeight, 220, smallSize.Height * 3 + heightSpace);
args.Graphics.DrawString($"地 址: {certificate.ProductAdress}", font, System.Drawing.Brushes.Black, rect1);
//var format = new StringFormat
//{
// LineAlignment = StringAlignment.Far,
// // Alignment = StringAlignment.Center
//};
}
var rect1 = new RectangleF(10, verHeight, 220, smallSize.Height * 3 + heightSpace);
args.Graphics.DrawString($"地址: {certificate.ProductAdress}", font, System.Drawing.Brushes.Black, rect1);
//certificate.ExcuteStander =;
public static void SaveImage(PrintPageEventArgs args)
{
args.Graphics.Save();
// args.Graphics
//Bitmap bitmap2 = new Bitmap(236, 157);
//Graphics graphics2 = Graphics.FromImage(bitmap2);
//graphics2 = args.Graphics.Copy();
//bitmap2.Save("image.jpg", ImageFormat.Jpeg);
//args.Graphics.DrawImage(img, 1, 68, 234, 60);
}
}
}

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

@ -62,5 +62,10 @@ namespace BBWY.Client.Models.APIModel.Request
/// 合格证模板
/// </summary>
public int LabelModel { get; set; }
/// <summary>
/// 适用年龄
/// </summary>
public string ApplyAge { get; set; }
}
}

3
BBWY.Client/Models/Enums.cs
View File

@ -294,7 +294,8 @@
{
标准无3c = 0,
标准有3c = 1,
无型号=2
无型号=2,
适用年龄=3
}
/// <summary>

43
BBWY.Client/Models/PackTask/CertificateModel.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Text;
namespace BBWY.Client.Models
{
@ -18,7 +19,7 @@ namespace BBWY.Client.Models
/// skuid
/// </summary>
public string SkuId { get; set; }
private string spuId;
/// <summary>
@ -50,7 +51,17 @@ namespace BBWY.Client.Models
/// <summary>
/// 执行标准
/// </summary>
public string ExcuteStander { get => excuteStander; set { Set(ref excuteStander, value); } }
public string ExcuteStander { get => excuteStander; set {
Set(ref excuteStander, value);
GetExcuteStanderFormat();
} }
private string excuteStanderFormat;
/// <summary>
/// 执行标准 (,=>换行)
/// </summary>
public string ExcuteStanderFormat { get => excuteStanderFormat; set { Set(ref excuteStanderFormat, value); } }
private string productShop;
/// <summary>
@ -91,8 +102,36 @@ namespace BBWY.Client.Models
/// 工厂编号
/// </summary>
public string FactoryNumber { get => factoryNumber; set { Set(ref factoryNumber, value); } }
private string applyAge;
/// <summary>
/// 适用年龄
/// </summary>
public string ApplyAge { get => applyAge; set { Set(ref applyAge, value); } }
private CertificateLabelModel labelModel;
public CertificateLabelModel LabelModel { get => labelModel; set { Set(ref labelModel, value); } }
void GetExcuteStanderFormat()
{
StringBuilder sb = new StringBuilder();
if (this.ExcuteStander.Contains(","))//有逗号就拆分
{
var excutes = this.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
for (int i = 0; i < excutes.Length; i++)
{
if (i % 2 == 0 && i > 0)//间隔两个换行
{
sb.Append("\r\n");
}
sb.Append(excutes[i]).Append(" ");
}
sb.Remove(sb.Length - 3, 3);
this.ExcuteStanderFormat = sb.ToString();
return;
}
this.ExcuteStanderFormat = ExcuteStander;
}
}
}

5
BBWY.Client/Models/PackTask/PackTaskModel.cs
View File

@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
@ -54,6 +55,10 @@ namespace BBWY.Client.Models
private void DeletedTask()
{
MessageBoxResult result = MessageBox.Show("确定删除?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
if (result != MessageBoxResult.Yes) return;
packTaskService.DeletedTask(TaskId);
if (ReflashTask != null)
ReflashTask();//刷新界面

11
BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
View File

@ -571,6 +571,7 @@ namespace BBWY.Client.ViewModels.PackTask
ProductNo = SpuCertificateModel.ProductNo,
Shader = SpuCertificateModel.Shader,
ProductShop = SpuCertificateModel.ProductShop,
ApplyAge = SpuCertificateModel.ApplyAge,
};
}
@ -611,7 +612,10 @@ namespace BBWY.Client.ViewModels.PackTask
IsLogo = SpuCertificateModel.IsLogo,
ProductAdress = SpuCertificateModel.ProductAdress,
ProductShop = SpuCertificateModel.ProductShop,
Shader = SpuCertificateModel.Shader
Shader = SpuCertificateModel.Shader,
SkuId = SpuCertificateModel.SkuId,
ApplyAge = SpuCertificateModel.ApplyAge,
});
@ -766,9 +770,8 @@ namespace BBWY.Client.ViewModels.PackTask
IsLogo = CertificateModel.IsLogo,
ProductAdress = CertificateModel.ProductAdress,
ProductShop = CertificateModel.ProductShop,
Shader = CertificateModel.Shader
Shader = CertificateModel.Shader,
ApplyAge = CertificateModel.ApplyAge,
});
if (resData == null || !resData.Success)
{

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.Shop.Platform}" Margin="5,0,0,0"/>-->
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10091" Margin="5,0,0,0"/>
<TextBlock Text="v10092" Margin="5,0,0,0"/>
</StackPanel>
</Border>
<Grid Grid.Row="1">

48
BBWY.Client/Views/PackTask/LookCerWindow.xaml
View File

@ -29,8 +29,35 @@
Background="{StaticResource Border.Background}">
<TextBlock Text="查看合格证" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
<DockPanel Grid.Row="1">
<Border Name="shiyongnianling" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=适用年龄:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="285" Margin="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" Width="380" Height="297" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12,0,0" />
@ -49,13 +76,13 @@
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStander}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
Height="50" Text="{Binding ExcuteStanderFormatFormat}" 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"
<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"/>
@ -78,13 +105,14 @@
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,154,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
Text="{Binding ExcuteStander}" Height="40" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,153,0,0"/>
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="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"/>
<!--<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"/>
@ -110,13 +138,13 @@
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStander}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
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"
<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>

19
BBWY.Client/Views/PackTask/LookCerWindow.xaml.cs
View File

@ -40,24 +40,11 @@ namespace BBWY.Client.Views.PackTask
ProductShop = certificate.ProductShop,
Shader = certificate.Shader,
SkuId = certificate.SkuId,
Reseller = certificate.Reseller
Reseller = certificate.Reseller,
ApplyAge = certificate.ApplyAge,
};
StringBuilder sb = new StringBuilder();
if (data.ExcuteStander.Contains(","))//有逗号就拆分
{
var excutes = data.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
for (int i = 0; i < excutes.Count(); i++)
{
if (i % 2 == 0 && i > 0)//间隔两个换行
{
sb.Append("\r\n");
}
sb.Append(excutes[i]).Append(" ");
}
sb.Remove(sb.Length - 3, 3);
data.ExcuteStander = sb.ToString();
}
this.DataContext = data;
}
}

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

@ -42,7 +42,7 @@
</DockPanel>-->
<Grid Name="bar" Visibility="Collapsed" Grid.Row="1" >
<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" >
@ -108,73 +108,39 @@
</StackPanel>
</Border>
</Grid>
<Grid x:Name="cer" Grid.Row="1">
<!--<Border Name="no3c" Visibility="Collapsed" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="33,110,0,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid x:Name="cer" Grid.Row="1" Margin="33,110,0,0" Width="380" Height="297">
<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" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70" />
<c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding Brand}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65"/>
<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="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 BrandName}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,107,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="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="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 ExcuteStander}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
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"
<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="is3c" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="33,110,0,0" 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"/>
<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,166,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
Text="{Binding ExcuteStander}" Height="40" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,161,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="no3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准无3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="33,110,0,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<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" />
@ -192,7 +158,7 @@
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStander}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
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"/>
@ -204,7 +170,7 @@
</Grid>
</Border>
<Border Name="is3c" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=标准3c:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="33,110,0,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<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" />
@ -221,7 +187,7 @@
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,154,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
Text="{Binding ExcuteStander}" Height="40" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,153,0,0"/>
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"/>
@ -236,7 +202,7 @@
</Grid>
</Border>
<Border Name="noxinghao" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=无型号:Visible:Collapsed}" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="33,110,0,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<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" />
@ -253,7 +219,7 @@
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,150,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent"
TextWrapping ="Wrap" AcceptsReturn="True"
Height="50" Text="{Binding ExcuteStander}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
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"/>
@ -263,7 +229,7 @@
Height="44" Text="{Binding ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
</Grid>

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

@ -159,11 +159,13 @@ namespace BBWY.Client.Views.PackTask
#if DEBUG
#if DEBUG
//打印 纵向打印 会模糊
args.PageSettings.PrinterSettings.DefaultPageSettings.PaperSize = new System.Drawing.Printing.PaperSize("Custom", 236, 157);
args.PageSettings.PrinterSettings.DefaultPageSettings.Landscape = true;
#endif
//args.PageSettings.PrinterSettings.DefaultPageSettings.PaperSize = new System.Drawing.Printing.PaperSize("Custom", 236, 157);
//args.PageSettings.PrinterSettings.DefaultPageSettings.Landscape = true;
Bitmap bitmap = new Bitmap(236,157);
#endif
Font font = new Font("宋体", 6, System.Drawing.FontStyle.Regular);
if (BarCodeModel != null)

27
BBWY.Client/Views/PackTask/SetCerControl.xaml
View File

@ -6,7 +6,7 @@
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
xmlns:cmodel="clr-namespace:BBWY.Client.Models"
mc:Ignorable="d"
mc:Ignorable="d" Background="White"
d:DesignHeight="700" d:DesignWidth="820">
<Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:SetCerControl}}}">
<Grid.RowDefinitions>
@ -92,6 +92,31 @@
<TextBox TextWrapping ="Wrap" AcceptsReturn="True" Height="44" Text="{Binding model.ProductAdress,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
</Grid>
<Grid Grid.Column="1" Grid.Row="1">
<!--IsChecked="{Binding IsLogo,Converter={StaticResource objConverter},ConverterParameter=0:true:false}"-->
<RadioButton GroupName="cer" IsChecked="{Binding model.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.适用年龄 }}" Checked="RadioButton_Checked" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CertificateLabelModel.适用年龄}" Content="适用年龄" Margin="10,0,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,30,13,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70" />
<c:BTextBox Height="25" Text="{Binding model.Brand,Mode=TwoWay,NotifyOnTargetUpdated=True,UpdateSourceTrigger=PropertyChanged}" Width="111" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65,0,0"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,70,0,0" />
<c:BTextBox Height="25" Text="{Binding model.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,65,0,0"/>
<TextBlock Text="材质:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,114,0,0" />
<c:BTextBox Height="26" Text="{Binding model.Shader,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="111" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,108,0,0"/>
<TextBlock Text="适用年龄:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="179,114,0,0" />
<c:BTextBox Height="25" Text="{Binding model.ApplyAge,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="124" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,108,0,0"/>
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,166,0,0" />
<c:BTextBox WaterRemark="如多个标准请使用逗号分隔" Height="25" Text="{Binding model.ExcuteStander,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,161,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<c:BTextBox Height="25" Text="{Binding model.ProductShop,Mode=TwoWay,NotifyOnTargetUpdated=True,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,242,0,0" />
<TextBox TextWrapping ="Wrap" AcceptsReturn="True" Height="44" Text="{Binding model.ProductAdress,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
</Grid>

1
BBWY.Server.Business/PlatformSDK/QuanTanBusiness.cs
View File

@ -105,6 +105,7 @@ namespace BBWY.Server.Business
userAccount = createOnlinePurchaseOrderRequest.AppToken,
cartIds = createOnlinePurchaseOrderRequest.Extensions,
autoPay= createOnlinePurchaseOrderRequest.AutoPay,
remark=createOnlinePurchaseOrderRequest.Remark,
receipt = new QuanTanCreateOrderReceipt()
{
province = createOnlinePurchaseOrderRequest.Consignee.Province,

7
QuanTan.SDK/Client/BaseClient.cs
View File

@ -27,12 +27,6 @@ namespace QuanTan.SDK.Client
var randomNum = new Random(Guid.NewGuid().GetHashCode()).Next(100000, 999999).ToString();
if (param == null)
param = new object[] { };
#if DEBUG
appId = "BBWY2023022001";
appSecret = "908e131365d5448ca651ba20ed7ddefe";
#endif
var paramStr = JsonConvert.SerializeObject(param);
var jmStr = JsonConvert.SerializeObject(new QuanTanSignParam()
@ -40,7 +34,6 @@ namespace QuanTan.SDK.Client
//appId = appId,
appId = appId,
appSecret = appSecret,//
callTime = callTime,
_params = paramStr,
randomNum = randomNum

2
QuanTan.SDK/Model/Request/Order/QuanTanCreateOrderRequest.cs
View File

@ -13,6 +13,8 @@
public string extended { get; set; }
public string autoPay { get; set; }
public string remark { get; set; }
}
public class QuanTanCreateOrderReceipt : QuanTanPreviewOrderReceipt

Write Preview
Loading…
Cancel
Save