Browse Source

增加打印模板

qianyi
连坤 林 2 years ago
parent
commit
7ba2bcb0f1
  1. 6
      BBWY.Client/APIServices/PackTaskService.cs
  2. 210
      BBWY.Client/Helpers/MyPrintHelper.cs
  3. 24
      BBWY.Client/Models/Enums.cs
  4. 2
      BBWY.Client/Models/PackTask/BarCodeModel.cs
  5. 12
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  6. 56
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  7. 60
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  8. 93
      BBWY.Client/Views/PackTask/BarcodeControl.xaml
  9. 53
      BBWY.Client/Views/PackTask/BarcodeControl.xaml.cs
  10. 113
      BBWY.Client/Views/PackTask/CerControl.xaml
  11. 56
      BBWY.Client/Views/PackTask/CerControl.xaml.cs
  12. 35
      BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml
  13. 18
      BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml.cs
  14. 36
      BBWY.Client/Views/PackTask/LookCerWindow.xaml
  15. 13
      BBWY.Client/Views/PackTask/LookCerWindow.xaml.cs
  16. 130
      BBWY.Client/Views/PackTask/PrintWindow.xaml
  17. 203
      BBWY.Client/Views/PackTask/PrintWindow.xaml.cs
  18. 48
      BBWY.Client/Views/PackTask/SetBarCode.xaml
  19. 38
      BBWY.Client/Views/PackTask/SetCerWindow.xaml
  20. 4
      BBWY.Client/Views/PackTask/TaskListControl.xaml
  21. 4
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml

6
BBWY.Client/APIServices/PackTaskService.cs

@ -109,10 +109,12 @@ namespace BBWY.Client.APIServices
} }
public ApiResponse<object> DeletedTask(CreateTaskRequest createTaskRequest) public ApiResponse<object> DeletedTask(long taskId)
{ {
return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/DeletedPackTask", return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/DeletedPackTask",
createTaskRequest new {
TaskId = taskId
}
, null, HttpMethod.Post); , null, HttpMethod.Post);
} }

210
BBWY.Client/Helpers/MyPrintHelper.cs

