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

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
a559b3023a
commit
d58a2fefae
11 changed files with 206 additions and 371 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 417
      BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs
  2. 2
      BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
  3. 2
      BBWY.Client/Models/Enums.cs
  4. 2
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  5. 36
      BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
  6. 9
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  7. 14
      BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
  8. 21
      BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
  9. 52
      BBWY.Client/Views/PackTask/TaskListControl.xaml
  10. 14
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml

417
BBWY.Client/Models/APIModel/Response/PackTask/PackTaskResultResponse.cs
View File

@ -6,429 +6,168 @@ using WebSocketSharp;
namespace BBWY.Client.Models.APIModel.Response.PackTask namespace BBWY.Client.Models.APIModel.Response.PackTask
{ {
public class PackTaskResultResponse //public class PackTaskResultResponse
{
/// <summary>
/// 查询总数据(判断总页数)
/// </summary>
public int TotalCount { get; set; }
/// <summary>
/// 页面返回的数据
/// </summary>
public GetPackTaskDTO[] Items { get; set; }
}
public class GetPackTaskDTO
{
/// <summary>
/// SKU标题
/// </summary>
public string SkuName { get; set; }
/// <summary>
/// 图片链接
/// </summary>
public string Logo { get; set; }
/// <summary>
/// 任务id
/// </summary>
public long TaskId { get; set; }
/// <summary>
/// 需求方创建日期
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 任务状态（未完成=0,已完成=1，）
/// </summary>
public int TaskStatus { get; set; }
/// <summary>
/// 需求方团队
/// </summary>
public string DepartmentName { get; set; }
/// <summary>
/// 需求方店铺
/// </summary>
public string ShopName { get; set; }
/// <summary>
/// 货号
/// </summary>
public string ProductItemNum { get; set; }
/// <summary>
/// 货号品名
/// </summary>
public string BrandName { get; set; }
/// <summary>
/// 对接人
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 打包人
/// </summary>
public string[] PackUserName { get; set; }
/// <summary>
/// skuid
/// </summary>
public string SkuId { get; set; }
/// <summary>
/// sku数量
/// </summary>
public int SkuCount { get; set; }
/// <summary>
/// 打包类型（单件=0，多件=1）
/// </summary>
public int PackType { get; set; }
/// <summary>
/// 落仓(商家仓=0，云仓=1，京仓=2,3=聚水潭)
/// </summary>
public int PositionType { get; set; }
/// <summary>
/// 基础包装（快递袋=0，纸箱=1，麻袋=2）
/// </summary>
public int BasicPack { get; set; }
/// <summary>
/// 增量1()
/// </summary>
public string Increment1 { get; set; }
/// <summary>
/// 增量2()
/// </summary>
public int? Increment2 { get; set; }
/// <summary>
/// 工序道数
/// </summary>
public int? ProcessCount { get; set; }
/// <summary>
/// 到货情况(待收货=0，部分收货=1，已到货=2)
/// </summary>
public int Availability { get; set; }
//todo: 条形码数据 合格证数据
///// <summary>
///// 打包费用
///// </summary>
//public FeesItemTypeDTO FeesItemTypeDTO { get; set; }
/// <summary>
///
/// </summary>
public FeesItemResponse FeesItemResponse { get; set; }
/// <summary>
/// 合格证位置（外部包装=0，产品包装=1）
/// </summary>
public int? CertificatePosition { get; set; }
/// <summary>
/// 箱子耗材（自带=0，4-13号纸箱=1-10，）
/// </summary>
public int? BoxConsumables { get; set; }
/// <summary>
/// sku配件名称
/// </summary>
public string SkuGoodsTitle { get; set; }
/// <summary>
/// 配件数
/// </summary>
public int GoodsNumber { get; set; }
/// <summary>
/// 气泡纸耗材（长=0，宽=1）
/// </summary>
public int? AirConsumables { get; set; }
/// <summary>
/// 注意事项（对接备注）
/// </summary>
public string MarkMessage { get; set; }
public BarCodeModel BarCodeDTO { get; set; }
public CertificateModel[] cers { get; set; }
/// <summary>
/// 是否加急
/// </summary>
public int IsWorry { get; set; }
/// <summary>
/// 品牌
/// </summary>
public string Brand { get; set; }
public string OrderId { get; set; }
}
//public class FeesItemTypeDTO :NotifyObject
//{ //{
// private bool isPaperBox;
// public bool IsPaperBox { get => isPaperBox; set { Set(ref isPaperBox, value); } }
// private bool isBoxNumber;
// public bool IsBoxNumber { get => isBoxNumber; set { Set(ref isBoxNumber, value); } }
// private bool isAcceptGoods;
// public bool IsAcceptGoods { get=>isAcceptGoods; set { Set(ref isAcceptGoods, value); } }
// private bool isSendGoods;
// /// <summary> // /// <summary>
// /// 装箱 送货 // /// 查询总数据(判断总页数)
// /// </summary> // /// </summary>
// public bool IsSendGoods { get=> isSendGoods; set { Set(ref isSendGoods, value); } } // public int TotalCount { get; set; }
// private bool isRuturnGoods;
// /// <summary> // /// <summary>
// /// 退货质检 // /// 页面返回的数据
// /// </summary> // /// </summary>
// public bool IsRuturnGoods { get => isRuturnGoods; set { Set(ref isRuturnGoods, value); } } // public GetPackTaskDTO[] Items { get; set; }
//}
// private bool isUpdatePack; //public class GetPackTaskDTO
//{
// /// <summary> // /// <summary>
// /// 更换包装 // /// SKU标题
// /// </summary> // /// </summary>
// public bool IsUpdatePack { get => isUpdatePack; set { Set(ref isUpdatePack, value); } } // public string SkuName { get; set; }
// private bool isUnpacking;
// /// <summary> // /// <summary>
// /// 拆套 // /// 图片链接
// /// </summary> // /// </summary>
// public bool IsUnpacking { get => isUnpacking; set { Set(ref isUnpacking, value); } } // public string Logo { get; set; }
// private bool isBasicPackFees;
// /// <summary> // /// <summary>
// /// 基础包装费 // /// 任务id
// /// </summary> // /// </summary>
// public bool IsBasicPackFees { get => isBasicPackFees; set { Set(ref isBasicPackFees, value); } } // public long TaskId { get; set; }
// private bool isBoxPackFees;
// /// <summary> // /// <summary>
// /// 箱子包装费 // /// 需求方创建日期
// /// </summary> // /// </summary>
// public bool IsBoxPackFees { get => isBoxPackFees; set { Set(ref isBoxPackFees, value); } } // public DateTime CreateTime { get; set; }
// private bool isExpressPackFees;
// /// <summary> // /// <summary>
// /// 快递袋包装费 // /// 任务状态（未完成=0,已完成=1，）
// /// </summary> // /// </summary>
// public bool IsExpressPackFees { get => isExpressPackFees; set { Set(ref isExpressPackFees, value); } } // public int TaskStatus { get; set; }
// private bool isExpressCloseSideFees;
// /// <summary> // /// <summary>
// /// 快递袋封边 // /// 需求方团队
// /// </summary> // /// </summary>
// public bool IsExpressCloseSideFees { get => isExpressCloseSideFees; set { Set(ref isExpressCloseSideFees, value); } } // public string DepartmentName { get; set; }
// private bool isAirPaperPackFees;
// /// <summary> // /// <summary>
// /// 气泡纸包装费 // /// 需求方店铺
// /// </summary> // /// </summary>
// public bool IsAirPaperPackFees { get => isAirPaperPackFees; set { Set(ref isAirPaperPackFees, value); } } // public string ShopName { get; set; }
// private bool isAirBagPackFees;
// /// <summary> // /// <summary>
// /// 气泡袋包装费 // /// 货号
// /// </summary> // /// </summary>
// public bool IsAirBagPackFees { get => isAirBagPackFees; set { Set(ref isAirBagPackFees, value); } } // public string ProductItemNum { get; set; }
// private bool isPOPBagPackFees;
// /// <summary> // /// <summary>
// /// POP包装费 // /// 货号品名
// /// </summary> // /// </summary>
// public bool IsPOPBagPackFees { get => isPOPBagPackFees; set { Set(ref isPOPBagPackFees, value); } } // public string BrandName { get; set; }
// private bool isTapePackFees;
// /// <summary> // /// <summary>
// /// 胶带工序 // /// 对接人
// /// </summary> // /// </summary>
// public bool IsTapePackFees { get => isTapePackFees; set { Set(ref isTapePackFees, value); } } // public string UserName { get; set; }
// private bool isIncreateGoods;
// /// <summary> // /// <summary>
// ///增量配件 // /// 打包人
// /// </summary> // /// </summary>
// public bool IsIncreateGoods { get => isIncreateGoods; set { Set(ref isIncreateGoods, value); } } // public string[] PackUserName { get; set; }
// private bool isAirPaper;
// /// <summary> // /// <summary>
// /// 气泡纸 // /// skuid
// /// </summary> // /// </summary>
// public bool IsAirPaper { get => isAirPaper; set { Set(ref isAirPaper, value); } } // public string SkuId { get; set; }
// private bool isTape;
// /// <summary> // /// <summary>
// /// 胶带 // /// sku数量
// /// </summary> // /// </summary>
// public bool IsTape { get => isTape; set { Set(ref isTape, value); } } // public int SkuCount { get; set; }
// public void SetAllVisitity()
// {
// IsPaperBox = SetVisitity( PaperBox);
// IsBoxNumber = SetVisitity(Convert.ToDecimal(BoxNumber) );
// IsAcceptGoods = SetVisitity(AcceptGoods);
// IsSendGoods = SetVisitity(SendGoods);
// IsRuturnGoods = SetVisitity(RuturnGoods);
// IsUpdatePack = SetVisitity(UpdatePack);
// IsUnpacking = SetVisitity(Unpacking);
// IsBasicPackFees = SetVisitity(BasicPackFees);
// IsBoxPackFees = SetVisitity(BoxPackFees );
// IsExpressPackFees = SetVisitity(ExpressPackFees);
// IsExpressCloseSideFees = SetVisitity(ExpressCloseSideFees );
// IsAirPaperPackFees = SetVisitity(AirPaperPackFees);
// IsAirBagPackFees = SetVisitity(AirBagPackFees);
// IsPOPBagPackFees = SetVisitity(POPBagPackFees);
// IsTapePackFees = SetVisitity(TapePackFees);
// IsIncreateGoods = SetVisitity(IncreateGoods);
// IsAirPaper = SetVisitity(AirPaper);
// IsTape = SetVisitity(Tape);
// }
// private bool SetVisitity( decimal? item )
// {
// if (item != null )
// {
// return false;
// }
// else
// {
// return true;// 无数据隐藏
// }
// }
// /// <summary> // /// <summary>
// /// 箱子价格 // /// 打包类型（单件=0，多件=1）
// /// </summary> // /// </summary>
// public decimal? PaperBox { get; set; } // public int PackType { get; set; }
// public decimal PaperBoxNo { get; set; }
// /// <summary> // /// <summary>
// /// 第几号箱子 // /// 落仓(商家仓=0，云仓=1，京仓=2,3=聚水潭)
// /// </summary> // /// </summary>
// public int BoxNumber { get; set; } // public int PositionType { get; set; }
// /// <summary> // /// <summary>
// /// 收货 卸货 // /// 基础包装（快递袋=0，纸箱=1，麻袋=2）
// /// </summary> // /// </summary>
// public decimal? AcceptGoods { get; set; } // public int BasicPack { get; set; }
// public decimal AcceptGoodsNo { get; set; }
// /// <summary> // /// <summary>
// /// 装箱 送货 // /// 增量1()
// /// </summary> // /// </summary>
// public decimal? SendGoods { get; set; } // public string Increment1 { get; set; }
// public decimal SendGoodsNo { get; set; }
// /// <summary>
// /// 退货质检
// /// </summary>
// public decimal? RuturnGoods { get; set; }
// public decimal RuturnGoodsNo { get; set; }
// /// <summary> // /// <summary>
// /// 更换包装 // /// 工序道数
// /// </summary> // /// </summary>
// public decimal? UpdatePack { get; set; } // public int? ProcessCount { get; set; }
// public decimal UpdatePackNo { get; set; }
// /// <summary> // /// <summary>
// /// 拆套 // /// 到货情况(待收货=0，部分收货=1，已到货=2)
// /// </summary> // /// </summary>
// public decimal? Unpacking { get; set; } // public int Availability { get; set; }
// public decimal UnpackingNo { get; set; }
// //todo: 条形码数据 合格证数据
// ///// <summary>
// ///// 打包费用
// ///// </summary>
// //public FeesItemTypeDTO FeesItemTypeDTO { get; set; }
// /// <summary> // /// <summary>
// /// 基础包装费 // ///
// /// </summary>
// public decimal? BasicPackFees { get; set; }
// public decimal BasicPackFeesNo { get; set; }
// /// <summary>
// /// 箱子包装费
// /// </summary>
// public decimal? BoxPackFees { get; set; }
// public decimal BoxPackFeesNo { get; set; }
// /// <summary>
// /// 快递袋包装费
// /// </summary>
// public decimal? ExpressPackFees { get; set; }
// public decimal ExpressPackFeesNo { get; set; }
// /// <summary>
// /// 快递袋封边
// /// </summary> // /// </summary>
// public decimal? ExpressCloseSideFees { get; set; } // public FeesItemResponse FeesItemResponse { get; set; }
// public decimal ExpressCloseSideFeesNo { get; set; }
// /// <summary> // /// <summary>
// /// 气泡纸包装费 // /// 合格证位置（外部包装=0，产品包装=1）
// /// </summary> // /// </summary>
// public decimal? AirPaperPackFees { get; set; } // public int? CertificatePosition { get; set; }
// public decimal AirPaperPackFeesNo { get; set; }
// /// <summary>
// /// 气泡袋包装费
// /// </summary>
// public decimal? AirBagPackFees { get; set; }
// public decimal AirBagPackFeesNo { get; set; }
// /// <summary> // /// <summary>
// /// POP包装费 // /// 箱子耗材（自带=0，4-13号纸箱=1-10，）
// /// </summary> // /// </summary>
// public decimal? POPBagPackFees { get; set; } // public int? BoxConsumables { get; set; }
// public decimal POPBagPackFeesNo { get; set; }
// /// <summary> // /// <summary>
// /// 胶带工序 // /// sku配件名称
// /// </summary> // /// </summary>
// public decimal? TapePackFees { get; set; } // public string SkuGoodsTitle { get; set; }
// public decimal TapePackFeesNo { get; set; }
// /// <summary> // /// <summary>
// ///增量配件 // /// 配件数
// /// </summary> // /// </summary>
// public decimal? IncreateGoods { get; set; } // public int GoodsNumber { get; set; }
// public decimal IncreateGoodsNo { get; set; }
// /// <summary> // /// <summary>
// /// 气泡纸 // /// 气泡纸耗材（长=0，宽=1）
// /// </summary> // /// </summary>
// public decimal? AirPaper { get; set; } // public int? AirConsumables { get; set; }
// public decimal AirPaperNo { get; set; }
// /// <summary> // /// <summary>
// /// 胶带 // /// 注意事项（对接备注）
// /// </summary> // /// </summary>
// public decimal? Tape { get; set; } // public string MarkMessage { get; set; }
// public decimal TapeNo { get; set; }
// public BarCodeModel BarCodeDTO { get; set; }
// public CertificateModel[] cers { get; set; }
// /// <summary> // /// <summary>
// /// 打包消耗的总费用(总数量) // /// 是否加急
// /// </summary> // /// </summary>
// public decimal AllPackFees { get; set; } // public int IsWorry { get; set; }
// /// <summary> // /// <summary>
// /// 总费用(单价) // /// 品牌
// /// </summary> // /// </summary>
// public decimal TotalFees { get; set; } // public string Brand { get; set; }
// public string OrderId { get; set; }
//} //}
} }

