diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index ef760e08..e1b3dcff 100644
--- a/BBWY.Client/BBWYAppSettings.json
+++ b/BBWY.Client/BBWYAppSettings.json
@@ -4,6 +4,6 @@
"MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "",
"1688ApiHost": "",
- // "QKApiHost": "http://localhost:8080"
- "QKApiHost": "http://qiku.qiyue666.com"
+ "QKApiHost": "http://localhost:8080"
+ //"QKApiHost": "http://qiku.qiyue666.com"
}
\ No newline at end of file
diff --git a/BBWY.Client/Helpers/ImageHelper.cs b/BBWY.Client/Helpers/ImageHelper.cs
new file mode 100644
index 00000000..e6762441
--- /dev/null
+++ b/BBWY.Client/Helpers/ImageHelper.cs
@@ -0,0 +1,43 @@
+using BBWY.Client.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+
+namespace BBWY.Client.Helpers
+{
+ public static class ImageHelper
+ {
+ ///
+ /// 下载图片
+ ///
+ ///
+ ///
+ private static async Task< BitmapImage> LoadImageAsync(string imageUrl)
+ {
+ try
+ {
+
+
+ using (HttpClient client = new HttpClient())
+ {
+ // 发送 HTTP 请求并获取图片数据
+ var uri = new Uri(Uri.EscapeUriString(imageUrl));
+ byte[] imageData = await client.GetByteArrayAsync(uri);
+ // 创建 BitmapImage 对象并设置图片数据
+ var LogoImage = imageData.ByteToBitmapImage();
+ return LogoImage;
+
+ }
+ }
+ catch (Exception ex)
+ {
+ // 处理加载图片失败的异常
+ Console.WriteLine("加载图片失败:" + ex.Message);
+ }
+ return null;
+ }
+ }
+}
diff --git a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs
index c2c23284..a8603c9f 100644
--- a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs
@@ -906,12 +906,19 @@ namespace BBWY.Client.ViewModels.PackTask
///
private void UpLoadPack(object obj)
{
- if (ProcessTaskCount > TaskCount)
+ //if (ProcessTaskCount > TaskCount)
+ //{
+ // System.Windows.MessageBox.Show($"工序任务数:{ProcessTaskCount}不能超过打包总任务数:{TaskCount}");
+ // return;
+ //}
+
+ if (PackUserModelList==null|| PackUserModelList.Count<=0)
{
- System.Windows.MessageBox.Show($"工序任务数:{ProcessTaskCount}不能超过打包总任务数:{TaskCount}");
+ System.Windows.MessageBox.Show("信息不完整,打包人设置有误");
return;
}
+
if (PackUserModelList != null && PackUserModelList.Count > 0)
{
if (PackUserModelList.Any(p => p.SelectUserId.IsNullOrEmpty() || p.TaskCount <= 0))
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 18295996..2385464a 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -1526,11 +1526,7 @@ namespace BBWY.Client.ViewModels.PackTask
{
AcceptUserName = string.Join("|", item.AcceptUserNames),
DepartmentName = item.DepartmentName,
- SealBoxSkus = item.SealBoxSkus.Select(s =>
- {
- s.Logo = s.Logo;
- return s;
- }).ToList(),
+ SealBoxSkus = item.SealBoxSkus,
ShopId = item.ShopId,
ShopName = item.ShopName,
diff --git a/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs b/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs
index 5271ce96..714cbaf7 100644
--- a/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs
+++ b/BBWY.Client/ViewModels/SealBox/SealBoxConfigureViewModel.cs
@@ -691,7 +691,7 @@ namespace BBWY.Client.ViewModels.SealBox
SkuId = sealBoxConfigureModel.SkuId,
TaskId = sealBoxConfigureModel.TaskId,
TotalCount = sealBoxConfigureModel.SkuCount,
- WareHourseDatas = sealBoxConfigureModel.WareHourseDatas.Select(x => new WareHourseData
+ WareHourseDatas = sealBoxConfigureModel.WareHourseDatas.Where(w => w.Count > 0).Select(x => new WareHourseData//上传过滤0数据
{
Count = x.Count,
WareId = x.WareId,
diff --git a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
index d2cd2968..dd277e41 100644
--- a/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
+++ b/BBWY.Client/Views/PackTask/WaitPackageControl.xaml
@@ -31,7 +31,7 @@
Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=部门:Visible:Collapsed}"
>
@@ -41,7 +41,7 @@
Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=店铺:Visible:Collapsed}"
>
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 7b59ddbf..d99b7c6e 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -30,11 +30,11 @@
-
-
@@ -44,7 +44,7 @@
Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=店铺:Visible:Collapsed}"
>
@@ -112,13 +112,6 @@
-
-
-
@@ -131,7 +124,7 @@
-->
-
+
@@ -146,12 +139,12 @@
-
-
+
@@ -39,7 +39,7 @@
Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=店铺:Visible:Collapsed}"
>
diff --git a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
index 6fab4261..2f2f7f27 100644
--- a/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
+++ b/BBWY.Client/Views/SealBox/SealBoxNoConfigureControl.xaml
@@ -4,8 +4,10 @@
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.SealBox"
+
+
mc:Ignorable="d"
- xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+ xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:ctr="clr-namespace:BBWY.Client.Converters"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@@ -65,7 +67,7 @@
-
-
+
+
+
@@ -137,9 +141,7 @@
-
-
-
@@ -155,7 +157,6 @@
-
@@ -254,6 +255,7 @@
+