@ -21,18 +21,85 @@ namespace BBWY.Client.Helpers
//args.Graphics.DrawRectangle(new System.Drawing.Pen(System.Drawing.Brushes.Black), 0, 0, sige.Width, sige.Height);//画出条码编辑区域 //args.Graphics.DrawRectangle(new System.Drawing.Pen(System.Drawing.Brushes.Black), 0, 0, sige.Width, sige.Height);//画出条码编辑区域
args.Graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality; args.Graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
args.Graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic; args.Graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
if (barCode.LabelModel == BarcodeLabelModel.barsimplify)
switch (barCode.LabelModel)
{ {
font = new Font("宋体", 10, System.Drawing.FontStyle.Regular); case BarcodeLabelModel.:
SetBarSimplify(barCode, ref args, font); font = new Font("宋体", 8, System.Drawing.FontStyle.Regular);
SetBar(barCode, ref args, font, 5);
//SetBarStander(barCode, ref args, font);
break;
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);
break;
default:
break;
} }
else
}
private static void SetBar(BarCodeModel barCode, ref PrintPageEventArgs args, Font font, int heightSpace)
{
float topHeigth = 0;//与顶部的距离
string barcodeSku = $"POP{barCode.SkuId}";
Barcode barcode = new Barcode();
System.Drawing.Image img = barcode.Encode(TYPE.CODE128, barcodeSku, 500, 40);
SizeF size = args.Graphics.MeasureString(barCode.BrandName, font);
var sizeHeight = size.Height;//字体高度
topHeigth += 10;
switch (barCode.LabelModel)
{
case BarcodeLabelModel.:
case BarcodeLabelModel.:
args.Graphics.DrawString($"品牌: {barCode.Brand}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
topHeigth += (heightSpace + sizeHeight);
break;
case BarcodeLabelModel.:
break;
}
args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
topHeigth += (heightSpace + sizeHeight);
switch (barCode.LabelModel)
{ {
font = new Font("宋体", 8, System.Drawing.FontStyle.Regular); case BarcodeLabelModel.:
SetBarStander(barCode, ref args, font); args.Graphics.DrawString($"型号: {barCode.ProductNo}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
topHeigth += (heightSpace + sizeHeight);
break;
case BarcodeLabelModel.:
case BarcodeLabelModel.:
break;
default:
break;
} }
args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
// g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
size = args.Graphics.MeasureString(barcodeSku, font);
topHeigth += (heightSpace + sizeHeight);
args.Graphics.DrawImage(img, 1, topHeigth, 234, 50);
topHeigth += (50 + 5);
args.Graphics.DrawString(barcodeSku, font, System.Drawing.Brushes.Black, new PointF((236 - size.Width) / 2, topHeigth));
} }
/// <summary> /// <summary>
/// 标准 /// 标准
/// </summary> /// </summary>
@ -41,23 +108,28 @@ namespace BBWY.Client.Helpers
/// <param name="font"></param> /// <param name="font"></param>
private static void SetBarStander(BarCodeModel barCode, ref PrintPageEventArgs args, Font font) private static void SetBarStander(BarCodeModel barCode, ref PrintPageEventArgs args, Font font)
{ {
float topHeigth = 0;//与顶部的距离
string barcodeSku = $"POP{barCode.SkuId}"; string barcodeSku = $"POP{barCode.SkuId}";
Barcode barcode = new Barcode(); Barcode barcode = new Barcode();
System.Drawing.Image img = barcode.Encode(TYPE.CODE128, barcodeSku, 500, 40); System.Drawing.Image img = barcode.Encode(TYPE.CODE128, barcodeSku, 500, 40);
SizeF size = args.Graphics.MeasureString(barCode.BrandName, font); SizeF size = args.Graphics.MeasureString(barCode.BrandName, font);
var sizeHeight = size.Height;//字体高度 var sizeHeight = size.Height;//字体高度
var heightSpace = 5;//间隔高度 var heightSpace = 5;//间隔高度
topHeigth += 10;
args.Graphics.DrawString($"品牌: {barCode.Brand}", font, System.Drawing.Brushes.Black, new PointF(10, 10)); args.Graphics.DrawString($"品牌: {barCode.Brand}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, 10 + heightSpace + sizeHeight)); topHeigth += (heightSpace + sizeHeight);
args.Graphics.DrawString($"型号: {barCode.ProductNo}", font, System.Drawing.Brushes.Black, new PointF(10, 10 + 2 * (heightSpace + sizeHeight))); args.Graphics.DrawString($"品名: {barCode.BrandName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, 10 + 3 * (heightSpace + sizeHeight))); topHeigth += (heightSpace + sizeHeight);
args.Graphics.DrawString($"型号: {barCode.ProductNo}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
topHeigth += (heightSpace + sizeHeight);
args.Graphics.DrawString($"规格: {barCode.SkuName}", font, System.Drawing.Brushes.Black, new PointF(10, topHeigth));
// g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias; // g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
size = args.Graphics.MeasureString(barcodeSku, font); size = args.Graphics.MeasureString(barcodeSku, font);
args.Graphics.DrawString(barcodeSku, font, System.Drawing.Brushes.Black, new PointF((236 - size.Width) / 2, 10 + 4 * (heightSpace + sizeHeight) + 50 + 5)); topHeigth += (heightSpace + sizeHeight);
args.Graphics.DrawImage(img, 1, 10 + 4 * (heightSpace + sizeHeight), 234, 50); args.Graphics.DrawImage(img, 1, topHeigth, 234, 50);
topHeigth += (50 + 5);
args.Graphics.DrawString(barcodeSku, font, System.Drawing.Brushes.Black, new PointF((236 - size.Width) / 2, topHeigth));
} }
/// <summary> /// <summary>
/// 精简 /// 精简
@ -89,7 +161,20 @@ namespace BBWY.Client.Helpers
args.Graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic; args.Graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
font = new Font("宋体", 6, System.Drawing.FontStyle.Regular); font = new Font("宋体", 6, System.Drawing.FontStyle.Regular);
SetCerStander(ref args, certificate, font); switch (certificate.LabelModel)
{
case CertificateLabelModel.3c:
case CertificateLabelModel.3c:
SetCerStander(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) private static void SetCerStander(ref PrintPageEventArgs args, CertificateModel certificate, Font font)
@ -157,8 +242,95 @@ namespace BBWY.Client.Helpers
var productStr = $"生产商: {certificate.ProductShop}"; var productStr = $"生产商: {certificate.ProductShop}";
if (args.Graphics.MeasureString(productStr, font).Width <= 220) if (args.Graphics.MeasureString(productStr, font).Width <= 220)
{ {
args.Graphics.DrawString(productStr, font, System.Drawing.Brushes.Black,10,verHeight); args.Graphics.DrawString(productStr, font, System.Drawing.Brushes.Black, 10, verHeight);
verHeight += smallSize.Height + heightSpace; verHeight += smallSize.Height + heightSpace;
}
else
{
args.Graphics.DrawString(productStr, font, System.Drawing.Brushes.Black, rect);
verHeight += 2 * smallSize.Height + heightSpace;
}
//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 =;
//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 = "合格证";
SizeF bigSize = args.Graphics.MeasureString(cerName, fontBig);
float verHeight = bigJiange + bigSize.Height;
args.Graphics.DrawString(cerName, fontBig, System.Drawing.Brushes.Black, new PointF((236 - bigSize.Width) / 2, 10));
args.Graphics.DrawString($"品牌: {certificate.Brand}", font, System.Drawing.Brushes.Black, new PointF(10, verHeight));
args.Graphics.DrawString($"品名: {certificate.BrandName}", font, System.Drawing.Brushes.Black, new PointF(122, verHeight));
var smallSize = args.Graphics.MeasureString(certificate.BrandName, font);//小字体高度
verHeight += (smallSize.Height + heightSpace);
args.Graphics.DrawString($"材质: {certificate.Shader}", font, System.Drawing.Brushes.Black, new PointF(10, verHeight));
//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)//间隔两个换行
{
sb.Append("\n");
}
sb.Append(excutes[i]).Append(" ");
}
sb.Remove(sb.Length - 3, 3);
var rows = sb.ToString().Split('\n');
string excuteStander = "执行标准: ";
smallSize = args.Graphics.MeasureString(excuteStander, font);
verHeight += (smallSize.Height + heightSpace);
args.Graphics.DrawString($"执行标准: {rows[0]}", font, System.Drawing.Brushes.Black, new PointF(10, verHeight));
for (int i = 1; i < rows.Count(); i++)
{
verHeight += (smallSize.Height + standerSpace);
args.Graphics.DrawString($"{rows[i]}", font, System.Drawing.Brushes.Black, new PointF(10 + smallSize.Width, verHeight));
}
verHeight += (smallSize.Height + heightSpace);
RectangleF rect = new RectangleF(10, verHeight, 220, smallSize.Height * 2 + heightSpace);
var productStr = $"生产商: {certificate.ProductShop}";
if (args.Graphics.MeasureString(productStr, font).Width <= 220)
{
args.Graphics.DrawString(productStr, font, System.Drawing.Brushes.Black, 10, verHeight);
verHeight += smallSize.Height + heightSpace;
} }
else else
{ {
@ -173,7 +345,7 @@ namespace BBWY.Client.Helpers
//}; //};
var rect1 = new RectangleF(10, verHeight, 220, smallSize.Height * 3 + heightSpace); var rect1 = new RectangleF(10, verHeight, 220, smallSize.Height * 3 + heightSpace);
args.Graphics.DrawString($"地址: {certificate.ProductAdress}", font, System.Drawing.Brushes.Black, rect1 ); args.Graphics.DrawString($"地址: {certificate.ProductAdress}", font, System.Drawing.Brushes.Black, rect1);
//certificate.ExcuteStander =; //certificate.ExcuteStander =;

24
BBWY.Client/Models/Enums.cs

@ -274,11 +274,15 @@
/// <summary> /// <summary>
/// 标准模板 /// 标准模板
/// </summary> /// </summary>
barstander = 0, = 0,
/// <summary> /// <summary>
/// 精简模板 /// 精简模板
/// </summary> /// </summary>
barsimplify = 1, = 1,
/// <summary>
/// 无型号模板
/// </summary>
= 2
} }
@ -288,17 +292,11 @@
/// </summary> /// </summary>
public enum CertificateLabelModel public enum CertificateLabelModel
{ {
No3C = 0, 3c = 0,
Is3C = 1 3c = 1,
} =2
///// <summary> }
///// 合格证是否3c
///// </summary>
//public enum CerHave3C
//{
// No3C = 0,
// Is3C = 1
//}
/// <summary> /// <summary>
/// 加急 /// 加急
/// </summary> /// </summary>

2
BBWY.Client/Models/PackTask/BarCodeModel.cs

@ -56,7 +56,7 @@ namespace BBWY.Client.Models
private BarcodeLabelModel labelModel= BarcodeLabelModel.barsimplify; private BarcodeLabelModel labelModel= BarcodeLabelModel.;
/// <summary> /// <summary>
/// 模板标签 /// 模板标签
/// </summary> /// </summary>

12
BBWY.Client/Models/PackTask/PackTaskModel.cs

@ -54,10 +54,7 @@ namespace BBWY.Client.Models
private void DeletedTask() private void DeletedTask()
{ {
packTaskService.DeletedTask(new APIModel.Request.CreateTaskRequest packTaskService.DeletedTask(TaskId);
{
TaskId = TaskId
});
if (ReflashTask != null) if (ReflashTask != null)
ReflashTask();//刷新界面 ReflashTask();//刷新界面
} }
@ -142,7 +139,8 @@ namespace BBWY.Client.Models
new TipsWindow("该任务无设置条形码信息,无法查看!").ShowDialog(); new TipsWindow("该任务无设置条形码信息,无法查看!").ShowDialog();
return; return;
} }
LookBarCodeWindow look = new LookBarCodeWindow(new BarCodeModel LookBarCodeWindow look = new LookBarCodeWindow();
look.SetData(new BarCodeModel
{ {
Brand = BarCodeModel.Brand, Brand = BarCodeModel.Brand,
BrandName = BarCodeModel.BrandName, BrandName = BarCodeModel.BrandName,
@ -181,7 +179,7 @@ namespace BBWY.Client.Models
} }
PrintWindow printWindow = new PrintWindow(); PrintWindow printWindow = new PrintWindow();
printWindow.barCodeModel = new BarCodeModel printWindow.BarCodeModel = new BarCodeModel
{ {
Brand = BarCodeModel.Brand, Brand = BarCodeModel.Brand,
BrandName = BarCodeModel.BrandName, BrandName = BarCodeModel.BrandName,
@ -321,7 +319,7 @@ namespace BBWY.Client.Models
private Worry isWorry; private Worry isWorry;
/// <summary> /// <summary>
/// 到货情况(待收货=0,部分收货=1,已到货=2) /// 是否加急
/// </summary> /// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } } public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }

56
BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs

@ -494,7 +494,7 @@ namespace BBWY.Client.ViewModels.PackTask
PrintNames = new List<string>(); PrintNames = new List<string>();
delayTrigger = new DelayTrigger(500); delayTrigger = new DelayTrigger(500);
delayTrigger.OnExecute = OnSearchIncreateKeyWordChanged; delayTrigger.OnExecute = OnSearchIncreateKeyWordChanged;
BarLabelCheck(BarcodeLabelModel.barsimplify);//默认精简模式 BarLabelCheck(BarcodeLabelModel.);//默认精简模式
} }
@ -546,9 +546,10 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
private void LookBar() private void LookBar()
{ {
LookBarCodeWindow look = new LookBarCodeWindow(new BarCodeModel LookBarCodeWindow look = new LookBarCodeWindow();
look.SetData(new BarCodeModel
{ {
Brand = BarCodeModel. Brand, Brand = BarCodeModel.Brand,
BrandName = BarCodeModel.BrandName, BrandName = BarCodeModel.BrandName,
LabelModel = BarCodeModel.LabelModel, LabelModel = BarCodeModel.LabelModel,
ProductNo = BarCodeModel.ProductNo, ProductNo = BarCodeModel.ProductNo,
@ -560,7 +561,8 @@ namespace BBWY.Client.ViewModels.PackTask
private void CerLabelCheck(CertificateLabelModel cer) private void CerLabelCheck(CertificateLabelModel cer)
{ {
CertificateModel.IsLogo = (int)cer; CertificateModel.LabelModel = cer;
CertificateModel.IsLogo = cer== CertificateLabelModel.3c?1:0;
} }
/// <summary> /// <summary>
/// ///
@ -571,7 +573,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
LabelModel = barcodeLabelModel; LabelModel = barcodeLabelModel;
if (LabelModel == BarcodeLabelModel.barstander)//标准版 判断数据是否异常 if (LabelModel == BarcodeLabelModel.)//标准版 判断数据是否异常
{ {
if (string.IsNullOrEmpty(ProductNo) || ProductNo == "待填写") if (string.IsNullOrEmpty(ProductNo) || ProductNo == "待填写")
{ {
@ -588,11 +590,21 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
private void SetCertificate() private void SetCertificate()
{ {
if (CertificateModel == null) if (string.IsNullOrEmpty(SearchSkuId))
{ {
new TipsWindow("请先查询Sku数据").ShowDialog(); new TipsWindow("请先查询skuId").Show();
return; return;
} }
if (CertificateModel == null)
{
CertificateModel = new CertificateModel();
CertificateModel.ProductNo = ProductNo;
CertificateModel.Brand = Brand;
CertificateModel.SkuId = SkuId;
}
CertificateModel.BrandName = BrandName; CertificateModel.BrandName = BrandName;
setCerWindow = new SetCerWindow(); setCerWindow = new SetCerWindow();
setCerWindow.ShowDialog(); setCerWindow.ShowDialog();
@ -603,7 +615,7 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
private void SaveCer() private void SaveCer()
{ {
if (string.IsNullOrEmpty(CertificateModel.ExcuteStander) || string.IsNullOrEmpty(CertificateModel.ProductNo) if (string.IsNullOrEmpty(CertificateModel.ExcuteStander)
|| string.IsNullOrEmpty(CertificateModel.Shader) || string.IsNullOrEmpty(CertificateModel.BrandName) || string.IsNullOrEmpty(CertificateModel.Shader) || string.IsNullOrEmpty(CertificateModel.BrandName)
|| string.IsNullOrEmpty(CertificateModel.Brand) || string.IsNullOrEmpty(CertificateModel.ProductShop) || string.IsNullOrEmpty(CertificateModel.Brand) || string.IsNullOrEmpty(CertificateModel.ProductShop)
|| string.IsNullOrEmpty(CertificateModel.ProductAdress)) || string.IsNullOrEmpty(CertificateModel.ProductAdress))
@ -612,24 +624,7 @@ namespace BBWY.Client.ViewModels.PackTask
return; return;
} }
var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries); var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
CertificateLabelModel labelModel = CertificateLabelModel.No3C;
switch (CertificateModel.IsLogo)
{
case 0://没图
labelModel = CertificateLabelModel.No3C; break;
case 1://含3c图
labelModel = CertificateLabelModel.Is3C;
break;
default:
break;
}
CertificateModel.LabelModel = labelModel;
var resData = packTaskService.SaveCer(new CerRequest var resData = packTaskService.SaveCer(new CerRequest
{ {
Brand = CertificateModel.Brand, Brand = CertificateModel.Brand,
@ -680,12 +675,12 @@ namespace BBWY.Client.ViewModels.PackTask
setBarCodeWindow.ShowDialog(); setBarCodeWindow.ShowDialog();
} }
public BarcodeLabelModel LabelModel = BarcodeLabelModel.barsimplify; public BarcodeLabelModel LabelModel = BarcodeLabelModel.;
private void SaveBarCode() private void SaveBarCode()
{ {
if (LabelModel == BarcodeLabelModel.barstander)//标准版 判断数据是否异常 if (LabelModel == BarcodeLabelModel.)//标准版 判断数据是否异常
{ {
if (string.IsNullOrEmpty(ProductNo) || ProductNo == "待填写") if (string.IsNullOrEmpty(ProductNo) || ProductNo == "待填写")
{ {
@ -807,8 +802,13 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary> /// </summary>
public void SearchSku() public void SearchSku()
{ {
if (string.IsNullOrEmpty(SearchSkuId))
{
return;
}
SearchSkuId = SearchSkuId.Trim();//去掉空格 避免数据异常
IsLoading = true; IsLoading = true;
SkuId = searchSkuId; SkuId = SearchSkuId;
ApiResponse<ProductListResponse> productApiResponse = null; ApiResponse<ProductListResponse> productApiResponse = null;
var skuResponse = productService.GetProductSkuList(string.Empty, SkuId); var skuResponse = productService.GetProductSkuList(string.Empty, SkuId);
if (skuResponse.Success) if (skuResponse.Success)

60
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

@ -112,8 +112,6 @@ namespace BBWY.Client.ViewModels.PackTask
private bool isLoading; private bool isLoading;
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
WorkProcessService workProcessService;
private readonly PackTaskService packTaskService;
private int? IsWorry { get; set; } private int? IsWorry { get; set; }
public int? taskStatus { get; set; } public int? taskStatus { get; set; }
@ -140,11 +138,13 @@ namespace BBWY.Client.ViewModels.PackTask
} }
} }
ConsumableService consumableService;
#endregion
#endregion
private readonly ConsumableService consumableService;
private readonly WorkProcessService workProcessService;
private readonly PackTaskService packTaskService;
private readonly IncreateServiceService increateServiceService;
public WareHouseListViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateServiceService) public WareHouseListViewModel(PackTaskService packTaskService, ConsumableService consumableService, WorkProcessService workProcessService, IncreateServiceService increateServiceService)
{ {
this.packTaskService = packTaskService; this.packTaskService = packTaskService;
@ -192,25 +192,7 @@ namespace BBWY.Client.ViewModels.PackTask
private void IsLoadCount()
{
var packTaskResult = packTaskService.GetWareAllCount();
if (packTaskResult != null && packTaskResult.Success)
{
App.Current.Dispatcher.Invoke(() =>
{
ArrivedCount = packTaskResult.Data.ArrivedCount;
NoArrivedCount = packTaskResult.Data.NoArrivedCount;
SomeArrivedCount = packTaskResult.Data.SomeArrivedCount;
WorryCount = packTaskResult.Data.WorryCount;
});
}
}
private void LoadIndex(int pageIndex)
{
PageIndex = pageIndex;//
SearchTaskList();
}
#region 事件绑定 #region 事件绑定
@ -278,7 +260,7 @@ namespace BBWY.Client.ViewModels.PackTask
} }
private IncreateServiceService increateServiceService;
/// <summary> /// <summary>
/// 搜索任务列表 /// 搜索任务列表
/// </summary> /// </summary>
@ -366,17 +348,35 @@ namespace BBWY.Client.ViewModels.PackTask
} }
else else
{ {
App.Current.Dispatcher.BeginInvoke(new Action(() => //App.Current.Dispatcher.BeginInvoke(new Action(() =>
{ //{
new TipsWindow("查不到数据").Show(); // new TipsWindow("查不到数据").Show();
})); //}));
} }
IsLoadCount(); IsLoadCount();
IsLoading = false; IsLoading = false;
}); });
} }
private void IsLoadCount()
{
var packTaskResult = packTaskService.GetWareAllCount();
if (packTaskResult != null && packTaskResult.Success)
{
App.Current.Dispatcher.Invoke(() =>
{
ArrivedCount = packTaskResult.Data.ArrivedCount;
NoArrivedCount = packTaskResult.Data.NoArrivedCount;
SomeArrivedCount = packTaskResult.Data.SomeArrivedCount;
WorryCount = packTaskResult.Data.WorryCount;
});
}
}
private void LoadIndex(int pageIndex)
{
PageIndex = pageIndex;//
SearchTaskList();
}
private void OpenSkuDetail(object param) private void OpenSkuDetail(object param)
{ {

93
BBWY.Client/Views/PackTask/BarcodeControl.xaml

@ -0,0 +1,93 @@
<UserControl x:Class="BBWY.Client.Views.PackTask.BarcodeControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="20"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
Background="{StaticResource Border.Background}">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
<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">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock>
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</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 BarCodeData.SkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock>
</StackPanel>
</Border>
<Border Name="biaozhun" Visibility="{Binding BarCodeData.LabelModel,Converter={StaticResource objConverter},ConverterParameter=标准模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding BarCodeData.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BarCodeData.BrandName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="型号:"/>
<Run Text="{Binding BarCodeData.ProductNo}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding BarCodeData.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 BarCodeData.SkuId}"/>
</TextBlock>
</StackPanel>
</Border>
<Border Name="wuxinghao" Visibility="{Binding BarCodeData.LabelModel,Converter={StaticResource objConverter},ConverterParameter=无型号模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding BarCodeData.Brand}"/>
</TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BarCodeData.BrandName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding BarCodeData.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 BarCodeData.SkuId}"/>
</TextBlock>
</StackPanel>
</Border>
</DockPanel>
</Grid>
</UserControl>

53
BBWY.Client/Views/PackTask/BarcodeControl.xaml.cs

@ -0,0 +1,53 @@
using BBWY.Client.Models;
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BBWY.Client.Views.PackTask
{
/// <summary>
/// BarcodeControl.xaml 的交互逻辑
/// </summary>
public partial class BarcodeControl : UserControl
{
public BarcodeControl()
{
InitializeComponent();
this.DataContext = this.BarCodeData;
}
/// <summary>
///
/// </summary>
public BarCodeModel BarCodeData
{
get { return (BarCodeModel)GetValue(BarCodeDataProperty); }
set
{
SetValue(BarCodeDataProperty, value);
}
}
public static readonly DependencyProperty BarCodeDataProperty =
DependencyProperty.Register("BarCodeData", typeof(BarCodeModel), typeof(BarcodeControl), new PropertyMetadata(ChangedProperty));
private static void ChangedProperty(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
var control = d as BarcodeControl;
var data = e.NewValue as BarCodeModel;
}
}
}

113
BBWY.Client/Views/PackTask/CerControl.xaml

@ -0,0 +1,113 @@
<UserControl x:Class="BBWY.Client.Views.PackTask.CerControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
mc:Ignorable="d"
d:DesignHeight="340" d:DesignWidth="382">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
Background="{StaticResource Border.Background}">
<TextBlock Text="查看合格证" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
<DockPanel Grid.Row="1">
<Border Name="no3c" Visibility="{Binding CerData.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" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.Brand}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65,0,0"/>
<TextBlock Text="型号:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,70,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.ProductNo}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,65,0,0"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,112,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.BrandName}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,107,0,0"/>
<TextBlock Text="材质:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,112,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.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 CerData.ExcuteStander}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.ProductShop}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,246,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" TextWrapping ="Wrap" AcceptsReturn="True"
Height="44" Text="{Binding CerData.ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
<Border Name="is3c" Visibility="{Binding CerData.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" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding CerData.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" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding CerData.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" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding CerData.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" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.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 CerData.ExcuteStander}" Height="40" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,153,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding CerData.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" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" TextWrapping ="Wrap" AcceptsReturn="True" Text="{Binding CerData.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" />-->
<TextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding CerData.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 CerData.LabelModel,Converter={StaticResource objConverter}, ConverterParameter=无型号: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" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.Brand}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65,0,0"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,70,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.BrandName}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="233,65,0,0"/>
<TextBlock Text="材质:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,112,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.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 CerData.ExcuteStander}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,148,0,0"/>
<TextBlock Text="生产商:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="19,206,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" Height="25" Text="{Binding CerData.ProductShop}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,201,0,0"/>
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,246,0,0" />
<TextBox IsReadOnly="True" BorderBrush="Transparent" TextWrapping ="Wrap" AcceptsReturn="True"
Height="44" Text="{Binding CerData.ProductAdress}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
</DockPanel>
</Grid>
</UserControl>

56
BBWY.Client/Views/PackTask/CerControl.xaml.cs

@ -0,0 +1,56 @@
using BBWY.Client.Models;
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
namespace BBWY.Client.Views.PackTask
{
/// <summary>
/// CerControl.xaml 的交互逻辑
/// </summary>
public partial class CerControl : UserControl
{
public CerControl()
{
InitializeComponent();
this.DataContext = CerData;
}
/// <summary>
///
/// </summary>
public CertificateModel CerData
{
get { return (CertificateModel)GetValue(CerDataProperty); }
set
{
SetValue(CerDataProperty, value);
}
}
public static readonly DependencyProperty CerDataProperty =
DependencyProperty.Register("CerData", typeof(CertificateModel), typeof(CerControl), new PropertyMetadata(ChangedProperty));
private static void ChangedProperty(DependencyObject d, DependencyPropertyChangedEventArgs e)
{
//var control = d as CerControl;
//var data = e.NewValue as CertificateModel;
//if (data != null)
//{
// control.SetData(data);
//}
}
}
}

35
BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml

@ -17,12 +17,11 @@
MinButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0" RightButtonGroupMargin="0,5,5,0"
ResizeMode="NoResize" Title="LookBarCodeWindow"
> >
<!-- DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"--> <!-- DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"-->
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="20"/> <RowDefinition Height="20"/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -30,8 +29,8 @@
Background="{StaticResource Border.Background}"> Background="{StaticResource Border.Background}">
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border> </Border>
<Grid Grid.Row="1"> <DockPanel Grid.Row="1">
<Border Name="jingjian" Visibility="Visible" 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" >
<Run Text="品名:"/> <Run Text="品名:"/>
@ -47,8 +46,7 @@
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Border> </Border>
<Border Name="biaozhun" Visibility="{Binding LabelModel,Converter={StaticResource objConverter},ConverterParameter=标准模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<Border Name="biaozhun" Visibility="Collapsed" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
@ -77,9 +75,32 @@
</StackPanel> </StackPanel>
</Border> </Border>
<Border Name="wuxinghao" Visibility="{Binding LabelModel,Converter={StaticResource objConverter},ConverterParameter=无型号模板:Visible:Collapsed}" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="1">
<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>
</Grid>
</StackPanel>
</Border>
</DockPanel>
</Grid> </Grid>

18
BBWY.Client/Views/PackTask/LookBarCodeWindow.xaml.cs

@ -19,22 +19,14 @@ namespace BBWY.Client.Views.PackTask
/// </summary> /// </summary>
public partial class LookBarCodeWindow : BWindow public partial class LookBarCodeWindow : BWindow
{ {
public LookBarCodeWindow(BarCodeModel BarCodeModel) public LookBarCodeWindow()
{ {
InitializeComponent(); InitializeComponent();
}
public void SetData(BarCodeModel BarCodeModel)
{
this.DataContext = BarCodeModel; this.DataContext = BarCodeModel;
if (BarCodeModel.LabelModel==BarcodeLabelModel.barsimplify)
{//精简版
jingjian.Visibility = Visibility.Visible;
biaozhun.Visibility = Visibility.Collapsed;
}
else
{
jingjian.Visibility = Visibility.Collapsed;
biaozhun.Visibility = Visibility.Visible;
}
} }
} }
} }

36
BBWY.Client/Views/PackTask/LookCerWindow.xaml

@ -30,9 +30,8 @@
<TextBlock Text="查看合格证" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="查看合格证" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border> </Border>
<Grid Grid.Row="1"> <DockPanel Grid.Row="1">
<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">
<Border Name="no3c" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid> <Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12,0,0" /> <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12,0,0" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70,0,0" /> <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70,0,0" />
@ -62,7 +61,7 @@
</Grid> </Grid>
</Border> </Border>
<Border Name="is3c" Visibility="Collapsed" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="1" VerticalAlignment="Top" HorizontalAlignment="Left"> <Border Name="is3c" 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 > <Grid >
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" /> <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" /> <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />
@ -94,7 +93,34 @@
</Grid> </Grid>
</Border> </Border>
</Grid> <Border Name="noxinghao" Visibility="{Binding LabelModel,Converter={StaticResource objConverter}, ConverterParameter=无型号: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" />
<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 ExcuteStander}" 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>
</DockPanel>
</Grid> </Grid>

13
BBWY.Client/Views/PackTask/LookCerWindow.xaml.cs

@ -58,20 +58,7 @@ namespace BBWY.Client.Views.PackTask
sb.Remove(sb.Length - 3, 3); sb.Remove(sb.Length - 3, 3);
data.ExcuteStander = sb.ToString(); data.ExcuteStander = sb.ToString();
} }
this.DataContext = data; this.DataContext = data;
if (data.IsLogo == 0)
{
is3c.Visibility = Visibility.Collapsed;
no3c.Visibility = Visibility.Visible;
}
else
{
is3c.Visibility = Visibility.Visible;
no3c.Visibility = Visibility.Collapsed;
}
} }
} }
} }