2
BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
View File

@ -472,7 +472,7 @@ namespace BBWY.Client.Models
BasicPack = (BasicPack)config.BasicPack; BasicPack = (BasicPack)config.BasicPack;
// Availability = (Availability)config.Availability; // Availability = (Availability)config.Availability;
MarkMessage = config.MarkMessage; MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value; CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无需合格证 : (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1; // Increment1 = config.Increment1;
string[] increateDatas = config.Increment1.Split(','); string[] increateDatas = config.Increment1.Split(',');

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

@ -283,7 +283,7 @@
{ {
外部包装 = 0, 外部包装 = 0,
产品包装 = 1, 产品包装 = 1,
无 = 2 无需合格证 = 2
} }
public enum Increment public enum Increment

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

@ -977,7 +977,7 @@ namespace BBWY.Client.ViewModels.PackTask
BasicPack = (BasicPack)config.BasicPack; BasicPack = (BasicPack)config.BasicPack;
//Availability = (Availability)config.Availability; //Availability = (Availability)config.Availability;
MarkMessage = config.MarkMessage; MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value; CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无需合格证 : (CertificatePosition)config.CertificatePosition.Value;
string[] increateDatas = config.Increment1.Split(','); string[] increateDatas = config.Increment1.Split(',');
bool isSelected = false; bool isSelected = false;

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

@ -60,7 +60,7 @@ namespace BBWY.Client.ViewModels.PackTask
private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> { private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> {
"无","外部包装","产品包装" "无需合格证","外部包装","产品包装"
}; };
public ObservableCollection<string> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } } public ObservableCollection<string> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } }
@ -424,6 +424,8 @@ namespace BBWY.Client.ViewModels.PackTask
return; return;
SkuId = skuid; SkuId = skuid;
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)
@ -453,8 +455,11 @@ namespace BBWY.Client.ViewModels.PackTask
if (TaskId <= 0) if (TaskId <= 0)
BrandName = productSku.Data.BrandName; BrandName = productSku.Data.BrandName;
CertificateModel = productSku.Data.Cers; CertificateModel = productSku.Data.Cers;
IsSetCertificate = false;
if (CertificateModel == null) if (CertificateModel == null)
{ {
IsSetCertificate = true;
CertificateModel = new CertificateModel[] { CertificateModel = new CertificateModel[] {
new CertificateModel{ } new CertificateModel{ }
}; };
@ -483,11 +488,9 @@ namespace BBWY.Client.ViewModels.PackTask
if (TaskId <= 0) if (TaskId <= 0)
{ {
IsNeedBarCode = Need.需要; IsNeedBarCode = Need.需要;
IsSetBarCode = true; IsSetBarCode = true;
IsSetCertificate = true;
} }
if (productSku.Data.PackConfig != null&&TaskId<=0) if (productSku.Data.PackConfig != null&&TaskId<=0)
{ {
@ -498,14 +501,14 @@ namespace BBWY.Client.ViewModels.PackTask
BasicPack = (BasicPack)config.BasicPack; BasicPack = (BasicPack)config.BasicPack;
//Availability = (TaskState)config.Availability; //Availability = (TaskState)config.Availability;
MarkMessage = config.MarkMessage; MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value; CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无需合格证 : (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1; // Increment1 = config.Increment1;
string[] increateDatas = config.Increment1.Split(','); string[] increateDatas = config.Increment1.Split(',');
IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要; IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要; IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
IsSetBarCode = !config.NeedBar; IsSetBarCode = !config.NeedBar;
IsSetCertificate = !config.NeedCer; //IsSetCertificate = config.CertificatePosition== (int)CertificatePosition.无需合格证;
bool isSelected = false; bool isSelected = false;
foreach (var item in increates) foreach (var item in increates)
@ -578,6 +581,9 @@ namespace BBWY.Client.ViewModels.PackTask
SpuId = string.Empty; SpuId = string.Empty;
if (model == null) if (model == null)
{ {
Availability = Availability.未到货;
CertificatePosition = CertificatePosition.外部包装;
SaveTask = "发布"; SaveTask = "发布";
TaskId = 0; TaskId = 0;
Logo = string.Empty; Logo = string.Empty;
@ -712,7 +718,6 @@ namespace BBWY.Client.ViewModels.PackTask
SkuId = SkuId, SkuId = SkuId,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
Increment1 = increateStr, Increment1 = increateStr,
//Increment2 = (int)Increment2,
CertificatePosition = (int)CertificatePosition, CertificatePosition = (int)CertificatePosition,
PackType = (int)PackType, PackType = (int)PackType,
MarkMessage = MarkMessage, MarkMessage = MarkMessage,
@ -725,6 +730,7 @@ namespace BBWY.Client.ViewModels.PackTask
NeedBar = IsNeedBarCode == Need.需要, NeedBar = IsNeedBarCode == Need.需要,
NeedCer = IsNeedCertificateModel == Need.需要 NeedCer = IsNeedCertificateModel == Need.需要
//IsWorry = IsWorry //IsWorry = IsWorry
}; };
if (IsNeedBarCode == Need.需要) if (IsNeedBarCode == Need.需要)
@ -736,15 +742,16 @@ namespace BBWY.Client.ViewModels.PackTask
} }
createTaskModel.BarCodeId = BarCodeModel.Id; createTaskModel.BarCodeId = BarCodeModel.Id;
} }
if (IsNeedCertificateModel == Need.需要) if (CertificatePosition != CertificatePosition.无需合格证)
{ {
if (CertificateModel == null || IsSetCertificate || CertificateModel.Count() <= 0) if (CertificateModel == null || IsSetCertificate || CertificateModel.Count() <= 0)
{ {
new TipsWindow("请设置合格证模板").Show(); MessageBox.Show ("请设置合格证模板","提示");
return; return;
} }
createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));// createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));//
} }
ApiResponse<object> res = null; ApiResponse<object> res = null;
if (TaskId > 0)//修改界面 if (TaskId > 0)//修改界面
{ {
@ -754,6 +761,17 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
res = packTaskService.CreateTask(createTaskModel); res = packTaskService.CreateTask(createTaskModel);
} }
if(res == null) {
MessageBox.Show("未知错误");
return;
}
if (!res .Success)
{
MessageBox.Show(res.Msg);
return;
}
if (res.Success) if (res.Success)
{ {
if (ReflashWindow != null) ReflashWindow();//刷新主界面 if (ReflashWindow != null) ReflashWindow();//刷新主界面

9
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
View File

@ -86,7 +86,7 @@ namespace BBWY.Client.ViewModels
private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> { private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> {
"无","外部包装","产品包装" "无需合格证","外部包装","产品包装"
}; };
public ObservableCollection<string> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } } public ObservableCollection<string> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } }
@ -375,7 +375,10 @@ namespace BBWY.Client.ViewModels
PurchaseService purchaseService; PurchaseService purchaseService;
public string OriginShopName { get; set; } public string OriginShopName { get; set; }
public string SkuPurchaseSchemeId { get; set; }
private string skuPurchaseSchemeId;
public string SkuPurchaseSchemeId { get => skuPurchaseSchemeId; set { Set(ref skuPurchaseSchemeId, value); } }
public Platform Platform { get; set; } public Platform Platform { get; set; }
public string ShopId { get; set; } public string ShopId { get; set; }
public long TaskId { get; set; } public long TaskId { get; set; }
@ -991,7 +994,7 @@ namespace BBWY.Client.ViewModels
GoodsNumber = 0; GoodsNumber = 0;
PackType = PackType.单件; PackType = PackType.单件;
BasicPack = BasicPack.快递袋; BasicPack = BasicPack.快递袋;
CertificatePosition = CertificatePosition.无; CertificatePosition = CertificatePosition.无需合格证;
IsNeedBarCode = Need.需要; IsNeedBarCode = Need.需要;
IsNeedCertificateModel = Need.不需要; IsNeedCertificateModel = Need.不需要;
} }

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

