diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs
index 9a6e868..56d495a 100644
--- a/BBWYB.Client/GlobalContext.cs
+++ b/BBWYB.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWYB.Client
{
public GlobalContext()
{
- BBWYBApiVersion = "10018";
+ BBWYBApiVersion = "10019";
}
private User user;
diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index b3f67b4..94a7183 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -107,10 +107,7 @@ namespace BBWYB.Client.ViewModels
{
var objList = (object[])obj;
var OriginShopName = (string)objList[0];
- OrderSku order = (OrderSku)objList[1];
-
-
-
+ OrderSku order = (OrderSku)objList[1];
var res = PackPurchaseTaskService.GetOrderTask(order.BelongSkuId, order.OrderId);
if (res == null || !res.Success)
{
@@ -121,17 +118,22 @@ namespace BBWYB.Client.ViewModels
{
MessageBox.Show("打包任务,不存在或已被删除,请重新发起任务!");
return;
- }
-
+ }
+ UpdatePurchaseTaskWindow packTask = new();
ViewModelLocator view = new();
var updatePackTask = view.UpdatePurchaseTask;
- updatePackTask.SearchSku(res.Data, OriginShopName, order);
+ var show = updatePackTask.SearchSku(res.Data, OriginShopName, order);
+
+
+ if (!show) return;
+
+
updatePackTask.ReflashWindow = () => {
Task.Factory.StartNew(() => LoadOrder(PageIndex));
};
- UpdatePurchaseTaskWindow packTask = new();
+
packTask.ShowDialog();
diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
index 3c8d787..3dd47de 100644
--- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
+++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
@@ -320,9 +320,9 @@ namespace BBWYB.Client.ViewModels
public string OriginShopName { get; set; }
public string SkuPurchaseSchemeId { get; set; }
public Platform Platform { get; set; }
- public string ShopId { get; set; }
+ //public string ShopId { get; set; }
- public string UserName { get; set; }
+ //public string UserName { get; set; }
#region 方法
public ICommand SetBarCodeCommand { get; set; }
@@ -423,7 +423,7 @@ namespace BBWYB.Client.ViewModels
///
/// 搜索 skuId(todo:)
///
- public void SearchSku(PackTaskResponse obj, string shopname, OrderSku order)
+ public bool SearchSku(PackTaskResponse obj, string shopname, OrderSku order)
{
InitData();
@@ -434,16 +434,13 @@ namespace BBWYB.Client.ViewModels
SkuId = order.BelongSkuId;
OrderId = order.OrderId;
- //string PurchaseProductId = "687352811674";
- //Platform = order.Platform;
- //ShopId = "11";
- //UserName = order.BuyerAccount;
+
var shopList = globalContext.User.ShopList;
var shop = shopList.SingleOrDefault(s => s.ShopName == OriginShopName);
Logo = order.Logo;
SkuName = order.Title;
if (string.IsNullOrEmpty(SkuId))
- return;
+ return false;
ApiResponse productApiResponse = null;
var skuResponse = productService.GetProductSkuList(string.Empty, SkuId, shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
@@ -451,7 +448,7 @@ namespace BBWYB.Client.ViewModels
{
if (skuResponse.Data.Count() == 0)
{
- return;
+ return false;
}
Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");
SkuName = skuResponse.Data[0].Title;
@@ -466,7 +463,7 @@ namespace BBWYB.Client.ViewModels
if (productApiResponse.Data.Count == 0)
{
- return;
+ return false;
}
ProductNo = productApiResponse.Data.Items[0].ProductItemNum;
@@ -477,8 +474,8 @@ namespace BBWYB.Client.ViewModels
if (productSku == null || !productSku.Success || productSku.Data == null)
{
- new TipsWindow(productSku.Msg).Show();
- return;
+ MessageBox.Show(productSku.Msg);
+ return false;
}
@@ -558,14 +555,17 @@ namespace BBWYB.Client.ViewModels
}
}
+
+
+ return true;
}
else
{
App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
- return;
+ return false;
}
-
+ return true;
//加载配置文件
}
@@ -605,13 +605,18 @@ namespace BBWYB.Client.ViewModels
public Action ReflashWindow { get; set; }
public void InitData()
{
-
+ PurchaseSkuList = new ObservableCollection();
IsSetBarCode = true;
SkuTitle = "";
BrandName = "";
GoodsNumber = 0;
PackType = PackType.单件;
BasicPack = BasicPack.快递袋;
+ SkuPurchaseSchemeId = "";
+ SkuTitle = "";
+ BarCodeModel= null;
+ OriginShopName = "";
+
// Availability = (TaskState.)config.Availability;
MarkMessage = "";
CertificatePosition = CertificatePosition.无;
@@ -694,7 +699,7 @@ namespace BBWYB.Client.ViewModels
var cerList = purchaseSkuList.Where(p => p.IsNeedCer&&p.CerDTO!=null).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList();
if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0)
{
- MessageBox.Show("请设置条形码模板");
+ MessageBox.Show("请设置合格证模板");
return;
}
createTaskModel.CerId = string.Join(",", cerList);//
diff --git a/BBWYB.Client/Views/PackPurchaseTask/SetBarCodeWindow.xaml.cs b/BBWYB.Client/Views/PackPurchaseTask/SetBarCodeWindow.xaml.cs
index b24bfba..5f8af60 100644
--- a/BBWYB.Client/Views/PackPurchaseTask/SetBarCodeWindow.xaml.cs
+++ b/BBWYB.Client/Views/PackPurchaseTask/SetBarCodeWindow.xaml.cs
@@ -49,8 +49,8 @@ namespace BBWYB.Client.Views.PackPurchaseTask
{
if (string.IsNullOrEmpty(BarCodeModel.ProductNo) || BarCodeModel.ProductNo == "待填写")
{
- TipsWindow tips = new TipsWindow("该SKU无货号信息,将影响条形码打印\r\n请先设置好货号信息或调整打印模板类型");
- tips.Show();
+ MessageBox.Show("该SKU无货号信息,将影响条形码打印\r\n请先设置好货号信息或调整打印模板类型");
+
return;
}
}
@@ -85,8 +85,8 @@ namespace BBWYB.Client.Views.PackPurchaseTask
{
if (string.IsNullOrEmpty(BarCodeModel.ProductNo) || BarCodeModel.ProductNo == "待填写")
{
- TipsWindow tips = new TipsWindow("该SKU无货号信息,将影响条形码打印\r\n请先设置好货号信息或调整打印模板类型");
- tips.ShowDialog();
+ MessageBox.Show("该SKU无货号信息,将影响条形码打印\r\n请先设置好货号信息或调整打印模板类型");
+
}
}
diff --git a/BBWYB.Client/Views/PackPurchaseTask/TipsWindow.xaml.cs b/BBWYB.Client/Views/PackPurchaseTask/TipsWindow.xaml.cs
index 0610aed..13b5ca6 100644
--- a/BBWYB.Client/Views/PackPurchaseTask/TipsWindow.xaml.cs
+++ b/BBWYB.Client/Views/PackPurchaseTask/TipsWindow.xaml.cs
@@ -22,8 +22,9 @@ namespace BBWYB.Client.Views.PackPurchaseTask
public partial class TipsWindow : BWindow
{
private DispatcherTimer timer;
- public TipsWindow(string Content, int waitTime = 2)
+ public TipsWindow()
{
+ string Content = ""; int waitTime = 2;
InitializeComponent();
tbContent.Text = Content;
this.WindowStartupLocation = WindowStartupLocation.CenterScreen;