130
BBWY.Client/Views/PackTask/PrintWindow.xaml

@ -36,9 +36,14 @@
<ComboBox x:Name="cbPrints" Margin="81,23,0,0" Width="197" Height="25" VerticalAlignment="Top" HorizontalAlignment="Left" /> <ComboBox x:Name="cbPrints" Margin="81,23,0,0" Width="197" Height="25" VerticalAlignment="Top" HorizontalAlignment="Left" />
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Margin="41,70,0,0" Width="30" Height="15" 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"/> <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" > <Grid Name="bar" Visibility="Collapsed" Grid.Row="1" >
<Border Name="jingjian" Visibility="Visible" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Width="371" Margin="38,113,38,29"> <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" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/> <Run Text="品名:"/>
@ -54,7 +59,7 @@
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Border> </Border>
<Border Name="biaozhun" Visibility="Collapsed" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Width="371" Height="240" Margin="5"> <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" > <StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" > <TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/> <Run Text="品牌:"/>
@ -78,10 +83,35 @@
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</Border> </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>
</StackPanel>
</Border>
</Grid> </Grid>
<Grid x:Name="cer" Grid.Row="1"> <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">
<Border Name="no3c" Visibility="Collapsed" BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="33,110,0,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid> <Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" /> <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70" /> <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70" />
@ -136,6 +166,69 @@
<TextBlock Text="地址:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,246,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"/> <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">
<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 ExcuteStander}" 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" 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,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 ExcuteStander}" 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" />--> <!--<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"/> <c:BTextBox IsReadOnly="True" BorderBrush="Transparent" Text="{Binding FactoryNumber}" Height="25" Width="100" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="259,55,0,0"/>
@ -143,6 +236,35 @@
</Grid> </Grid>
</Border> </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">
<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 ExcuteStander}" 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>
</Grid> </Grid>