@ -167,7 +167,7 @@
<ColumnDefinition Width="90"/> <ColumnDefinition Width="90"/>
<ColumnDefinition Width="140"/> <ColumnDefinition Width="140"/>
<ColumnDefinition Width="86"/> <ColumnDefinition Width="86"/>
<ColumnDefinition Width="86"/> <ColumnDefinition Width="0" />
<ColumnDefinition Width="100"/> <ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -194,7 +194,7 @@
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="3" Text="基础包装"/> <TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="3" Text="基础包装"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="4" Text="增量耗材"/> <TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="4" Text="增量耗材"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="5" Text="条码标签"/> <TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="5" Text="条码标签"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="6" Text="合格证"/> <!--<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="6" Text="合格证" Visibility="Collapsed"/>-->
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="7" Text="合格证位置"/> <TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="7" Text="合格证位置"/>
@ -216,7 +216,7 @@
<Grid.Resources> <Grid.Resources>
</Grid.Resources> </Grid.Resources>
<hc:CheckComboBox BorderThickness="0" ShowSelectAllButton="False" IsTextSearchEnabled="True" ItemsSource="{Binding IncreateList}" <hc:CheckComboBox BorderThickness="0" ShowSelectAllButton="False" IsTextSearchEnabled="True" ItemsSource="{Binding IncreateList,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
ShowClearButton="True" ShowClearButton="True"
MinWidth="90" MinWidth="90"
Height="25" Height="25"
@ -224,13 +224,13 @@
<hc:CheckComboBox.ItemTemplate> <hc:CheckComboBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<StackPanel Orientation="Horizontal" Margin="5,2.5"> <StackPanel Orientation="Horizontal" Margin="5,2.5">
<CheckBox Content="{Binding IncreateName}" IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <CheckBox Content="{Binding IncreateName,Mode=TwoWay}" IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</hc:CheckComboBox.ItemTemplate> </hc:CheckComboBox.ItemTemplate>
<hc:CheckComboBox.ItemContainerStyle> <hc:CheckComboBox.ItemContainerStyle>
<Style TargetType="{x:Type hc:CheckComboBoxItem}" BasedOn="{StaticResource NoBgListBoxItemStyle}"> <Style TargetType="{x:Type hc:CheckComboBoxItem}" BasedOn="{StaticResource NoBgListBoxItemStyle}">
<Setter Property="IsSelected" Value="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/> <Setter Property="IsSelected" Value="{Binding IsSelected}"/>
</Style> </Style>
</hc:CheckComboBox.ItemContainerStyle> </hc:CheckComboBox.ItemContainerStyle>
</hc:CheckComboBox> </hc:CheckComboBox>
@ -241,11 +241,11 @@
</ComboBox> </ComboBox>
</Grid> </Grid>
<Grid Grid.Row="1" Grid.Column="6" > <!--<Grid Grid.Row="1" Grid.Column="6" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedCerList}" Text="{Binding IsNeedCertificateModel,Mode=TwoWay}"> <ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedCerList}" Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
</ComboBox> </ComboBox>
</Grid> </Grid>-->
<Grid Grid.Row="1" Grid.Column="7" > <Grid Grid.Row="1" Grid.Column="7" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding CertificatePositionList}" Text="{Binding CertificatePosition}"> <ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding CertificatePositionList}" Text="{Binding CertificatePosition}">

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

