|
|
|
@ -24,6 +24,9 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
public class CreatePackTaskViewModel : BaseVM, IDenpendency |
|
|
|
{ |
|
|
|
|
|
|
|
#region 属性
|
|
|
|
private bool isSelected; |
|
|
|
public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } } |
|
|
|
|
|
|
|
private bool isLoading = false; |
|
|
|
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } } |
|
|
|
@ -82,12 +85,6 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
public string SkuName { get => skuName; set { Set(ref skuName, value); } } |
|
|
|
|
|
|
|
|
|
|
|
//private long barCodeId;
|
|
|
|
///// <summary>
|
|
|
|
///// 条形码id
|
|
|
|
///// </summary>
|
|
|
|
//public long BarCodeId { get => barCodeId; set { Set(ref barCodeId, value); } }
|
|
|
|
|
|
|
|
private string brand; |
|
|
|
/// <summary>
|
|
|
|
/// 品牌
|
|
|
|
@ -131,12 +128,6 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
/// </summary>
|
|
|
|
public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } } |
|
|
|
|
|
|
|
private DateTime endTime; |
|
|
|
/// <summary>
|
|
|
|
/// 提交时间
|
|
|
|
/// </summary>
|
|
|
|
public DateTime EndTime { get => endTime; set { Set(ref endTime, value); } } |
|
|
|
|
|
|
|
|
|
|
|
private long taskId; |
|
|
|
/// <summary>
|
|
|
|
@ -173,14 +164,6 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
public TaskState Availability { get => availability; set { Set(ref availability, value); } } |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private int taskStatus; |
|
|
|
/// <summary>
|
|
|
|
/// 任务状态（已完成=0，未完成=1）
|
|
|
|
/// </summary>
|
|
|
|
public int TaskStatus { get => taskStatus; set { Set(ref taskStatus, value); } } |
|
|
|
|
|
|
|
|
|
|
|
private PackType packType; |
|
|
|
/// <summary>
|
|
|
|
/// 打包类型（单件=0，多件=1）
|
|
|
|
@ -295,7 +278,7 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
private string saveTask; |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// 设置显示(合格证)
|
|
|
|
/// 发布按钮(发布/保存)
|
|
|
|
/// </summary>
|
|
|
|
public string SaveTask { get => saveTask; set { Set(ref saveTask, value); } } |
|
|
|
|
|
|
|
@ -337,6 +320,8 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
/// 注意事项（对接备注）
|
|
|
|
/// </summary>
|
|
|
|
public string MarkMessage { get => markMessage; set { Set(ref markMessage, value); } } |
|
|
|
#endregion
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -491,16 +476,16 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
this.globalContext = globalContext; |
|
|
|
SetBarCodeCommand = new RelayCommand(SetBarCode); |
|
|
|
SetCertificateCommand = new RelayCommand(SetCertificate); |
|
|
|
SaveBarCodeCommand = new RelayCommand(SaveBarCode); |
|
|
|
//SaveBarCodeCommand = new RelayCommand(SaveBarCode);
|
|
|
|
|
|
|
|
SetSpuCerCommand = new RelayCommand(SetSpuCer); |
|
|
|
SaveSpuCerCommand = new RelayCommand(SaveSpuCer); |
|
|
|
InseartCerCommand = new RelayCommand(InseartCer); |
|
|
|
//SetSpuCerCommand = new RelayCommand(SetSpuCer);
|
|
|
|
//SaveSpuCerCommand = new RelayCommand(SaveSpuCer);
|
|
|
|
//InseartCerCommand = new RelayCommand(InseartCer);
|
|
|
|
|
|
|
|
SaveCerCommand = new RelayCommand(SaveCer); |
|
|
|
//SaveCerCommand = new RelayCommand(SaveCer);
|
|
|
|
BarLabelCheckCommand = new RelayCommand<BarcodeLabelModel>(BarLabelCheck); |
|
|
|
CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck); |
|
|
|
SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(SpuCerLabelCheck); |
|
|
|
//CerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(CerLabelCheck);
|
|
|
|
//SpuCerLabelCheckCommand = new RelayCommand<CertificateLabelModel>(SpuCerLabelCheck);
|
|
|
|
|
|
|
|
|
|
|
|
LookBarCommand = new RelayCommand(LookBar); |
|
|
|
@ -511,84 +496,84 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
BarLabelCheck(BarcodeLabelModel.精简模板);//默认精简模式
|
|
|
|
} |
|
|
|
|
|
|
|
private void InseartCer() |
|
|
|
{ |
|
|
|
if (IsSetSpuCertificate) |
|
|
|
{ |
|
|
|
new TipsWindow("无可用模板").Show(); |
|
|
|
return; |
|
|
|
} |
|
|
|
CertificateModel = new CertificateModel() |
|
|
|
{ |
|
|
|
//SpuId = SpuCertificateModel.SpuId,
|
|
|
|
SkuId = SkuId, |
|
|
|
Brand = SpuCertificateModel.Brand, |
|
|
|
BrandName = SpuCertificateModel.BrandName, |
|
|
|
ExcuteStander = SpuCertificateModel.ExcuteStander, |
|
|
|
FactoryNumber = SpuCertificateModel.FactoryNumber, |
|
|
|
IsLogo = SpuCertificateModel.IsLogo, |
|
|
|
LabelModel = SpuCertificateModel.LabelModel, |
|
|
|
ProductAdress = SpuCertificateModel.ProductAdress, |
|
|
|
ProductNo = SpuCertificateModel.ProductNo, |
|
|
|
Shader = SpuCertificateModel.Shader, |
|
|
|
ProductShop = SpuCertificateModel.ProductShop, |
|
|
|
ApplyAge = SpuCertificateModel.ApplyAge, |
|
|
|
}; |
|
|
|
} |
|
|
|
|
|
|
|
private void SetSpuCer() |
|
|
|
{ |
|
|
|
|
|
|
|
if (SpuCertificateModel == null) |
|
|
|
{ |
|
|
|
SpuCertificateModel = new CertificateModel(); |
|
|
|
SpuCertificateModel.ProductNo = ProductNo; |
|
|
|
SpuCertificateModel.Brand = Brand; |
|
|
|
SpuCertificateModel.SkuId = SkuId; |
|
|
|
} |
|
|
|
if (!string.IsNullOrEmpty(BrandName)) |
|
|
|
SpuCertificateModel.BrandName = BrandName; |
|
|
|
setSpuCerWindow = new SetSpuCerWindow(); |
|
|
|
setSpuCerWindow.Show(); |
|
|
|
} |
|
|
|
|
|
|
|
private void SaveSpuCer() |
|
|
|
{ |
|
|
|
if (string.IsNullOrEmpty(SpuCertificateModel.ExcuteStander) |
|
|
|
|| string.IsNullOrEmpty(SpuCertificateModel.BrandName) |
|
|
|
|| string.IsNullOrEmpty(SpuCertificateModel.Brand) || string.IsNullOrEmpty(SpuCertificateModel.ProductShop) |
|
|
|
|| string.IsNullOrEmpty(SpuCertificateModel.ProductAdress)) |
|
|
|
{ |
|
|
|
new TipsWindow("参数出错!请重新填写!").Show(); |
|
|
|
return; |
|
|
|
} |
|
|
|
var resData = packTaskService.SaveSpuCer(new CerRequest |
|
|
|
{ |
|
|
|
Brand = SpuCertificateModel.Brand, |
|
|
|
BrandName = SpuCertificateModel.BrandName, |
|
|
|
ProductNo = SpuCertificateModel.ProductNo, |
|
|
|
SpuId = SpuCertificateModel.SpuId, |
|
|
|
ExcuteStander = SpuCertificateModel.ExcuteStander, |
|
|
|
LabelModel = (int)SpuCertificateModel.LabelModel, |
|
|
|
FactoryNumber = SpuCertificateModel.FactoryNumber, |
|
|
|
IsLogo = SpuCertificateModel.IsLogo, |
|
|
|
ProductAdress = SpuCertificateModel.ProductAdress, |
|
|
|
ProductShop = SpuCertificateModel.ProductShop, |
|
|
|
Shader = SpuCertificateModel.Shader, |
|
|
|
SkuId = SpuCertificateModel.SkuId, |
|
|
|
ApplyAge = SpuCertificateModel.ApplyAge, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
if (resData == null || !resData.Success) |
|
|
|
{ |
|
|
|
IsSetSpuCertificate = false; |
|
|
|
return; |
|
|
|
} |
|
|
|
IsSetSpuCertificate = false; |
|
|
|
setSpuCerWindow.Close(); |
|
|
|
} |
|
|
|
//private void InseartCer()
|
|
|
|
//{
|
|
|
|
// if (IsSetSpuCertificate)
|
|
|
|
// {
|
|
|
|
// new TipsWindow("无可用模板").Show();
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// CertificateModel = new CertificateModel()
|
|
|
|
// {
|
|
|
|
// //SpuId = SpuCertificateModel.SpuId,
|
|
|
|
// SkuId = SkuId,
|
|
|
|
// Brand = SpuCertificateModel.Brand,
|
|
|
|
// BrandName = SpuCertificateModel.BrandName,
|
|
|
|
// ExcuteStander = SpuCertificateModel.ExcuteStander,
|
|
|
|
// FactoryNumber = SpuCertificateModel.FactoryNumber,
|
|
|
|
// IsLogo = SpuCertificateModel.IsLogo,
|
|
|
|
// LabelModel = SpuCertificateModel.LabelModel,
|
|
|
|
// ProductAdress = SpuCertificateModel.ProductAdress,
|
|
|
|
// ProductNo = SpuCertificateModel.ProductNo,
|
|
|
|
// Shader = SpuCertificateModel.Shader,
|
|
|
|
// ProductShop = SpuCertificateModel.ProductShop,
|
|
|
|
// ApplyAge = SpuCertificateModel.ApplyAge,
|
|
|
|
// };
|
|
|
|
//}
|
|
|
|
|
|
|
|
//private void SetSpuCer()
|
|
|
|
//{
|
|
|
|
|
|
|
|
// if (SpuCertificateModel == null)
|
|
|
|
// {
|
|
|
|
// SpuCertificateModel = new CertificateModel();
|
|
|
|
// SpuCertificateModel.ProductNo = ProductNo;
|
|
|
|
// SpuCertificateModel.Brand = Brand;
|
|
|
|
// SpuCertificateModel.SkuId = SkuId;
|
|
|
|
// }
|
|
|
|
// if (!string.IsNullOrEmpty(BrandName))
|
|
|
|
// SpuCertificateModel.BrandName = BrandName;
|
|
|
|
// setSpuCerWindow = new SetSpuCerWindow();
|
|
|
|
// setSpuCerWindow.Show();
|
|
|
|
//}
|
|
|
|
|
|
|
|
//private void SaveSpuCer()
|
|
|
|
//{
|
|
|
|
// if (string.IsNullOrEmpty(SpuCertificateModel.ExcuteStander)
|
|
|
|
// || string.IsNullOrEmpty(SpuCertificateModel.BrandName)
|
|
|
|
// || string.IsNullOrEmpty(SpuCertificateModel.Brand) || string.IsNullOrEmpty(SpuCertificateModel.ProductShop)
|
|
|
|
// || string.IsNullOrEmpty(SpuCertificateModel.ProductAdress))
|
|
|
|
// {
|
|
|
|
// new TipsWindow("参数出错!请重新填写!").Show();
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// var resData = packTaskService.SaveSpuCer(new CerRequest
|
|
|
|
// {
|
|
|
|
// Brand = SpuCertificateModel.Brand,
|
|
|
|
// BrandName = SpuCertificateModel.BrandName,
|
|
|
|
// ProductNo = SpuCertificateModel.ProductNo,
|
|
|
|
// SpuId = SpuCertificateModel.SpuId,
|
|
|
|
// ExcuteStander = SpuCertificateModel.ExcuteStander,
|
|
|
|
// LabelModel = (int)SpuCertificateModel.LabelModel,
|
|
|
|
// FactoryNumber = SpuCertificateModel.FactoryNumber,
|
|
|
|
// IsLogo = SpuCertificateModel.IsLogo,
|
|
|
|
// ProductAdress = SpuCertificateModel.ProductAdress,
|
|
|
|
// ProductShop = SpuCertificateModel.ProductShop,
|
|
|
|
// Shader = SpuCertificateModel.Shader,
|
|
|
|
// SkuId = SpuCertificateModel.SkuId,
|
|
|
|
// ApplyAge = SpuCertificateModel.ApplyAge,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// });
|
|
|
|
// if (resData == null || !resData.Success)
|
|
|
|
// {
|
|
|
|
// IsSetSpuCertificate = false;
|
|
|
|
// return;
|
|
|
|
// }
|
|
|
|
// IsSetSpuCertificate = false;
|
|
|
|
// setSpuCerWindow.Close();
|
|
|
|
//}
|
|
|
|
|
|
|
|
private void OnSearchIncreateKeyWordChanged(string key) |
|
|
|
{ |
|
|
|
@ -649,16 +634,7 @@ namespace BBWY.Client.ViewModels.PackTask |
|
|
|
}); |
|
|
|
look.Show(); |
|
|
|
} |
|
|
|
private void SpuCerLabelCheck(CertificateLabelModel cer) |
|
|
|
{ |
|
|
|
SpuCertificateModel.LabelModel = cer; |
|
|
|
SpuCertificateModel.IsLogo = cer == CertificateLabelModel.标准有3c ? 1 : 0; |
|
|
|
} |
|
|
|
private void CerLabelCheck(CertificateLabelModel cer) |
|
|
|
{ |
|
|
|
CertificateModel.LabelModel = cer; |
|
|
|
CertificateModel.IsLogo = cer == CertificateLabelModel.标准有3c ? 1 : 0; |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
///
|
|
|
|
/// </summary>
|
|
|
|
|
506583276@qq.com
2 years ago