203
BBWY.Client/Views/PackTask/PrintWindow.xaml.cs

@ -1,12 +1,15 @@
using BBWY.Client.Helpers; using BBWY.Client.Helpers;
using BBWY.Client.Models; using BBWY.Client.Models;
using BBWY.Controls; using BBWY.Controls;
using NPOI.SS.UserModel;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Printing; using System.Drawing.Printing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Printing;
using System.Runtime.ConstrainedExecution;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
@ -17,7 +20,9 @@ using System.Windows.Input;
using System.Windows.Interop; using System.Windows.Interop;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Media.Imaging; using System.Windows.Media.Imaging;
using System.Windows.Media.Media3D;
using System.Windows.Shapes; using System.Windows.Shapes;
using System.Drawing.Printing;
namespace BBWY.Client.Views.PackTask namespace BBWY.Client.Views.PackTask
{ {
@ -29,13 +34,20 @@ namespace BBWY.Client.Views.PackTask
public PrintWindow() public PrintWindow()
{ {
InitializeComponent(); InitializeComponent();
LoadPrints();
}
/// <summary>
/// 获取打印机名称
/// </summary>
private void LoadPrints()
{
var printingNames = PrinterSettings.InstalledPrinters;//获取本机的打印机数据 var printingNames = PrinterSettings.InstalledPrinters;//获取本机的打印机数据
int index = -1; int index = -1;
int selectIndex = 0; int selectIndex = 0;
foreach (string name in printingNames) foreach (string name in printingNames)
{ {
if (name== "Microsoft XPS Document Writer"||name== "Microsoft Print to PDF"||name== "Fax") if (name == "Microsoft XPS Document Writer" || name == "Microsoft Print to PDF" || name == "Fax")
{ {
continue; continue;
} }
@ -46,125 +58,77 @@ namespace BBWY.Client.Views.PackTask
} }
cbPrints.Items.Add(name); cbPrints.Items.Add(name);
} }
if (cbPrints.Items.Count>selectIndex) if (cbPrints.Items.Count > selectIndex)
{ {
cbPrints.SelectedIndex = selectIndex; cbPrints.SelectedIndex = selectIndex;
} }
} }
/// <summary> /// <summary>
/// 加载预览打印数据 /// 加载预览打印数据
/// </summary> /// </summary>
public void LoadData() public void LoadData()
{ {
if (CertificateModel==null) // PrintData data = new PrintData();
{ if (CertificateModel != null)
cer.Visibility = Visibility.Collapsed;
}
else
{
cer.Visibility = Visibility.Visible;
bar.Visibility = Visibility.Collapsed;
CertificateModel data = new CertificateModel
{
Brand = CertificateModel.Brand,
BrandName = CertificateModel.BrandName,
ExcuteStander = CertificateModel.ExcuteStander,
FactoryNumber = CertificateModel.FactoryNumber,
IsLogo =CertificateModel.IsLogo,
LabelModel = CertificateModel.LabelModel,
ProductAdress = CertificateModel.ProductAdress,
Id = CertificateModel.Id,
ProductDate = CertificateModel.ProductDate,
ProductNo = CertificateModel.ProductNo,
ProductShop = CertificateModel.ProductShop,
Shader = CertificateModel.Shader,
SkuId = CertificateModel.SkuId,
Reseller = CertificateModel.Reseller
};
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;
if (data.IsLogo == 0)
{
is3c.Visibility = Visibility.Collapsed;
no3c.Visibility = Visibility.Visible;
}
else
{
is3c.Visibility = Visibility.Visible;
no3c.Visibility = Visibility.Collapsed;
}
}
if (BarCodeModel == null)
{ {
this.DataContext = CertificateModel;
bar.Visibility = Visibility.Collapsed; bar.Visibility = Visibility.Collapsed;
cer.Visibility = Visibility.Visible;
} }
else
if (BarCodeModel != null)
{ {
bar.Visibility = Visibility.Visible;
cer.Visibility = Visibility.Collapsed;
this.DataContext = BarCodeModel; this.DataContext = BarCodeModel;
if (BarCodeModel.LabelModel == BarcodeLabelModel.barsimplify) cer.Visibility = Visibility.Collapsed;
{//精简版 bar.Visibility = Visibility.Visible;
jingjian.Visibility = Visibility.Visible;
biaozhun.Visibility = Visibility.Collapsed;
}
else
{
jingjian.Visibility = Visibility.Collapsed;
biaozhun.Visibility = Visibility.Visible;
}
} }
} }
public CertificateModel CertificateModel { get; set; } public CertificateModel CertificateModel { get; set; }
public BarCodeModel BarCodeModel { get; set; } public BarCodeModel BarCodeModel { get; set; }
private void BButton_Click(object sender, RoutedEventArgs e) private void BButton_Click(object sender, RoutedEventArgs e)
{ {
int printCount = 0;
int printCount = Convert.ToInt32(tbCount.Text);
string printName = cbPrints.Text;//选择的要打印的打印机名称
Task.Factory.StartNew(() => {
try try
{ {
PrintDocument pd = new PrintDocument(); printCount = Convert.ToInt32(tbCount.Text);
PrintDocument document = new PrintDocument();
document.PrinterSettings.PrinterName = printName;
document.PrintPage += Document_PrintPage;
document.PrinterSettings.Copies = (short)printCount;//打印份数
document.Print();
} }
catch (Exception ex) catch
{
new TipsWindow("请输入打印份数", 1).ShowDialog();
return;
}
string printName = cbPrints.Text;//选择的要打印的打印机名称
Task.Factory.StartNew(() =>
{ {
App.Current.Dispatcher.Invoke(() => { try
{
PrintDocument document = new PrintDocument();
document.PrinterSettings.PrinterName = printName;//使用打印机名称,指定特定的打印机进行打印。
//设置打印页面
//document.DefaultPageSettings.PaperSize = new System.Drawing.Printing.PaperSize("Custom", 236, 157);
document.PrintPage += Document_PrintPage;
document.PrinterSettings.Copies = (short)printCount;//打印份数
document.Print();
}
catch (Exception ex)
{
App.Current.Dispatcher.Invoke(() =>
{
new TipsWindow("打印失败").ShowDialog(); new TipsWindow("打印失败").ShowDialog();
}); });
} }
}); });
} }
@ -175,41 +139,52 @@ namespace BBWY.Client.Views.PackTask
//RectangleF bounds = new RectangleF(0, 0, 236, 157); //RectangleF bounds = new RectangleF(0, 0, 236, 157);
//args.Graphics.SetClip(bounds);//设置打印区域 //args.Graphics.SetClip(bounds);//设置打印区域
//设置 打印纸张类型
//var paperSizes = args.PageSettings.PrinterSettings.PaperSizes;
//foreach (System.Drawing.Printing.PaperSize item in paperSizes)
//{
// if (item.Height==157)
// {
// args.PageSettings.PaperSize=item;
// break;
// }
//}
//var sss = args.PageSettings.PaperSize;
//默认设置 打印类型
#if DEBUG
//打印 纵向打印 会模糊
args.PageSettings.PrinterSettings.DefaultPageSettings.PaperSize = new System.Drawing.Printing.PaperSize("Custom", 236, 157);
args.PageSettings.PrinterSettings.DefaultPageSettings.Landscape = true;
#endif
Font font = new Font("宋体", 6, System.Drawing.FontStyle.Regular); Font font = new Font("宋体", 6, System.Drawing.FontStyle.Regular);
if (BarCodeModel != null) if (BarCodeModel != null)
{ {
MyPrintHelper.PrintBarcode(ref args, BarCodeModel, font); MyPrintHelper.PrintBarcode(ref args, BarCodeModel, font);
} }
if (CertificateModel !=null) if (CertificateModel != null)
{ {
MyPrintHelper.PrintCertificate(ref args, CertificateModel, font); MyPrintHelper.PrintCertificate(ref args, CertificateModel, font);
} }
}
}
}
public class PrintData
{
public CertificateModel CertificateModel { get; set; }
public BarCodeModel BarCodeModel { get; set; }
/// <summary>
/// 打印条形码
/// </summary>
//private void PrintBarCode(string labelPath,int printNums,string PrintName)
//{
// BartenderHelper helper = new BartenderHelper();
// string msg = "";
// // File.AppendAllText("c:/1.txt", $"{PrintName}开始打印{printNums}份,{labelPath}");
// helper.BTPrint(labelPath, Datas, out msg, printNums, PrintName);
// // File.AppendAllText("c:/1.txt", "结束打印");
// //File.AppendAllText("c:/1.txt", msg);
// if (msg == "OK")
// {
// return;
// }
// App.Current.Dispatcher.Invoke(new Action(() => {
// new TipsWindow(msg).ShowDialog();//打印失败提示
// }));
//}
} }
} }