@ -76,6 +76,26 @@ namespace BBWY.Client.Views.PackTask
new TipsWindow("参数出错!请重新填写!").Show(); new TipsWindow("参数出错!请重新填写!").Show();
return; return;
} }
if ((item.CertificateModel.LabelModel == CertificateLabelModel.标准无3c || item.CertificateModel.LabelModel == CertificateLabelModel.标准有3c) && string.IsNullOrEmpty(item.CertificateModel.ProductNo))
{
MessageBox.Show("型号不能为空");
return;
}
if (item.CertificateModel.LabelModel == CertificateLabelModel.标准有3c && string.IsNullOrEmpty(item.CertificateModel.FactoryNumber))
{
MessageBox.Show("工厂编号不能为空");
return;
}
if (item.CertificateModel.LabelModel == CertificateLabelModel.适用年龄 && string.IsNullOrEmpty(item.CertificateModel.ApplyAge))
{
MessageBox.Show("适用年龄不能为空");
return;
}
var standers = item.CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries); var standers = item.CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
var resData = packTaskService.SaveCer(new CerRequest var resData = packTaskService.SaveCer(new CerRequest
@ -96,6 +116,7 @@ namespace BBWY.Client.Views.PackTask
ProduceDate = item.CertificateModel.ProduceDate, ProduceDate = item.CertificateModel.ProduceDate,
SaveType = SaveType.C端, SaveType = SaveType.C端,
}); });
if (resData == null) if (resData == null)
{ {

52
BBWY.Client/Views/PackTask/TaskListControl.xaml
View File

@ -288,31 +288,75 @@
</Grid> </Grid>
<Grid Grid.Column="7" > <Grid Grid.Column="7" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <!--<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="条形码:"/> <TextBlock Text="条形码:"/>
<c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <c:BButton x:Name="btn_lookBarCode" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding LookBarCommand}" /> Command="{Binding LookBarCommand}" />
--><!--<c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintBarcodeCommand}"/>--><!--
</StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="合格证:"/>
<c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding LookCerCommand}"/>
--><!--<c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintCerCommand}"/>--><!--
</StackPanel>
</StackPanel>
</StackPanel>-->
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="条形码:"/>
<StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
<c:BButton Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding LookBarCommand}" />
<!--<c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <!--<c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintBarcodeCommand}"/>--> Command="{Binding PrintBarcodeCommand}"/>-->
</StackPanel>
<TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
/>
</StackPanel> </StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="合格证:"/> <TextBlock Text="合格证:"/>
<c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <StackPanel Orientation="Horizontal"
Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Orientation="Horizontal"
Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
>
<c:BButton Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding LookCerCommand}"/> Command="{Binding LookCerCommand}"/>
<!--<c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <!--<c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintCerCommand}"/>--> Command="{Binding PrintCerCommand}"/>-->
</StackPanel> </StackPanel>
</StackPanel> <TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
/>
</StackPanel>
<TextBlock Text="未配置" Style="{StaticResource middleTextBlock}"
Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
/>
</StackPanel> </StackPanel>
</StackPanel>
</Grid> </Grid>
<Grid Grid.Column="8" > <Grid Grid.Column="8" >

14
BBWY.Client/Views/PackTask/WareHouseListControl.xaml
View File

@ -310,7 +310,7 @@
<c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <c:BButton x:Name="btn_daCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintBarcodeCommand}"/> Command="{Binding PrintBarcodeCommand}"/>
</StackPanel> </StackPanel>
<TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}" Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
/> />
@ -321,13 +321,23 @@
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}"
> >
<StackPanel Orientation="Horizontal"
Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Collapsed:Visible}"
>
<c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <c:BButton x:Name="btn_lookCer" Content="查看" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding LookCerCommand}"/> Command="{Binding LookCerCommand}"/>
<c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0" <c:BButton x:Name="btn_dayinCer" Content="打印" Style="{StaticResource LinkButton}" Margin="5,0,0,0"
Command="{Binding PrintCerCommand}"/> Command="{Binding PrintCerCommand}"/>
</StackPanel>
<TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding CertificatePosition,Converter={StaticResource objConverter}, ConverterParameter=无需合格证:Visible:Collapsed}"
/>
</StackPanel> </StackPanel>
<TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" <TextBlock Text="未配置" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}" Visibility="{Binding CertificateModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Visible:Collapsed}"
/> />

Write Preview
Loading…
Cancel
Save