48
BBWY.Client/Views/PackTask/SetBarCode.xaml

@ -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="400" Width="600" Height="651" Width="577"
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"
xmlns:cmodel="clr-namespace:BBWY.Client.Models" xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@ -19,7 +19,7 @@
MaxButtonVisibility="Collapsed" MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0"> RightButtonGroupMargin="0,5,5,0">
<!-- DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"--> <!-- DataContext="{Binding CreateSetBarCodeView,Source={StaticResource Locator}}"-->
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
<RowDefinition/> <RowDefinition/>
@ -31,17 +31,19 @@
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
<!--{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}--> <!--{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}-->
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.barsimplify}}" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.barsimplify}" Content="精简" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/> <RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.精简模板}}" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}" Content="精简" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5"> <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<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" >
<Run Text="品名:"/> <Run Text="品名:"/>
<Run Text="{Binding BarCodeModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Run Text="{Binding BarCodeModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@ -63,9 +65,8 @@
</Border> </Border>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" > <StackPanel Grid.Column="1" Orientation="Vertical" >
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.barstander}}" Content="标准" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.barstander}" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/> <RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.标准模板}}" Content="标准" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.标准模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5"> <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<StackPanel Orientation="Vertical" > <StackPanel Orientation="Vertical" >
@ -93,6 +94,37 @@
</StackPanel>
</Border>
</StackPanel>
<StackPanel Grid.Column="0" Grid.Row="1" Orientation="Vertical" >
<RadioButton GroupName="bar" IsChecked="{Binding BarCodeModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:BarcodeLabelModel.无型号模板}}" Content="无型号" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.无型号模板}" Margin="10,10,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="220" Margin="5">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品牌:"/>
<Run Text="{Binding BarCodeModel.Brand}"/>
</TextBlock>
<TextBlock Margin="10,20,10,10" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BarCodeModel.BrandName}"/>
</TextBlock>
<TextBlock Margin="10" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding BarCodeModel.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 BarCodeModel.SkuId}"/>
</TextBlock>
</StackPanel> </StackPanel>
</Border> </Border>

38
BBWY.Client/Views/PackTask/SetCerWindow.xaml

@ -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="500" Width="960" Height="799" Width="820"
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"
xmlns:cmodel="clr-namespace:BBWY.Client.Models" xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@ -31,15 +31,18 @@
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid > <Grid >
<!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=0:true:false}"--> <!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=0:true:false}"-->
<RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.No3C}}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CertificateLabelModel.No3C}" Content="标准" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/> <RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.标准无3c}}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CertificateLabelModel.标准无3c}" Content="标准" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50" VerticalAlignment="Top" HorizontalAlignment="Left"> <Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50,13,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid> <Grid>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" /> <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70" /> <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,70" />
@ -60,12 +63,11 @@
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
<Grid Grid.Column="1" > <Grid Grid.Column="1" >
<!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}"--> <!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=1:true:false}"-->
<RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.Is3C}}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CertificateLabelModel.Is3C}" Content="带3c标" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/> <RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.标准有3c}}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CertificateLabelModel.标准有3c}" Content="带3c标" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50" VerticalAlignment="Top" HorizontalAlignment="Left"> <Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50,13,0" VerticalAlignment="Top" HorizontalAlignment="Left">
<Grid > <Grid >
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" /> <TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" Text="合格证" FontSize="18" Margin="157,12" />
<TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" /> <TextBlock Text="品牌:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="33,90" />
@ -92,8 +94,30 @@
</Grid> </Grid>
<Grid Grid.Row="1">
<!--IsChecked="{Binding CertificateModel.IsLogo,Converter={StaticResource objConverter},ConverterParameter=0:true:false}"-->
<RadioButton GroupName="cer" IsChecked="{Binding CertificateModel.LabelModel,Converter={StaticResource enumToBooleanConverter},ConverterParameter={x:Static cmodel:CertificateLabelModel.无型号}}" Command="{Binding CerLabelCheckCommand}" CommandParameter="{x:Static cmodel:CertificateLabelModel.无型号}" Content="无型号" Margin="10,20,0,0" Height="30" VerticalAlignment="Top"/>
<Border BorderBrush="Black" BorderThickness="1" Width="380" Height="297" Margin="13,50,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 CertificateModel.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,65"/>
<TextBlock Text="品名:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="203,70,0,0" />
<c:BTextBox Height="25" Text="{Binding CertificateModel.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 CertificateModel.Shader,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="126" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,108,0,0"/>
<TextBlock Text="执行标准:" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="9,166,0,0" />
<c:BTextBox WaterRemark="如多个标准请使用逗号分隔" Height="25" Text="{Binding CertificateModel.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 CertificateModel.ProductShop,Mode=TwoWay,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 CertificateModel.ProductAdress,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Width="296" VerticalAlignment="Top" HorizontalAlignment="Left" Margin="63,241,0,0"/>
</Grid>
</Border>
</Grid>
</Grid> </Grid>

4
BBWY.Client/Views/PackTask/TaskListControl.xaml

@ -109,9 +109,9 @@
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" 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 TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,7,0"/>
<Label Width="94" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskStatus}" Foreground="White" Background="{Binding TaskStatus,Converter={StaticResource objConverter} , ConverterParameter=未完成:#facd91:#02a7f0 }" Margin="5,0,0,0"/> <Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskStatus}" Foreground="White" Background="{Binding TaskStatus,Converter={StaticResource objConverter} , ConverterParameter=未完成:#facd91:#02a7f0 }" Margin="5,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding DepartmentName}" Margin="5,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="{Binding DepartmentName}" Margin="5,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />

4
BBWY.Client/Views/PackTask/WareHouseListControl.xaml

@ -109,9 +109,9 @@
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" 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 TaskId}" CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/> Margin=" 5,0,7,0"/>
<Label Width="94" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskStatus}" Foreground="White" Background="{Binding TaskStatus,Converter={StaticResource objConverter} , ConverterParameter=未完成:#facd91:#02a7f0 }" Margin="5,0,0,0"/> <Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskStatus}" Foreground="White" Background="{Binding TaskStatus,Converter={StaticResource objConverter} , ConverterParameter=未完成:#facd91:#02a7f0 }" Margin="5,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" /> <TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center" <c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Left" VerticalAlignment="Center"

Loading…
Cancel
Save