Browse Source

合并

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
5af08de450
  1. 48
      BBWY.Client/APIServices/IncreateServiceService.cs
  2. 37
      BBWY.Client/APIServices/QiKu/MarkMessageService.cs
  3. 44
      BBWY.Client/APIServices/QiKu/PackTaskService.cs
  4. 6
      BBWY.Client/APIServices/QiKu/SealBoxService.cs
  5. 56
      BBWY.Client/APIServices/WorkProcessService.cs
  6. 3
      BBWY.Client/App.xaml.cs
  7. 43
      BBWY.Client/Helpers/HttpClientHelper.cs
  8. 18
      BBWY.Client/Helpers/OverTimeHelper.cs
  9. 8
      BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs
  10. 30
      BBWY.Client/Models/APIModel/Response/MarkMessage/ShowTaskMarkMessageResponse.cs
  11. 11
      BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
  12. 8
      BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
  13. 9
      BBWY.Client/Models/PackTask/BarCodeModel.cs
  14. 54
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  15. 9
      BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
  16. 95
      BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
  17. 27
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  18. 808
      BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs
  19. 149
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  20. 520
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  21. 11
      BBWY.Client/ViewModels/ViewModelLocator.cs
  22. 2
      BBWY.Client/Views/FallWare/WareFallWareListControl.xaml
  23. 36
      BBWY.Client/Views/PackTask/BarcodeControl.xaml
  24. 55
      BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
  25. 22
      BBWY.Client/Views/PackTask/PublishTaskWindow.xaml.cs
  26. 62
      BBWY.Client/Views/PackTask/SetBarCode.xaml
  27. 3
      BBWY.Client/Views/PackTask/SetBarCode.xaml.cs
  28. 4
      BBWY.Client/Views/PackTask/SetCerWindow.xaml
  29. 102
      BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
  30. 55
      BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
  31. 26
      BBWY.Client/Views/PackTask/TaskList.xaml
  32. 23
      BBWY.Client/Views/PackTask/TaskListControl.xaml
  33. 385
      BBWY.Client/Views/PackTask/UpdatePurchaseTaskWindow.xaml
  34. 53
      BBWY.Client/Views/PackTask/UpdatePurchaseTaskWindow.xaml.cs
  35. 4
      BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
  36. 145
      BBWY.Client/Views/PackTask/WaitPackageControl.xaml
  37. 107
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  38. 7
      BBWY.Client/Views/QualityTask/QualityWindow.xaml
  39. 120
      BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
  40. 130
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
  41. 2
      BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml
  42. 1
      BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

48
BBWY.Client/APIServices/IncreateServiceService.cs

@ -1,48 +0,0 @@
using BBWY.Client.Models.PackTask;
using BBWY.Common.Http;
using BBWY.Common.Models;
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
namespace BBWY.Client.APIServices
{
public class IncreateServiceService : BaseApiService, IDenpendency
{
public IncreateServiceService(RestApiService restApiService, GlobalContext globalContext) : base(restApiService, globalContext)
{
}
public ApiResponse<IncreateServiceModel[]> SearchAll()
{
return SendRequest<IncreateServiceModel[]>(globalContext.QKApiHost, "api/IncreateService/SearchAll",
null
, null, HttpMethod.Get);
}
public ApiResponse<object> Add(IncreateServiceModel consumable)
{
return SendRequest<object>(globalContext.QKApiHost, "api/IncreateService/Add",
consumable
, null, HttpMethod.Post);
}
public ApiResponse<object> Edit(IncreateServiceModel consumable)
{
return SendRequest<object>(globalContext.QKApiHost, "api/IncreateService/Edit",
consumable
, null, HttpMethod.Post);
}
public ApiResponse<object> Deleted(long id)
{
return SendRequest<object>(globalContext.QKApiHost, "api/IncreateService/Deleted",
new
{
id = id
}
, null, HttpMethod.Get);
}
}
}

37
BBWY.Client/APIServices/QiKu/MarkMessageService.cs

@ -0,0 +1,37 @@
using BBWY.Client.Models.APIModel;
using BBWY.Client.Models.APIModel.Response.PackTask;
using BBWY.Common.Http;
using BBWY.Common.Models;
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
namespace BBWY.Client.APIServices.QiKu
{
public class MarkMessageService : BaseApiService, IDenpendency
{
public MarkMessageService(RestApiService restApiService, GlobalContext globalContext) : base(restApiService, globalContext)
{
}
public ApiResponse<bool> AppendMarkMessage(long TaskId, string MarkMessage, string UserName)
{
return SendRequest<bool>(globalContext.QKApiHost, $"api/MarkMessage/AppendMarkMessage",
new
{
TaskId,
MarkMessage,
UserName
}
, null, HttpMethod.Post);
}
public ApiResponse<ShowTaskMarkMessageResponse[]> ShowTaskMarkMessage(long TaskId)
{
return SendRequest<ShowTaskMarkMessageResponse[]>(globalContext.QKApiHost, $"api/MarkMessage/ShowTaskMarkMessage?TaskId={TaskId}",
null
, null, HttpMethod.Get);
}
}
}

44
BBWY.Client/APIServices/QiKu/PackTaskService.cs

@ -27,8 +27,8 @@ namespace BBWY.Client.APIServices
public ApiResponse<SearchTaskListResponse> GetTaskList(string skuId = null, string taskId = null,
public ApiResponse<SearchTaskListResponse> SearchTaskList(string skuId = null, string taskId = null
, string spuId = null, string orderSn = null,
TaskState? TaskState = null,
int pageIndex = 1,
int pageSize = 10
@ -36,42 +36,29 @@ namespace BBWY.Client.APIServices
)
{
if (taskId != null && !string.IsNullOrEmpty(taskId.Trim()))
{
return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{
TaskId = taskId,
ShopId = globalContext.User.Shop.ShopId.ToString()
}, null, HttpMethod.Post);
}
return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{
orderSn,
spuId,
skuId,
taskId,
TaskState,
pageIndex,
pageSize,
ShopId = globalContext.User.Shop.ShopId.ToString(),
SkuId = skuId,
TaskId = taskId,
TaskState = TaskState,
PageIndex = pageIndex,
PageSize = pageSize,
ShopId = globalContext.User.Shop.ShopId.ToString()
}, null, HttpMethod.Post);
}
public ApiResponse<SearchTaskListResponse> GetWareHouseList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null,
public ApiResponse<SearchTaskListResponse> SearchTaskList(string WayBillNo = null, string SourceExpressName = null, string departmentName = null, string skuId = null, string taskId = null,
string spuId = null, string orderSn = null,
TaskState? TaskState = null,
string ShopName = null,
int pageIndex = 1,
int pageSize = 10
)
{
if (taskId != null && !string.IsNullOrEmpty(taskId.Trim()))
{
return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{
TaskId = taskId
}, null, HttpMethod.Post);
}
return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{
DepartmentName = departmentName,
@ -83,6 +70,8 @@ namespace BBWY.Client.APIServices
ShopName = ShopName,
WayBillNo = WayBillNo,
SourceExpressName = SourceExpressName,
spuId,
orderSn
}, null, HttpMethod.Post);
}
@ -96,7 +85,7 @@ namespace BBWY.Client.APIServices
}
public ApiResponse<ProductSkuResponse> GetProductSku(string skuId)
public ApiResponse<ProductSkuResponse> SearchProduct(string skuId)
{
HttpClientHelper helper = new HttpClientHelper(globalContext.QKApiHost);
@ -343,6 +332,7 @@ namespace BBWY.Client.APIServices
}
}
public class CompeteSealBox

6
BBWY.Client/APIServices/QiKu/SealBoxService.cs

@ -1,9 +1,11 @@
using BBWY.Client.Models;
using BBWY.Client.Helpers;
using BBWY.Client.Models;
using BBWY.Client.Models.APIModel;
using BBWY.Client.Models.APIModel.Response.PackTask;
using BBWY.Client.Views.PackTask;
using BBWY.Common.Http;
using BBWY.Common.Models;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Net.Http;
@ -24,6 +26,7 @@ namespace BBWY.Client.APIServices
return SendRequest<SealBoxWaitConfigureResponse>(globalContext.QKApiHost, $"api/SealBox/GetSealBoxWaitConfigureList",
new
{
ShopId = globalContext.User.Shop.ShopId.ToString(),
TaskId = TaskId,
SkuId = SkuId,
@ -205,6 +208,7 @@ namespace BBWY.Client.APIServices
, null, HttpMethod.Post);
}
public ApiResponse<GetJDSupplierNameAndStoreNameResponse> GetJDSupplierNameAndStoreName(string poOrderNo)
{
return SendRequest<GetJDSupplierNameAndStoreNameResponse>(globalContext.BBYWApiHost, "api/qiku/GetJDSupplierNameAndStoreName", new

56
BBWY.Client/APIServices/WorkProcessService.cs

@ -1,56 +0,0 @@
using BBWY.Client.Models.APIModel.Request;
using BBWY.Client.Models.PackTask;
using BBWY.Common.Http;
using BBWY.Common.Models;
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
namespace BBWY.Client.APIServices
{
public class WorkProcessService : BaseApiService, IDenpendency
{
public WorkProcessService(RestApiService restApiService, GlobalContext globalContext) : base(restApiService, globalContext)
{
}
public ApiResponse<WorkProcessModel[]> SearchAll()
{
return SendRequest<WorkProcessModel[]>(globalContext.QKApiHost, "api/WorkProcess/SearchAll",
null
, null, HttpMethod.Get);
}
public ApiResponse<object> Add(WorkProcessModel consumable)
{
return SendRequest<object>(globalContext.QKApiHost, "api/WorkProcess/Add",
consumable
, null, HttpMethod.Post);
}
public ApiResponse<object> Edit(WorkProcessModel consumable)
{
return SendRequest<object>(globalContext.QKApiHost, "api/WorkProcess/Edit",
consumable
, null, HttpMethod.Post);
}
public ApiResponse<object> Deleted(long id)
{
return SendRequest<object>(globalContext.QKApiHost, "api/WorkProcess/Deleted",
new
{
id = id
}
, null, HttpMethod.Get);
}
//public ApiResponse<ConsumableResponse> Search(ConsumableRequest consumable)
//{
// return SendRequest<ConsumableResponse>(globalContext.QKApiHost, "api/WorkProcess/Search",
// consumable
// , null, HttpMethod.Post);
//}
}
}

3
BBWY.Client/App.xaml.cs

@ -126,8 +126,9 @@ namespace BBWY.Client
serviceCollection.AddTransient<SealBoxConfigureViewModel>();
serviceCollection.AddTransient<PublishTaskViewModel>();
serviceCollection.AddTransient<QualityViewModel>();
serviceCollection.AddScoped<PackServiceViewModel>();
serviceCollection.AddTransient<PackServiceViewModel>();
serviceCollection.AddTransient<UpdatePurchaseTaskViewModel>();
#region 注册拳探SDK相关类
serviceCollection.AddSingleton<QuanTanProductClient>();
#endregion

43
BBWY.Client/Helpers/HttpClientHelper.cs

@ -5,6 +5,7 @@ using System.Net.Http.Headers;
using System.Net.Http;
using System.Text;
using System.Windows;
using System.Linq;
namespace BBWY.Client.Helpers
{
@ -136,6 +137,48 @@ namespace BBWY.Client.Helpers
}
return JsonConvert.DeserializeObject<T>(result);
}
public string Post(string Url, string JsonData, string headers = null)
{
HttpClient client = new HttpClient();
//设置 API的 基地址
client.BaseAddress = new Uri(BaseAddr);
if (!string.IsNullOrEmpty(headers))
{
var headdics = JsonConvert.DeserializeObject<Dictionary<string, string>>(headers);
foreach (var item in headdics.Keys)
{
if (item.ToLower() == "host" || item.ToLower() == "Content-Type".ToLower() || item.ToLower() == "Content-Length".ToLower()) continue;
client.DefaultRequestHeaders.Add(item, headdics[item]);
}
}
//设置 默认请求头ACCEPT
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
//设置消息体
HttpContent content = new StringContent(JsonData);
content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
//发送Post请求
HttpResponseMessage msg = client.PostAsync(Url, content).Result;
//判断结果是否成功
if (msg.IsSuccessStatusCode)
{
//返回响应结果
return msg.Content.ReadAsStringAsync().Result;
}
//返回空字符串,表示响应错误
return "";
}
}
}

18
BBWY.Client/Helpers/OverTimeHelper.cs

@ -37,5 +37,23 @@ namespace BBWY.Client.Helpers
}
}
/// <summary>
/// 获取现在时间戳,毫秒
/// </summary>
/// <returns></returns>
public static long GetMilliTimeStamp()
{
return DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
}
/// <summary>
/// 获取现在时间戳,秒
/// </summary>
/// <returns></returns>
public static long GetTimeStamp()
{
return DateTimeOffset.Now.ToUnixTimeSeconds();
}
}
}

8
BBWY.Client/Models/APIModel/Request/BarCodeRequest.cs

@ -43,9 +43,9 @@ namespace BBWY.Client.Models.APIModel.Request
/// </summary>
public BarcodeLabelModel LabelModel { get; set; }
///// <summary>
///// 型号
///// </summary>
//public string ModelNo { get; set; }
/// <summary>
/// 店铺名
/// </summary>
public string ShopName { get; set; }
}
}

30
BBWY.Client/Models/APIModel/Response/MarkMessage/ShowTaskMarkMessageResponse.cs

@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.APIModel
{
public class ShowTaskMarkMessageResponse
{
/// <summary>
/// 备注消息
/// </summary>
public string MarkMessage { get; set; }
/// <summary>
/// 备注人
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 备注时间
/// </summary>
public DateTime? CreateTime { get; set; }
public override string ToString()
{
return $"{CreateTime?.ToString("yyyy-MM-dd")} {UserName}:{MarkMessage}";
}
}
}

11
BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs

@ -188,6 +188,17 @@ namespace BBWY.Client.Models.APIModel
/// 打包超时备注信息
/// </summary>
public string PackOverTimeMarkMsg { get; set; }
/// <summary>
/// 备注消息列表
/// </summary>
public string ShowMarkMessage { get; set; }
/// <summary>
/// 采购方案
/// </summary>
public string SkuPurchaseSchemeId { get; set; }
}
public class ExpressOrderResponse
{

8
BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs

@ -354,7 +354,7 @@ namespace BBWY.Client.Models
foreach (var item in CertificateModel) item.BrandName = BrandName;
SetCerWindow setCerWindow = new SetCerWindow();
setCerWindow.LoadData(CertificateModel, packTaskService, spuCertificateModel, IsSetSpuCertificate);
setCerWindow.LoadData(CertificateModel, packTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType.B端);
setCerWindow.SaveResult = s =>
{
CertificateModel = s;
@ -419,7 +419,7 @@ namespace BBWY.Client.Models
Brand = productApiResponse.Data.Items[0].BrandName;
}
var productSku = packTaskService.GetProductSku(skuid);
var productSku = packTaskService.SearchProduct(skuid);
if (productSku == null || !productSku.Success)
{
@ -452,6 +452,10 @@ namespace BBWY.Client.Models
BarCodeModel = new BarCodeModel();
IsSetBarCode = true;
}
if (BarCodeModel.LabelModel== BarcodeLabelModel.)
{
BarCodeModel.LabelModel = BarcodeLabelModel.;
}
BarCodeModel.Brand = Brand;
if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName;

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

@ -49,15 +49,6 @@ namespace BBWY.Client.Models
public string SkuId { get => skuId; set { Set(ref skuId, value); } }
private string modelNo;
/// <summary>
/// 型号
/// </summary>
public string ModelNo { get => modelNo; set { Set(ref modelNo, value); } }
private BarcodeLabelModel labelModel= BarcodeLabelModel.;
/// <summary>
/// 模板标签

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

@ -6,6 +6,7 @@ using BBWY.Client.ViewModels.PackTask;
using BBWY.Client.Views.PackTask;
using BBWY.Client.Views.QualityTask;
using GalaSoft.MvvmLight.Command;
using NPOI.Util;
using System;
using System.Collections.Generic;
@ -44,15 +45,22 @@ namespace BBWY.Client.Models
{
if (!this.OrderId.IsNullOrEmpty())
if (!this.SkuPurchaseSchemeId.IsNullOrEmpty())
{
System.Windows.MessageBox.Show("暂不支持修改采购组的任务");
UpdatePurchaseTaskWindow updatePurchaseWindow = new UpdatePurchaseTaskWindow(this,ReflashTask);
updatePurchaseWindow.ShowDialog();
return;
}
if (!OrderId.IsNullOrEmpty()&& SkuPurchaseSchemeId.IsNullOrEmpty())//B端手动添加合格证
{
PublishTaskWindow publishB = new PublishTaskWindow(ReflashTask, this,SaveType.B端);
publishB.ShowDialog();
return;
}
PublishTaskWindow publish = new PublishTaskWindow(ReflashTask, this);
publish.Show();
PublishTaskWindow publish = new PublishTaskWindow(ReflashTask, this, SaveType.C端);
publish.ShowDialog();
}
@ -110,15 +118,7 @@ namespace BBWY.Client.Models
return;
}
LookBarCodeWindow look = new LookBarCodeWindow();
look.SetData(new BarCodeModel
{
Brand = BarCodeModel.Brand,
BrandName = BarCodeModel.BrandName,
LabelModel = BarCodeModel.LabelModel,
ProductNo = BarCodeModel.ProductNo,
SkuId = BarCodeModel.SkuId,
SkuName = BarCodeModel.SkuName
});
look.SetData(BarCodeModel.Copy());
look.Show();
}
@ -157,7 +157,7 @@ namespace BBWY.Client.Models
ProductNo = BarCodeModel.ProductNo,
SkuId = BarCodeModel.SkuId,
SkuName = BarCodeModel.SkuName,
ShopName= ShopName
ShopName = BarCodeModel.ShopName
};
printWindow.LoadData();
//printWindow.Datas = LoadBarLabelModels();
@ -336,14 +336,6 @@ namespace BBWY.Client.Models
/// </summary>
public CertificatePosition CertificatePosition { get => certificatePosition; set { Set(ref certificatePosition, value); } }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
private string markMessage;
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string MarkMessage { get => markMessage; set { Set(ref markMessage, value); } }
/// <summary>
/// 服务收费 (单个任务id 消耗的总费用)
@ -363,8 +355,6 @@ namespace BBWY.Client.Models
/// </summary>
public string PackUser { get => packUser; set { Set(ref packUser, value); } }
//public FeesItemTypeDTO FeesItemTypeDTO { get; set; }
private FeesItemResponse feesItemResponse;
@ -432,7 +422,19 @@ namespace BBWY.Client.Models
/// 打包超时备注信息
/// </summary>
public string PackOverTimeMarkMsg { get => packOverTimeMarkMsg; set { Set(ref packOverTimeMarkMsg, value); } }
/// <summary>
///
/// </summary>
private string showMarkMessage;
/// <summary>
/// 备注消息列表
/// </summary>
public string ShowMarkMessage { get => showMarkMessage; set { Set(ref showMarkMessage, value); } }
/// <summary>
/// 采购方案
/// </summary>
public string SkuPurchaseSchemeId { get; set; }
}
@ -479,5 +481,9 @@ namespace BBWY.Client.Models
public string GoodsNo { get => goodsNo; set { Set(ref goodsNo, value); } }
}
}

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

@ -420,7 +420,6 @@ namespace BBWY.Client.ViewModels.PackTask
ProductNo = model.ItemList[0].GoodsNo;
Brand = model.Brand;
BrandName = model.ItemList[0].BrandName;
this.MarkMessage = model.MarkMessage;
IsSetBarCode = model.BarCodeModel != null ? false : true;
IsSetCertificate = model.CertificateModel != null ? false : true;
BarCodeModel = model.BarCodeModel;
@ -697,7 +696,7 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var item in CertificateModel) item.BrandName = BrandName;
//CertificateModel.Foreach(c=>c.BrandName = BrandName) ;
SetCerWindow setCerWindow = new SetCerWindow();
setCerWindow.LoadData(CertificateModel, packTaskService, spuCertificateModel, IsSetSpuCertificate);
setCerWindow.LoadData(CertificateModel, packTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType.C端);
setCerWindow.SaveResult = s =>
{
CertificateModel = s;
@ -872,7 +871,7 @@ namespace BBWY.Client.ViewModels.PackTask
Brand = productApiResponse.Data.Items[0].BrandName;
}
var productSku = packTaskService.GetProductSku(searchSkuId);
var productSku = packTaskService.SearchProduct(searchSkuId);
if (productSku == null || !productSku.Success)
{
IsLoading = false;
@ -943,6 +942,10 @@ namespace BBWY.Client.ViewModels.PackTask
BarCodeModel = new BarCodeModel();
IsSetBarCode = true;
}
if (BarCodeModel.LabelModel == BarcodeLabelModel.)
{
BarCodeModel.LabelModel = BarcodeLabelModel.;
}
BarCodeModel.Brand = Brand;
if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName;

95
BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@ -1,4 +1,5 @@
using BBWY.Client.APIServices;
using BBWY.Client.APIServices.QiKu;
using BBWY.Client.Extensions;
using BBWY.Client.Models;
using BBWY.Client.Models.PackTask;
@ -11,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Net.Mail;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@ -24,10 +26,13 @@ namespace BBWY.Client.ViewModels.PackTask
#region 属性
public SaveType SaveType { get; set; }
private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
public long TaskId { get; set; }
private long taskId;
public long TaskId { get => taskId; set { Set(ref taskId, value); } }
//private bool isSelected;
//public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
@ -256,6 +261,14 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public CertificatePosition CertificatePosition { get => certificatePosition; set { Set(ref certificatePosition, value); } }
private string showMarkMessage;
/// <summary>
/// 显示对接备注消息
/// </summary>
public string ShowMarkMessage { get => showMarkMessage; set { Set(ref showMarkMessage, value); } }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
@ -280,7 +293,7 @@ namespace BBWY.Client.ViewModels.PackTask
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
#endregion
public PublishTaskViewModel(PackTaskService packTaskService, ProductService productService, GlobalContext globalContext)
public PublishTaskViewModel(PackTaskService packTaskService, ProductService productService, GlobalContext globalContext, MarkMessageService markMessageService)
{
this.packTaskService = packTaskService;
this.productService = productService;
@ -307,9 +320,13 @@ namespace BBWY.Client.ViewModels.PackTask
InitData(message);
});
AppendMarkMessageCommand = new RelayCommand(AppendMarkMessage);
this.markMessageService = markMessageService;
}
#region 方法
public ICommand SetBarCodeCommand { get; set; }
public ICommand SetCertificateCommand { get; set; }
@ -320,6 +337,35 @@ namespace BBWY.Client.ViewModels.PackTask
public ICommand CreateTaskCommand { get; set; }
public ICommand SearchSkuCommand { get; set; }
public ICommand AppendMarkMessageCommand { get; set; }
MarkMessageService markMessageService;
private void AppendMarkMessage()
{
var res = markMessageService.AppendMarkMessage(TaskId, MarkMessage, globalContext.User.Name);
if (res == null)
{
return;
}
if (!res.Success)
{
MessageBox.Show(res.Msg);
return;
}
MarkMessage = string.Empty;
var resShow = markMessageService.ShowTaskMarkMessage(TaskId);
if (resShow != null && resShow.Success && resShow.Data != null)
{
ShowMarkMessage = string.Join("\r\n", resShow.Data.Select(d => d.ToString()));
}
}
private void SetBarCode()
{
if (string.IsNullOrEmpty(SkuId))
@ -338,6 +384,7 @@ namespace BBWY.Client.ViewModels.PackTask
BarCodeModel.Brand = Brand;
BarCodeModel.SkuId = SkuId;
BarCodeModel.SkuName = SkuName;
BarCodeModel.ShopName = globalContext.User.Shop.ShopName;
}
if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName;
@ -381,7 +428,7 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var item in CertificateModel) item.BrandName = BrandName;
SetCerWindow setCerWindow = new SetCerWindow();
setCerWindow.LoadData(CertificateModel, packTaskService, spuCertificateModel, IsSetSpuCertificate);
setCerWindow.LoadData(CertificateModel, packTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType);
setCerWindow.SaveResult = s =>
{
CertificateModel = s;
@ -445,7 +492,7 @@ namespace BBWY.Client.ViewModels.PackTask
Brand = productApiResponse.Data.Items[0].BrandName;
}
var productSku = packTaskService.GetProductSku(skuid);
var productSku = packTaskService.SearchProduct(skuid);
if (productSku == null || !productSku.Success || productSku.Data == null)
return;
if (TaskId <= 0)
@ -475,6 +522,9 @@ namespace BBWY.Client.ViewModels.PackTask
{
BarCodeModel = new BarCodeModel();
}
if (BarCodeModel.LabelModel == BarcodeLabelModel.)
BarCodeModel.LabelModel = BarcodeLabelModel.;
BarCodeModel.Brand = Brand;
if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName;
@ -486,26 +536,20 @@ namespace BBWY.Client.ViewModels.PackTask
{
IsNeedBarCode = Need.;
IsSetBarCode = true;
}
if (productSku.Data.PackConfig != null&&TaskId<=0)
if (productSku.Data.PackConfig != null && TaskId <= 0)
{
var config = productSku.Data.PackConfig;
SkuTitle = config.SkuGoodsTitle;
GoodsNumber = config.GoodsNumber;
PackType = (PackType)config.PackType;
BasicPack = (BasicPack)config.BasicPack;
//Availability = (TaskState)config.Availability;
MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition. : (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1;
string[] increateDatas = config.Increment1.Split(',');
IsNeedBarCode = config.NeedBar ? Need. : Need.;
IsNeedCertificateModel = config.NeedCer ? Need. : Need.;
IsSetBarCode = !config.NeedBar;
//IsSetCertificate = config.CertificatePosition== (int)CertificatePosition.无需合格证;
bool isSelected = false;
foreach (var item in increates)
{
@ -573,6 +617,10 @@ namespace BBWY.Client.ViewModels.PackTask
public void InitData(PackTaskModel model = null)
{
//展示数据
IncreateList = new ObservableCollection<IncreateModel>();
SpuId = string.Empty;
if (model == null)
@ -590,7 +638,6 @@ namespace BBWY.Client.ViewModels.PackTask
ProductNo = string.Empty;
Brand = string.Empty;
BrandName = string.Empty;
this.MarkMessage = "";
IsSetBarCode = true;
IsSetCertificate = true;
BarCodeModel = null;
@ -610,7 +657,7 @@ namespace BBWY.Client.ViewModels.PackTask
return;
}
SaveTask = "保存";
Logo = model.ItemList[0].Logo.Replace("80x80","200x200");
Logo = model.ItemList[0].Logo.Replace("80x80", "200x200");
SearchSkuId = model.SkuId;
SkuId = model.SkuId;
SkuCount = model.SkuCount;
@ -618,7 +665,7 @@ namespace BBWY.Client.ViewModels.PackTask
ProductNo = model.ItemList[0].GoodsNo;
Brand = model.Brand;
BrandName = model.ItemList[0].BrandName;
this.MarkMessage = model.MarkMessage;
IsSetBarCode = model.BarCodeModel != null ? false : true;
IsSetCertificate = model.CertificateModel != null ? false : true;
BarCodeModel = model.BarCodeModel;
@ -629,13 +676,12 @@ namespace BBWY.Client.ViewModels.PackTask
try
{
PositionType = model.PositionType.ToEnum<PositionType>();//多个仓库异常
PositionType = model.PositionType.ToEnum<PositionType>();//多个仓库异常 todo:
}
catch
{
}
PackType = model.PackType;
BasicPack = model.BasicPack;
IsNeedBarCode = model.BarCodeModel == null ? Need. : Need.;
@ -643,6 +689,12 @@ namespace BBWY.Client.ViewModels.PackTask
CertificatePosition = model.CertificatePosition;
TaskId = model.TaskId;
var res = markMessageService.ShowTaskMarkMessage(TaskId);
if (res!=null&&res.Success&&res.Data!=null)
{
ShowMarkMessage = string.Join("\r\n", res.Data.Select(d => d.ToString()));
}
string[] increateDatas = model.Increment1?.Split(',');
bool isTrue = false;
@ -725,7 +777,7 @@ namespace BBWY.Client.ViewModels.PackTask
ShopId = globalContext.User.Shop.ShopId.ToString(),
NeedBar = IsNeedBarCode == Need.,
NeedCer = IsNeedCertificateModel == Need.
};
if (IsNeedBarCode == Need.)
{
@ -740,7 +792,7 @@ namespace BBWY.Client.ViewModels.PackTask
{
if (CertificateModel == null || IsSetCertificate || CertificateModel.Count() <= 0)
{
MessageBox.Show ("请设置合格证模板","提示");
MessageBox.Show("请设置合格证模板", "提示");
return;
}
createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));//
@ -756,11 +808,12 @@ namespace BBWY.Client.ViewModels.PackTask
res = packTaskService.CreateTask(createTaskModel);
}
if(res == null) {
if (res == null)
{
MessageBox.Show("未知错误");
return;
}
if (!res .Success)
if (!res.Success)
{
MessageBox.Show(res.Msg);
return;

27
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs

@ -129,6 +129,20 @@ namespace BBWY.Client.ViewModels.PackTask
private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
/// <summary>
/// 查询Spu
/// </summary>
private string searchSpuId;
public string SearchSpuId { get => searchSpuId; set { Set(ref searchSpuId, value); } }
/// <summary>
/// 查询拳探订单号
/// </summary>
private string searchOrderSn;
public string SearchOrderSn { get => searchOrderSn; set { Set(ref searchOrderSn, value); } }
private TaskState? taskState;
/// <summary>
/// 任务状态
@ -522,7 +536,7 @@ namespace BBWY.Client.ViewModels.PackTask
try
{
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId, this.TaskState,
var datas = packTaskService.SearchTaskList(SearchSkuId, SearchTaskId,SearchSpuId,SearchOrderSn, this.TaskState,
PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{
@ -546,10 +560,11 @@ namespace BBWY.Client.ViewModels.PackTask
{ BrandName = item.BrandName,
GoodsNo = item.ProductItemNum, Logo= item.Logo,
SkuName = item.SkuName,
SkuId = item.SkuId
SkuId = item.SkuId,
} },
MarkMessage = item.MarkMessage,
ShowMarkMessage = item.ShowMarkMessage,
PackType = (PackType)item.PackType,
PositionType = item.PositionType,
@ -564,7 +579,7 @@ namespace BBWY.Client.ViewModels.PackTask
QualityCompletionOverTime = item.QualityCompletionOverTime,
PackCompletionOverTime = item.PackCompletionOverTime,
ShopName = item.ShopName,
SkuPurchaseSchemeId = item.SkuPurchaseSchemeId,
};
if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
@ -581,6 +596,8 @@ namespace BBWY.Client.ViewModels.PackTask
if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
{
data.BarCodeModel = item.BarCodeDTO;
if (data.BarCodeModel.LabelModel == BarcodeLabelModel.)
data.BarCodeModel.LabelModel = BarcodeLabelModel.;
}
if (item.Cers != null)
{
@ -734,7 +751,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (SealBoxConfigureType == SealBoxConfigureType.)
{
SealBoxWaitConfigureList = new ObservableCollection<SealBoxWaitConfigureModel>();
ApiResponse<SealBoxWaitConfigureResponse> sealBoxWaitRes = sealBoxService.GetSealBoxWaitConfigureList(SearchSkuId, SearchTaskId, PageSize, PageIndex);
ApiResponse<SealBoxWaitConfigureResponse> sealBoxWaitRes = sealBoxService.GetSealBoxWaitConfigureList(SearchSkuId, SearchTaskId, PageSize, PageIndex,SearchSpuId);
if (sealBoxWaitRes == null)
{

808
BBWY.Client/ViewModels/PackTask/UpdatePurchaseTaskViewModel.cs

@ -0,0 +1,808 @@
using BBWY.Client.APIServices.QiKu;
using BBWY.Client.APIServices;
using BBWY.Client.Models.APIModel.Request;
using BBWY.Client.Models.PackTask;
using BBWY.Client.Models;
using BBWY.Client.Views.PackTask;
using BBWY.Common.Models;
using GalaSoft.MvvmLight.Command;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Windows.Input;
using System.Windows;
using BBWY.Client.Views.QualityTask;
using BBWY.Client.Models.QualityTask;
namespace BBWY.Client.ViewModels.PackTask
{
public class UpdatePurchaseTaskViewModel : BaseVM
{
#region 属性
private ObservableCollection<PurchaseSku> purchaseSkuList;
public ObservableCollection<PurchaseSku> PurchaseSkuList { get => purchaseSkuList; set { Set(ref purchaseSkuList, value); } }
private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
// public long TaskId { get; set; }
//private bool isSelected;
//public bool IsSelected { get => isSelected; set { Set(ref isSelected, value); } }
private ObservableCollection<string> worryList = new ObservableCollection<string> {
"否","是"
};
public ObservableCollection<string> WorryList { get => worryList; set { Set(ref worryList, value); } }
private ObservableCollection<string> positionTypeList = new ObservableCollection<string> {
"商家仓","齐越仓", "京东仓","聚水潭仓"};
public ObservableCollection<string> PositionTypeList { get => positionTypeList; set { Set(ref positionTypeList, value); } }
private ObservableCollection<string> packTypeList = new ObservableCollection<string> {
"单件","多件"
};
public ObservableCollection<string> PackTypeList { get => packTypeList; set { Set(ref packTypeList, value); } }
private ObservableCollection<string> basicPackList = new ObservableCollection<string> {
"快递袋","纸箱","麻袋"
};
public ObservableCollection<string> BasicPackList { get => basicPackList; set { Set(ref basicPackList, value); } }
private ObservableCollection<string> isNeedBarCodeList = new ObservableCollection<string> {
"需要", "不需要" };
public ObservableCollection<string> IsNeedBarCodeList { get => isNeedBarCodeList; set { Set(ref isNeedBarCodeList, value); } }
private ObservableCollection<string> isNeedCerList = new ObservableCollection<string> {
"需要", "不需要" };
public ObservableCollection<string> IsNeedCerList { get => isNeedCerList; set { Set(ref isNeedCerList, value); } }
private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> {
"无","外部包装","产品包装"
};
public ObservableCollection<string> CertificatePositionList { get => certificatePositionList; set { Set(ref certificatePositionList, value); } }
private ObservableCollection<string> availabilityList = new ObservableCollection<string> {
"已到货","部分到货","未到货"
};
public ObservableCollection<string> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } }
private int skuCount;
/// <summary>
/// Sku任务数
/// </summary>
public int SkuCount { get => skuCount; set { Set(ref skuCount, value); } }
private string skuId;
/// <summary>
/// Sku
/// </summary>
public string SkuId { get => skuId; set { Set(ref skuId, value); } }
public string OrderId { get; set; }
private string logo;
/// <summary>
/// 店铺Sku图链接
/// </summary>
public string Logo { get => logo; set { Set(ref logo, value); } }
private string skuName;
/// <summary>
/// 采购Sku名称
/// </summary>
public string SkuName { get => skuName; set { Set(ref skuName, value); } }
private string brand;
/// <summary>
/// 品牌
/// </summary>
public string Brand { get => brand; set { Set(ref brand, value); } }
private string productNo;
/// <summary>
/// 货号
/// </summary>
public string ProductNo { get => productNo; set { Set(ref productNo, value); } }
private string brandName;
/// <summary>
/// 品名(手写上传)
/// </summary>
public string BrandName { get => brandName; set { Set(ref brandName, value); } }
private int goodsNumber;
/// <summary>
/// 配件数
/// </summary>
public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
private Worry isWorry;
/// <summary>
/// 是否加急
/// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
private Availability availability;
/// <summary>
/// 到货情况(待收货=0,部分收货=1,已到货=2)
/// </summary>
public Availability Availability { get => availability; set { Set(ref availability, value); } }
private PackType packType;
/// <summary>
/// 打包类型(单件=0,多件=1)
/// </summary>
public PackType PackType { get => packType; set { Set(ref packType, value); } }
private BasicPack basicPack;
/// <summary>
/// 基础包装(快递袋=0,纸箱=1,麻袋=2)
/// </summary>
public BasicPack BasicPack { get => basicPack; set { Set(ref basicPack, value); } }
private PositionType positionType;
/// <summary>
/// 落仓(商家仓=0,齐越仓=1,京东仓=2,聚水潭仓=3)
/// </summary>
public PositionType PositionType { get => positionType; set { Set(ref positionType, value); } }
private string skuTitle;
/// <summary>
/// sku配件商品名称
/// </summary>
public string SkuTitle { get => skuTitle; set { Set(ref skuTitle, value); } }
private Need isNeedBarCode;
/// <summary>
/// 是否需要合格证
/// </summary>
public Need IsNeedBarCode { get => isNeedBarCode; set { Set(ref isNeedBarCode, value); } }
private Need isNeedCertificateModel;
/// <summary>
/// 是否需要条形码
/// </summary>
public Need IsNeedCertificateModel { get => isNeedCertificateModel; set { Set(ref isNeedCertificateModel, value); } }
private BarCodeModel barCodeModel;
/// <summary>
/// 条形码
/// </summary>
public BarCodeModel BarCodeModel { get => barCodeModel; set { Set(ref barCodeModel, value); } }
private bool isSetBarCode;
/// <summary>
/// 设置显示(条形码)
/// </summary>
public bool IsSetBarCode
{
get => isSetBarCode;
set
{
Set(ref isSetBarCode, value);
// IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要;
}
}
private bool isSetCertificate;
/// <summary>
/// 设置显示(合格证)
/// </summary>
public bool IsSetCertificate
{
get => isSetCertificate; set
{
Set(ref isSetCertificate, value);
//IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要;
}
}
private string setSpuCerStatus;
public string SetSpuCerStatus { get => setSpuCerStatus; set { Set(ref setSpuCerStatus, value); } }
private bool isSetSpuCertificate = true;
/// <summary>
/// 设置spu显示(合格证)
/// </summary>
public bool IsSetSpuCertificate
{
get => isSetSpuCertificate; set
{
Set(ref isSetSpuCertificate, value);
SetSpuCerStatus = IsSetSpuCertificate ? "设置spu模板" : "修改spu模板";
}
}
private string saveTask;
/// <summary>
/// 设置显示(合格证)
/// </summary>
public string SaveTask { get => saveTask; set { Set(ref saveTask, value); } }
private string spuId;
/// <summary>
/// spuid
/// </summary>
public string SpuId { get => spuId; set { Set(ref spuId, value); } }
private CertificateModel spuCertificateModel;
/// <summary>
/// spu合格证
/// </summary>
public CertificateModel SpuCertificateModel { get => spuCertificateModel; set { Set(ref spuCertificateModel, value); } }
private CertificateModel certificateModel;
/// <summary>
/// 合格证
/// </summary>
public CertificateModel CertificateModel { get => certificateModel; set { Set(ref certificateModel, value); } }
/// <summary>
/// 合格证位置(外部包装=0,产品包装=1)
/// </summary>
private CertificatePosition certificatePosition;
/// <summary>
/// 合格证位置(外部包装=0,产品包装=1)
/// </summary>
public CertificatePosition CertificatePosition { get => certificatePosition; set { Set(ref certificatePosition, value); } }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
private string markMessage;
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string MarkMessage { get => markMessage; set { Set(ref markMessage, value); } }
private long taskId;
public long TaskId { get => taskId; set { Set(ref taskId, value); } }
private string showMarkMessage;
/// <summary>
/// 显示备注列表(对接备注)
/// </summary>
public string ShowMarkMessage { get => showMarkMessage; set { Set(ref showMarkMessage, value); } }
private ObservableCollection<IncreateModel> increateList;
/// <summary>
/// 增量耗材查询关键字
/// </summary>
public ObservableCollection<IncreateModel> IncreateList { get => increateList; set { Set(ref increateList, value); } }
string[] increates = new string[] { "气泡纸", "气泡袋", "POP袋", "折纸箱", "气泡纸封边", "彩盒", "剪胶", "剪彩带", "快递袋", "收纳盒", "纸箱子", "装纸箱", "封边", "胶带", "折彩盒" };
PackPurchaseTaskService packPurchaseTaskService;
PackTaskService packTaskService;
ProductService productService;
GlobalContext globalContext;
private bool isLoading = false;
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
#endregion
public UpdatePurchaseTaskViewModel(ProductService productService, GlobalContext globalContext, PackPurchaseTaskService packPurchaseTaskService, PurchaseService purchaseService, MarkMessageService markMessageService, PackTaskService packTaskService)
{
this.packPurchaseTaskService = packPurchaseTaskService;
this.productService = productService;
this.globalContext = globalContext;
CreateTaskCommand = new RelayCommand<object>(CreateTask);
OpenSkuDetailCommand = new RelayCommand<object>(OpenSkuDetail);
SetBarCodeCommand = new RelayCommand(SetBarCode);
SetCertificateCommand = new RelayCommand<PurchaseSku>(SetCertificate);
LookBarCommand = new RelayCommand(LookBar);
LookCerCommand = new RelayCommand<string>(LookCer);
IncreateList = new ObservableCollection<IncreateModel>();
foreach (var item in increates)
{
IncreateList.Add(new IncreateModel
{
IncreateName = item,
IsSelected = false
});
}
this.purchaseService = purchaseService;
AppendMarkMessageCommand = new RelayCommand(AppendMarkMessage);
this.markMessageService = markMessageService;
this.packTaskService = packTaskService;
}
MarkMessageService markMessageService;
private void AppendMarkMessage()
{
var res = markMessageService.AppendMarkMessage(TaskId, MarkMessage, globalContext.User.Name);
if (res == null)
{
return;
}
if (!res.Success)
{
MessageBox.Show(res.Msg);
return;
}
MarkMessage = string.Empty;
var resShow = markMessageService.ShowTaskMarkMessage(TaskId);
if (resShow != null && resShow.Success && resShow.Data != null)
{
ShowMarkMessage = string.Join("\r\n", resShow.Data.Select(d => d.ToString()));
}
}
PurchaseService purchaseService;
public string OriginShopName { get; set; }
public string SkuPurchaseSchemeId { get; set; }
public Platform Platform { get; set; }
public SaveType SaveType { get; set; }
#region 方法
public ICommand SetBarCodeCommand { get; set; }
public ICommand SetCertificateCommand { get; set; }
public ICommand LookBarCommand { get; set; }
public ICommand LookCerCommand { get; set; }
public ICommand OpenSkuDetailCommand { get; set; }
public ICommand CreateTaskCommand { get; set; }
public ICommand SearchSkuCommand { get; set; }
public ICommand AppendMarkMessageCommand { get; set; }
private void SetBarCode()
{
if (string.IsNullOrEmpty(SkuId))
{
return;
}
//if (TaskId > 0 && string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据
//{
// SearchSku(SkuId);
//}
if (BarCodeModel == null)
{
BarCodeModel = new BarCodeModel();
BarCodeModel.ProductNo = ProductNo;
BarCodeModel.Brand = Brand;
BarCodeModel.SkuId = SkuId;
BarCodeModel.SkuName = SkuName;
}
if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName;
SetBarCodeWindow setBarCodeWindow = new SetBarCodeWindow();
setBarCodeWindow.LoadData(BarCodeModel, packTaskService);
setBarCodeWindow.SaveResult = b =>
{
BarCodeModel = b;
IsSetBarCode = false;
IsNeedBarCode = Need.;
};
setBarCodeWindow.Show();
}
/// <summary>
/// 设置合格证
/// </summary>
private void SetCertificate(PurchaseSku model)
{
if (model.CerDTO == null)
{
model.CerDTO = new CertificateModel
{
ProductNo = ProductNo,
Brand = Brand,
SkuId = SkuId,
PurchaseSkuId = model.PurchaseSkuId
};
}
if (!string.IsNullOrEmpty(BrandName))
model.CerDTO.BrandName = BrandName;
QualitySetCerWindow setCerWindow = new QualitySetCerWindow();
setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, SaveType);
setCerWindow.SaveResult = (s, PackCerState) =>
{
var skus = PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == s.PurchaseSkuId);
skus.CerDTO = s;
skus.IsSetCertificate = false;
skus.IsNeedCer = PackCerState == PackCerState.;
IsNeedCertificateModel = Need.;
};
setCerWindow.Show();
}
/// <summary>
/// 查看合格证
/// </summary>
private void LookCer(string id)
{
QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == id).CerDTO);
lookCerWindow.Show();
}
/// <summary>
/// 查看条形码
/// </summary>
private void LookBar()
{
LookBarCodeWindow look = new LookBarCodeWindow();
look.SetData(BarCodeModel);
look.Show();
}
/// <summary>
/// 搜索 skuId(todo:)
/// </summary>
public bool SearchSku(PackTaskModel obj)
{
//InitData();
TaskId = obj.TaskId;
SaveType = SaveType.B端;
var resShow = markMessageService.ShowTaskMarkMessage(TaskId);
if (resShow != null && resShow.Success && resShow.Data != null)
{
ShowMarkMessage = string.Join("\r\n", resShow.Data.Select(d => d.ToString()));
}
//SkuPurchaseSchemeId = "416647656341573";
OriginShopName = obj.ShopName;
SkuId =obj.SkuId;
OrderId = obj.OrderId;
var shopList = globalContext.User.ShopList;
var shop = shopList.SingleOrDefault(s => s.ShopName == OriginShopName);
Logo = obj.ItemList[0].Logo;
SkuName = obj.ItemList[0].SkuName;
if (string.IsNullOrEmpty(SkuId))
return false;
ApiResponse<ProductListResponse> productApiResponse = null;
var skuResponse = productService.GetProductSkuList(string.Empty, SkuId, shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
if (skuResponse.Success)
{
if (skuResponse.Data.Count() == 0)
{
return false;
}
Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");
SkuName = skuResponse.Data[0].Title;
SpuId = skuResponse.Data[0].ProductId;
productApiResponse = productService.GetProductList(skuResponse.Data[0].ProductId, string.Empty, string.Empty, 1,
shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
if (productApiResponse.Success)
{
if (productApiResponse.Data.Count == 0)
{
return false;
}
ProductNo = productApiResponse.Data.Items[0].ProductItemNum;
Brand = productApiResponse.Data.Items[0].BrandName;
}
var productSku = packPurchaseTaskService.GetConfigPack(SkuId, "", OrderId);
if (productSku == null || !productSku.Success || productSku.Data == null)
{
MessageBox.Show(productSku.Msg);
return false;
}
SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId;
BarCodeModel = productSku.Data.BarCode;
if (BarCodeModel == null)
{
BarCodeModel = new BarCodeModel();
}
if (!string.IsNullOrEmpty(Brand))
BarCodeModel.Brand = Brand;
if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName;
BarCodeModel.ProductNo = ProductNo;
BarCodeModel.SkuId = SkuId;
BarCodeModel.SkuName = SkuName;
PurchaseSkuList = new ObservableCollection<PurchaseSku>();
foreach (var item in productSku.Data.PurchaseSkus)
{
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null) continue;
var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
if (skuItem == null)
{
MessageBox.Show($"{item.PurchaseProductId}采购商品列表不存在skuid:{item.PurchaseSkuId},sku商品可能被下架了.");
//return false;
}
App.Current.Dispatcher.Invoke(new Action(() =>
{
PurchaseSkuList.Add(new PurchaseSku
{
Logo = skuItem?.Logo,
Title = skuItem?.Title,
IsNeedCer = item.IsNeedCer,
PurchaseSkuId = item.PurchaseSkuId,
CerDTO = item.CerDTO,
IsSetCertificate = item.CerDTO == null ? true : false,
});
}));
}
IsNeedBarCode = Need.;
IsSetBarCode = true;
IsSetCertificate = true;
if (productSku.Data.PackConfig != null)
{
var config = productSku.Data.PackConfig;
SkuTitle = config.SkuGoodsTitle;
BrandName = config.BrandName;
GoodsNumber = config.GoodsNumber;
PackType = (PackType)config.PackType;
BasicPack = (BasicPack)config.BasicPack;
//MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition. : (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1;
IsNeedBarCode = config.NeedBar ? Need. : Need.;
IsNeedCertificateModel = config.NeedCer ? Need. : Need.;
IsSetBarCode = !config.NeedBar;
IsSetCertificate = !config.NeedCer;
string[] increateDatas = config.Increment1?.Split(',');
bool isSelected = false;
IncreateList = new ObservableCollection<IncreateModel>();
foreach (var item in increates)
{
isSelected = false;
if (increateDatas != null && increateDatas.Count() > 0 && increateDatas.Contains(item))
{
isSelected = true;
}
App.Current.Dispatcher.Invoke(() =>
{
IncreateList.Add(new IncreateModel
{
IncreateName = item,
IsSelected = isSelected
});
});
}
}
return true;
}
else
{
App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
return false;
}
return true;
//加载配置文件
}
//public void SearSpuCer()
//{
// if (string.IsNullOrEmpty(SpuId))
// {
// SearchSku(SkuId);
// return;
// }
// SpuId = SpuId.Trim();//去掉空格 避免数据异常
// var productSku = packPurchaseTaskService.GetSpuCer(SpuId);
// if (productSku == null || !productSku.Success)
// {
// IsSetSpuCertificate = true;
// return;
// }
// SpuCertificateModel = productSku.Data;
// IsSetSpuCertificate = false;
// if (SpuCertificateModel == null)
// {
// SpuCertificateModel = new CertificateModel();
// IsSetSpuCertificate = true;
// SpuCertificateModel.Brand = Brand;
// SpuCertificateModel.BrandName = BrandName;
// SpuCertificateModel.ProductNo = ProductNo;
// SpuCertificateModel.SpuId = SpuId;
// }
//}
public Action ReflashWindow { get; set; }
public void InitData()
{
PurchaseSkuList = new ObservableCollection<PurchaseSku>();
IsSetBarCode = true;
SkuTitle = "";
BrandName = "";
GoodsNumber = 0;
PackType = PackType.;
BasicPack = BasicPack.;
SkuPurchaseSchemeId = "";
SkuTitle = "";
BarCodeModel = null;
OriginShopName = "";
// Availability = (TaskState.)config.Availability;
MarkMessage = "";
CertificatePosition = CertificatePosition.;
// Increment1 = config.Increment1;
IsNeedBarCode = Need.;
IsNeedCertificateModel = Need.;
bool isSelected;
IncreateList = new ObservableCollection<IncreateModel>();
foreach (var item in increates)
{
isSelected = false;
App.Current.Dispatcher.Invoke(() =>
{
IncreateList.Add(new IncreateModel
{
IncreateName = item,
IsSelected = isSelected
});
});
}
}
private void OpenSkuDetail(object param)
{
var paramList = (object[])param;
// var orderId = paramList[0].ToString();
var skuId = paramList[0].ToString();
var url = $"https://item.jd.com/{skuId}.html";
try
{
System.Diagnostics.Process.Start("explorer.exe", url);
}
catch (Exception ex)
{
Clipboard.SetText(url);
MessageBox.Show($"{ex.Message}\r\n调用浏览器失败,网页链接已复制到剪切板,请手动打开浏览器访问", "提示");
}
}
private void CreateTask(object obj)
{
string increateStr = "";
var increates = IncreateList.Where(i => i.IsSelected).Select(i => i.IncreateName);
if (increates != null && increates.Count() > 0)
{
increateStr = string.Join(",", increates);
}
var createTaskModel = new UpdatePurchaseTaskRequest
{
ProductNo = ProductNo,
Logo = Logo.Replace("200x200", "80x80"),
SkuName = SkuName,
OrderId = OrderId,
BrandName = BrandName,
Availability = (int)Availability,
BasicPack = (int)BasicPack,
SkuId = SkuId,
Increment1 = increateStr,
CertificatePosition = (int)CertificatePosition,
PackType = (int)PackType,
MarkMessage = MarkMessage,
PositionType = (int)PositionType,
GoodsNumber = GoodsNumber,
SkuGoodsTitle = SkuTitle,
SkuCount = SkuCount,
NeedBar = IsNeedBarCode == Need.,
NeedCer = IsNeedCertificateModel == Need.,
SkuPurchaseSchemeId = SkuPurchaseSchemeId,
Brand = Brand,
PurchaseSkuSpecs = PurchaseSkuList.Select(p => new PurchaseSkuSpec
{
IsNeedCer = p.IsNeedCer,
PurchaseSkuId = p.PurchaseSkuId,
}).ToArray()
//IsWorry = IsWorry
};
if (IsNeedBarCode == Need.)
{
if (BarCodeModel == null || IsSetBarCode || BarCodeModel.Id <= 0)
{
MessageBox.Show("请设置条形码模板");
//new TipsWindow("请设置条形码模板").Show();
return;
}
createTaskModel.BarCodeId = BarCodeModel.Id;
}
if (IsNeedCertificateModel == Need.)
{
if (purchaseSkuList.Any(p => p.IsNeedCer && p.CerDTO == null))
{
MessageBox.Show("有未设置的合格证,请设置完所有的合格证再保存");
return;
}
var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList();
if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0)
{
MessageBox.Show("请设置合格证模板");
return;
}
createTaskModel.CerId = string.Join(",", cerList);//
}
ApiResponse<long> res = null;
res = packPurchaseTaskService.UpdatePurchaseTask(createTaskModel);
if (res.Success)
{
if (ReflashWindow != null) ReflashWindow();//刷新主界面
var win = obj as System.Windows.Window;
win.Close();
return;
}
MessageBox.Show(res.Msg);
}
#endregion
}
}

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

@ -38,6 +38,113 @@ namespace BBWY.Client.ViewModels.PackTask
//public RelayCommand<string> SelectCmd => new RelayCommand<string>(str => Growl.Info(str));
#region 属性绑定
private ObservableCollection<string> selectExpressList = new ObservableCollection<string> {
"物流单号","物流公司名称"
};
public ObservableCollection<string> SelectExpressList { get => selectExpressList; set { Set(ref selectExpressList, value); } }
private ObservableCollection<string> selectSkuList = new ObservableCollection<string> {
"SKU","SPU"
};
public ObservableCollection<string> SelectSkuList { get => selectSkuList; set { Set(ref selectSkuList, value); } }
private ObservableCollection<string> selectIdList = new ObservableCollection<string> {
"任务ID","拳探订单号"
};
public ObservableCollection<string> SelectIdList { get => selectIdList; set { Set(ref selectIdList, value); } }
/// <summary>
/// 查询物流
/// </summary>
private string selectExpress;
public string SelectExpress
{
get => selectExpress;
set
{
Set(ref selectExpress, value);
OnSelectExpressChanged(SelectExpress);
}
}
private void OnSelectExpressChanged(string SelectExpress)
{
if (SelectExpress == "物流单号")
{
SearchExpressName = null;
}
if (SelectExpress == "物流公司名称")
{
SearchWayBillNo = null;
}
}
/// <summary>
/// 查询物流
/// </summary>
private string selectTaskId= "任务ID";
public string SelectTaskId
{
get => selectTaskId;
set
{
Set(ref selectTaskId, value);
OnSelectTaskIdChanged(SelectTaskId);
}
}
private void OnSelectTaskIdChanged(string SelectTaskId)
{
if (SelectTaskId == "任务ID")
{
searchOrderSn = null;
}
if (SelectTaskId == "拳探订单号")
{
SearchTaskId = null;
}
}
/// <summary>
/// 查询sku
/// </summary>
private string selectSku;
public string SelectSku
{
get => selectSku;
set
{
Set(ref selectSku, value);
OnSelectSkuChanged(SelectSku);
}
}
private void OnSelectSkuChanged(string SelectSku)
{
if (SelectSku == "SKU")
{
SearchSpuId = null;
}
if (SelectSku == "SPU")
{
SearchSkuId = null;
}
}
/// <summary>
/// 查询时间段
/// </summary>
@ -206,6 +313,20 @@ namespace BBWY.Client.ViewModels.PackTask
private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
/// <summary>
/// 查询Spu
/// </summary>
private string searchSpuId;
public string SearchSpuId { get => searchSpuId; set { Set(ref searchSpuId, value); } }
/// <summary>
/// 查询拳探订单号
/// </summary>
private string searchOrderSn;
public string SearchOrderSn { get => searchOrderSn; set { Set(ref searchOrderSn, value); } }
private TaskState? taskState;
/// <summary>
/// 任务状态
@ -332,6 +453,9 @@ namespace BBWY.Client.ViewModels.PackTask
public GlobalContext globalContext;
public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService)
{
this.globalContext = globalContext;
this.sealBoxService = sealBoxService;
this.packTaskService = packTaskService;
@ -404,6 +528,10 @@ namespace BBWY.Client.ViewModels.PackTask
LookLSOrderConfigureCommand = new RelayCommand<object>(LookLSOrderConfigure);
SubmitOverTimeMarkMsgCommand = new RelayCommand<object>(SubmitOverTimeMarkMsg);
SelectSku = "SKU";
SelectExpress = "物流单号";
}
private void SubmitOverTimeMarkMsg(object param)
@ -414,7 +542,7 @@ namespace BBWY.Client.ViewModels.PackTask
var markMsg = paramList[1]?.ToString();
OverTimeTaskType overTimeTaskType= OverTimeTaskType.;
OverTimeTaskType overTimeTaskType = OverTimeTaskType.;
switch (TaskState.Value)
{
case Models.TaskState.:
@ -1092,7 +1220,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (datetime.TotalMilliseconds > 0)
{
item.IsWaitTransportOverTime = false;
item.WaitTransportRemainTime = OverTimeHelper.GetTimeString(datetime);
item.WaitTransportRemainTime = OverTimeHelper.GetTimeString(datetime);
}
else
{
@ -1245,7 +1373,7 @@ namespace BBWY.Client.ViewModels.PackTask
WareName = item.WareName,
SealBoxId = item.SealBoxId,
SealBoxPackOverTime = item.SealBoxPackOverTime,
SealBoxPackOverTimeMarkMsg = item.SealBoxPackOverTimeMarkMsg
SealBoxPackOverTimeMarkMsg = item.SealBoxPackOverTimeMarkMsg
});
}));
@ -1274,7 +1402,7 @@ namespace BBWY.Client.ViewModels.PackTask
else
{
item.IsSealBoxOverTime = true;
item.SealBoxRemainTime = OverTimeHelper.GetTimeString(datetime) ;
item.SealBoxRemainTime = OverTimeHelper.GetTimeString(datetime);
}
}
@ -1343,7 +1471,7 @@ namespace BBWY.Client.ViewModels.PackTask
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
var datas = packTaskService.GetWareHouseList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, this.TaskState, SearchShopName,
var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, SearchSpuId, SearchOrderSn, this.TaskState, SearchShopName,
PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{
@ -1367,7 +1495,6 @@ namespace BBWY.Client.ViewModels.PackTask
SkuName = item.SkuName,
SkuId = item.SkuId
} },
MarkMessage = item.MarkMessage,
PackType = (PackType)item.PackType,
TaskState = item.TaskState,
PositionType = item.PositionType,
@ -1382,9 +1509,11 @@ namespace BBWY.Client.ViewModels.PackTask
QualityCompletionOverTime = item.QualityCompletionOverTime,
PackCompletionOverTime = item.PackCompletionOverTime,
ShopName = item.ShopName,
QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg,
PackOverTimeMarkMsg = item.PackOverTimeMarkMsg
//ExpressOrderList = item.ExpressOrderList,
QualityOverTimeMarkMsg = item.QualityOverTimeMarkMsg,
PackOverTimeMarkMsg = item.PackOverTimeMarkMsg,
ShowMarkMessage = item.ShowMarkMessage,
SkuPurchaseSchemeId = item.SkuPurchaseSchemeId
};
if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())
@ -1410,6 +1539,8 @@ namespace BBWY.Client.ViewModels.PackTask
{
data.BarCodeModel = item.BarCodeDTO;
if (data.BarCodeModel.LabelModel == BarcodeLabelModel.)
data.BarCodeModel.LabelModel = BarcodeLabelModel.;
}
if (item.Cers != null)

520
BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@ -21,6 +21,8 @@ using System.Runtime.InteropServices.WindowsRuntime;
using NPOI.Util;
using BBWY.Controls;
using WebSocketSharp;
using BBWY.Client.APIServices.QiKu;
using BarcodeLib;
namespace BBWY.Client.ViewModels
{
@ -105,47 +107,6 @@ namespace BBWY.Client.ViewModels
};
public ObservableCollection<int> FloorDragNumberList { get => floorDragNumberList; set { Set(ref floorDragNumberList, value); } }
//private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string>
//{
//};
//public ObservableCollection<string> PreCompeteTimeDayList
//{
// get => preCompeteTimeDayList; set
// {
// Set(ref preCompeteTimeDayList, value);
// }
//}
//private ObservableCollection<string> preCompeteTimeHourList = new ObservableCollection<string> {
// };
//public ObservableCollection<string> PreCompeteTimeHourList { get => preCompeteTimeHourList; set { Set(ref preCompeteTimeHourList, value); } }
////
//public string preCompeteTimeDay;
//public string PreCompeteTimeDay
//{
// get => preCompeteTimeDay; set
// {
// Set(ref preCompeteTimeDay, value);
// PreCompeteTimeDayOnChanged();//
// }
//}
//public string preCompeteTimeHour;
//public string PreCompeteTimeHour { get => preCompeteTimeHour; set { Set(ref preCompeteTimeHour, value); } }
private ObservableCollection<WareHourseDTO> wareHourseList = new ObservableCollection<WareHourseDTO> { };
public ObservableCollection<WareHourseDTO> WareHourseList { get => wareHourseList; set { Set(ref wareHourseList, value); } }
@ -359,6 +320,15 @@ namespace BBWY.Client.ViewModels
public string MarkMessage { get => markMessage; set { Set(ref markMessage, value); } }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
private string showMarkMessage;
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string ShowMarkMessage { get => showMarkMessage; set { Set(ref showMarkMessage, value); } }
private ObservableCollection<IncreateModel> increateList;
/// <summary>
/// 增量耗材查询关键字
@ -394,7 +364,7 @@ namespace BBWY.Client.ViewModels
public ICommand SearchSkuCommand { get; set; }
#endregion
public QualityViewModel(ProductService productService, GlobalContext globalContext, PackPurchaseTaskService packPurchaseTaskService, PurchaseService purchaseService, PackTaskService packTaskService)
public QualityViewModel(ProductService productService, GlobalContext globalContext, PackPurchaseTaskService packPurchaseTaskService, PurchaseService purchaseService, PackTaskService packTaskService, MarkMessageService markMessageService)
{
this.packPurchaseTaskService = packPurchaseTaskService;
this.productService = productService;
@ -418,7 +388,7 @@ namespace BBWY.Client.ViewModels
this.purchaseService = purchaseService;
this.packTaskService = packTaskService;
this.markMessageService = markMessageService;
}
@ -498,80 +468,6 @@ namespace BBWY.Client.ViewModels
request.CerId = string.Join(",", PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO.Id));
}
//int hour = Convert.ToInt32(PreCompeteTimeHour.Replace("点前", ""));
//DateTime date = DateTime.Now;
//switch (preCompeteTimeDay)
//{
// case "今天":
// date = DateTime.Now;
// break;
// case "明天":
// date = DateTime.Now.AddDays(1);
// break;
// case "后天":
// date = DateTime.Now.AddDays(2);
// break;
// default:
// break;
//}
////date = Convert.ToDateTime(PreCompeteTimeDay);
//var competeTime = date.Date.AddHours(hour);
//if (competeTime < DateTime.Now)
//{
// MessageBox.Show($"预计完成时间不能小于当前时间,请重新选择预计完成时间");
// return;
//}
//var now = DateTime.Now;
//if (now.Hour < 12)
//{
// if (competeTime > now.AddDays(1).Date.AddHours(12))
// {
// MessageBox.Show($"预计完成时间不能超过明天12点,请重新选择预计完成时间");
// return;
// }
//}
//else if (now.Hour < 18)
//{
// if (competeTime > now.AddDays(1).Date.AddHours(18))
// {
// MessageBox.Show($"预计完成时间不能超过明天18点,请重新选择预计完成时间");
// return;
// }
//}
//else if (now.Hour < 22)
//{
// if (competeTime > now.AddDays(1).Date.AddHours(22))
// {
// MessageBox.Show($"预计完成时间不能超过明天22点,请重新选择预计完成时间");
// return;
// }
//}
//else
//{
// if (competeTime > now.AddDays(2).Date.AddHours(12))
// {
// MessageBox.Show($"预计完成时间不能超过后天12点,请重新选择预计完成时间");
// return;
// }
//}
//request.PreCompeteTime = competeTime;
try
{
var competeRes = packPurchaseTaskService.CompeteQualityTask(request);
@ -588,10 +484,10 @@ namespace BBWY.Client.ViewModels
BatchPrintWindow batchPrint = new BatchPrintWindow();
if (BarCodeModel!=null)
{
BarCodeModel.ShopName = OriginShopName;
}
//if (BarCodeModel!=null)
//{
// BarCodeModel.ShopName = OriginShopName;
//}
batchPrint.SetData(GoodProductQuantity,
PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray()
, BarCodeModel);
@ -615,94 +511,6 @@ namespace BBWY.Client.ViewModels
}
//// "12点前","18点前","22点前"
//private void PreCompeteTimeDayOnChanged()
//{
// var now = DateTime.Now;
// if (now.Hour < 12)
// {
// if (PreCompeteTimeDay=="今天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("12点前");
// PreCompeteTimeHourList.Add("18点前");
// PreCompeteTimeHourList.Add("22点前");
// PreCompeteTimeHour = "12点前";
// }
// if (PreCompeteTimeDay == "明天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("12点前");
// PreCompeteTimeHour = "12点前";
// }
// }
// else if (now.Hour < 18)
// {
// if (PreCompeteTimeDay == "今天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("18点前");
// PreCompeteTimeHourList.Add("22点前");
// PreCompeteTimeHour = "18点前";
// }
// if (PreCompeteTimeDay == "明天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("12点前");
// PreCompeteTimeHourList.Add("18点前");
// PreCompeteTimeHour = "12点前";
// }
// }
// else if (now.Hour < 22)
// {
// if (PreCompeteTimeDay == "今天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("22点前");
// PreCompeteTimeHour = "22点前";
// }
// if (PreCompeteTimeDay == "明天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("12点前");
// PreCompeteTimeHourList.Add("18点前");
// PreCompeteTimeHourList.Add("22点前");
// PreCompeteTimeHour = "12点前";
// }
// }
// else
// {
// if (PreCompeteTimeDay == "明天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("12点前");
// PreCompeteTimeHourList.Add("18点前");
// PreCompeteTimeHourList.Add("22点前");
// PreCompeteTimeHour = "12点前";
// }
// if (PreCompeteTimeDay == "后天")
// {
// PreCompeteTimeHourList.Clear();
// PreCompeteTimeHourList.Add("12点前");
// PreCompeteTimeHour = "12点前";
// }
// }
//}
private void SetBarCode()
@ -714,19 +522,18 @@ namespace BBWY.Client.ViewModels
if (BarCodeModel == null)
{
var resCode = packPurchaseTaskService.SearchBarCode(SkuId);
if (resCode == null||!resCode.Success)
if (resCode == null || !resCode.Success)
{
BarCodeModel = new BarCodeModel();
BarCodeModel.ProductNo = ProductNo;
BarCodeModel.Brand = Brand;
BarCodeModel.SkuId = SkuId;
BarCodeModel.SkuName = SkuName;
BarCodeModel.ShopName = OriginShopName;
}
else
{
BarCodeModel = resCode.Data;
BarCodeModel = resCode.Data;
}
}
@ -806,7 +613,7 @@ namespace BBWY.Client.ViewModels
look.Show();
}
MarkMessageService markMessageService;
SaveType? saveType;
/// <summary>
@ -814,8 +621,25 @@ namespace BBWY.Client.ViewModels
/// </summary>
public void SearchSku(PackTaskModel model)
{
OriginShopName = model.ShopName;
InitData();
FloorDragNumber = 0;
PurchaseSkuList = new ObservableCollection<PurchaseSku>();
WareHourseList = new ObservableCollection<WareHourseDTO>();
FloorDragNumberList = new ObservableCollection<int>();
for (int i = 0; i < 30; i++)
{
App.Current.Dispatcher.Invoke((Action)(() =>
{
FloorDragNumberList.Add(i + 1);
}));
}
TaskId = model.TaskId;
OrderId = model.OrderId;
SkuId = model.SkuId;
@ -825,15 +649,11 @@ namespace BBWY.Client.ViewModels
SkuCount = model.SkuCount;
Brand = model.Brand;
ProductNo = model.ProductNo;
MarkMessage = model.MarkMessage;
PackType = model.PackType;
GoodsNumber = model.GoodsNumber;
SkuTitle = model.SkuTitle;
BasicPack = model.BasicPack;
CertificatePosition = model.CertificatePosition;
ArrivalQuantity = 0;
GoodProductQuantity = 0;
@ -859,195 +679,145 @@ namespace BBWY.Client.ViewModels
}
var packTaskRes = packPurchaseTaskService.GetQualityTask(model.TaskId);
if (packTaskRes == null)
{
MessageBox.Show("网络异常!");
return;
}
if (!packTaskRes.Success || packTaskRes.Data == null)
Task.Factory.StartNew(() =>
{
MessageBox.Show(packTaskRes.Msg);
return;
}
var resShow = markMessageService.ShowTaskMarkMessage(TaskId);
if (resShow != null && resShow.Success && resShow.Data != null)
{
ShowMarkMessage = string.Join("\r\n", resShow.Data.Select(d => d.ToString()));
}
var packTaskRes = packPurchaseTaskService.GetQualityTask(model.TaskId);
SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId;
saveType = packTaskRes.Data.SaveType;
if (saveType == null)
{
saveType = OrderId.IsNullOrEmpty() ? SaveType.C端 : SaveType.B端;
}
if (packTaskRes == null || !packTaskRes.Success) return;
BarCodeModel = packTaskRes.Data.BarCodeDTO;
IsNeedBarCode = packTaskRes.Data.IsNeedBar ? Need. : Need.;
IsSetBarCode = packTaskRes.Data.BarCodeDTO == null ? true : false;
IsNeedCertificateModel = packTaskRes.Data.IsNeedCer ? Need. : Need.;
if (packTaskRes.Data.WareHourses != null)
packTaskRes.Data.WareHourses.ToList().ForEach(w =>
if (packTaskRes == null)
{
WareHourseList.Add(w);
});
WareHourseCount = WareHourseList.Count();
if (packTaskRes.Data.PurchaseSkus != null)
{
int goodsIndex = 0;
foreach (var item in packTaskRes.Data.PurchaseSkus)
MessageBox.Show("网络异常!");
return;
}
if (!packTaskRes.Success || packTaskRes.Data == null)
{
goodsIndex++;
if (item.CerDTO != null) item.CerDTO.GoodsNumberIndex = goodsIndex;
item.IsSetCertificate = true;
if (string.IsNullOrEmpty(item.PurchaseProductId))
{
PurchaseSkuList.Add(item); continue;
}
MessageBox.Show(packTaskRes.Msg);
return;
}
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null && !list.Success)
{
PurchaseSkuList.Add(item); continue;
}
PurchaseSkuItemBasicInfoResponse skuItem = null;
if (list.Data != null) skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
App.Current.Dispatcher.Invoke(new Action(() =>
SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId;
saveType = packTaskRes.Data.SaveType;
if (saveType == null)
{
saveType = OrderId.IsNullOrEmpty() ? SaveType.C端 : SaveType.B端;
}
if (packTaskRes == null || !packTaskRes.Success) return;
BarCodeModel = packTaskRes.Data.BarCodeDTO;
IsNeedBarCode = packTaskRes.Data.IsNeedBar ? Need. : Need.;
IsSetBarCode = packTaskRes.Data.BarCodeDTO == null ? true : false;
IsNeedCertificateModel = packTaskRes.Data.IsNeedCer ? Need. : Need.;
if (packTaskRes.Data.WareHourses != null)
packTaskRes.Data.WareHourses.ToList().ForEach(w =>
{
PurchaseSkuList.Add(new PurchaseSku
App.Current.Dispatcher.Invoke(new Action(() =>
{
Logo = skuItem?.Logo,
Title = skuItem?.Title,
IsNeedCer = item.IsNeedCer,
PurchaseSkuId = item.PurchaseSkuId,
CerDTO = item.CerDTO,
IsSetCertificate = item.IsNeedCer,
});
}));
//PurchaseSkuList.Add(item);
}
}
if (BarCodeModel==null)
{
//加载品牌品名数据
var shopList = globalContext.User.ShopList;
var shop = shopList.FirstOrDefault(s => s.ShopName == model.ShopName);
if (shop != null)
WareHourseList.Add(w);
}));
});
WareHourseCount = WareHourseList.Count();
if (packTaskRes.Data.PurchaseSkus != null)
{
var skuResponse = productService.GetProductSkuList(string.Empty, SkuId, shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
if (skuResponse.Success)
int goodsIndex = 0;
foreach (var item in packTaskRes.Data.PurchaseSkus)
{
if (skuResponse.Data.Count == 0)
goodsIndex++;
if (item.CerDTO != null) item.CerDTO.GoodsNumberIndex = goodsIndex;
item.IsSetCertificate = true;
if (string.IsNullOrEmpty(item.PurchaseProductId))
{
return;
App.Current.Dispatcher.Invoke(new Action(() =>
{
PurchaseSkuList.Add(item);
}));
continue;
}
Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");
SkuName = skuResponse.Data[0].Title;
SpuId = skuResponse.Data[0].ProductId;
var productApiResponse = productService.GetProductList(skuResponse.Data[0].ProductId, string.Empty, string.Empty, 1,
shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
if (productApiResponse.Success)
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null && !list.Success)
{
if (productApiResponse.Data.Count == 0)
App.Current.Dispatcher.Invoke(new Action(() =>
{
return;
}
PurchaseSkuList.Add(item);
}));
continue;
}
PurchaseSkuItemBasicInfoResponse skuItem = null;
if (list.Data != null) skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
ProductNo = productApiResponse.Data.Items[0].ProductItemNum;
Brand = productApiResponse.Data.Items[0].BrandName;
}
App.Current.Dispatcher.Invoke(new Action(() =>
{
PurchaseSkuList.Add(new PurchaseSku
{
Logo = skuItem?.Logo,
Title = skuItem?.Title,
IsNeedCer = item.IsNeedCer,
PurchaseSkuId = item.PurchaseSkuId,
CerDTO = item.CerDTO,
IsSetCertificate = item.IsNeedCer,
});
}));
//PurchaseSkuList.Add(item);
}
else
}
if (BarCodeModel == null)
{
//加载品牌品名数据
var shopList = globalContext.User.ShopList;
var shop = shopList.FirstOrDefault(s => s.ShopName == model.ShopName);
if (shop != null)
{
App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
return;
}
var skuResponse = productService.GetProductSkuList(string.Empty, SkuId, shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
if (skuResponse.Success)
{
if (skuResponse.Data.Count == 0)
{
return;
}
Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");
SkuName = skuResponse.Data[0].Title;
SpuId = skuResponse.Data[0].ProductId;
var productApiResponse = productService.GetProductList(skuResponse.Data[0].ProductId, string.Empty, string.Empty, 1,
shop.Platform, shop.AppKey, shop.AppSecret, shop.AppToken);
if (productApiResponse.Success)
{
if (productApiResponse.Data.Count == 0)
{
return;
}
}
}
ProductNo = productApiResponse.Data.Items[0].ProductItemNum;
Brand = productApiResponse.Data.Items[0].BrandName;
}
}
else
{
App.Current.Dispatcher.Invoke(() => MessageBox.Show(skuResponse.Msg, "加载sku"));
return;
}
}
}
});
}
public Action ReflashWindow { get; set; }
public void InitData()
{
FloorDragNumber = 0;
PurchaseSkuList = new ObservableCollection<PurchaseSku>();
WareHourseList = new ObservableCollection<WareHourseDTO>();
//PreCompeteTimeDayList = new ObservableCollection<string>();
FloorDragNumberList = new ObservableCollection<int>();
for (int i = 0; i < 30; i++)
{
App.Current.Dispatcher.Invoke((Action)(() =>
{
FloorDragNumberList.Add(i + 1);
}));
}
//var nowTime = DateTime.Now;
//var hour = nowTime.Hour;
//if (hour < 12)
//{
// PreCompeteTimeDayList.Add("今天");
// PreCompeteTimeDayList.Add("明天");
// PreCompeteTimeDay = "今天";
//}
//else if (hour < 18)
//{
// PreCompeteTimeDayList.Add("今天");
// PreCompeteTimeDayList.Add("明天");
// PreCompeteTimeDay = "今天";
//}
//else if (hour < 22)
//{
// PreCompeteTimeDayList.Add("今天");
// PreCompeteTimeDayList.Add("明天");
// PreCompeteTimeDay = "今天";
//}
//else
//{
// PreCompeteTimeDayList.Add("明天");
// PreCompeteTimeDayList.Add("后天");
// PreCompeteTimeDay = "明天";
//}
IsSetBarCode = true;
SkuTitle = "";
BrandName = "";
GoodsNumber = 0;
PackType = PackType.;
BasicPack = BasicPack.;
CertificatePosition = CertificatePosition.;
IsNeedBarCode = Need.;
IsNeedCertificateModel = Need.;
}
private void OpenSkuDetail(object param)
{

11
BBWY.Client/ViewModels/ViewModelLocator.cs

@ -337,6 +337,17 @@ namespace BBWY.Client.ViewModels
}
}
public UpdatePurchaseTaskViewModel UpdatePurchaseTask
{
get
{
using var s = sp.CreateScope();
return s.ServiceProvider.GetRequiredService<UpdatePurchaseTaskViewModel>();
}
}
//public ShopSealBoxListViewModel ShopSealBoxListVM
//{
// get

2
BBWY.Client/Views/FallWare/WareFallWareListControl.xaml

@ -124,7 +124,7 @@
<RadioButton Content="已配置" Height="35" Width="130" Tag="{Binding FallWareConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.已配置}"
/>
<RadioButton Content="待配置" Height="35" Width="130" Tag="{Binding FallWareWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"
<RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待同步采购单:待配置}" Height="35" Width="130" Tag="{Binding FallWareWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"
Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.待配置}"
/>
</StackPanel>

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

@ -9,28 +9,27 @@
<Grid DataContext="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type local:BarcodeControl}}}">
<DockPanel Grid.Row="1">
<Border Name="jingjian" Visibility="{Binding model.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" >
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding model.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Run Text="{Binding model.BrandName}"/>
</TextBlock>
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding model.SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Run Text="{Binding model.SkuName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,25,10,0"/>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding model.ShopName}"/>
</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 model.SkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Run Text="{Binding model.SkuId}"/>
</TextBlock>
</StackPanel>
</Border>
<Border Name="biaozhun" Visibility="{Binding model.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 model.Brand,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding model.BrandName}"/>
@ -43,6 +42,10 @@
<Run Text="规格:"/>
<Run Text="{Binding model.SkuName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding model.ShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</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 model.SkuId}"/>
@ -51,10 +54,7 @@
</Border>
<Border Name="wuxinghao" Visibility="{Binding model.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 model.Brand}"/>
</TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding model.BrandName}"/>
@ -63,6 +63,10 @@
<Run Text="规格:"/>
<Run Text="{Binding model.SkuName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,5" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding model.ShopName}"/>
</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 model.SkuId}"/>

55
BBWY.Client/Views/PackTask/PublishTaskWindow.xaml

@ -34,7 +34,7 @@
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
</ResourceDictionary>
</Window.Resources>
<Grid>
@ -121,8 +121,8 @@
</StackPanel>
<Grid Grid.Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="3*"/>
<RowDefinition Height="2*"/>
<RowDefinition Height="100"/>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Vertical">
<TextBlock Text="任务信息" FontWeight="Bold" Margin="19 23 0 0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
@ -141,25 +141,23 @@
</ComboBox>
</Border>
<!--<TextBlock Margin="30 0 0 0" Text="加急:" VerticalAlignment="Center"/>
<ComboBox VerticalContentAlignment="Center" ItemsSource="{Binding WorryList}" Text="{Binding IsWorry}" >
</ComboBox>-->
</StackPanel>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top"
Margin="19 23 0 0">
<c:BTextBox Text="{Binding MarkMessage}" VerticalAlignment="Top" Width="467" Height="85"
WaterRemark="打包备注" AcceptsReturn="True" TextWrapping="Wrap" >
</c:BTextBox>
</StackPanel>
</StackPanel>
<Grid Grid.Row="1">
<TextBlock Text="打包配置" FontWeight="Bold" Margin="19 23 " HorizontalAlignment="Left" VerticalAlignment="Top"/>
<Grid Height="70" Margin="20 54 20 0">
<Grid.RowDefinitions>
<RowDefinition Height="50"/>
<RowDefinition Height="80"/>
<RowDefinition/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="打包配置" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20 0 0 0"/>
<Grid Height="70" Grid.Row="1" Margin="20 0 20 0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="77"/>
<ColumnDefinition Width="77"/>
@ -235,7 +233,7 @@
</hc:CheckComboBox.ItemContainerStyle>
</hc:CheckComboBox>
</Grid>
<Grid Grid.Row="1" Grid.Column="5" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedBarCodeList}" Text="{Binding IsNeedBarCode,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
@ -243,7 +241,10 @@
</Grid>
<!--<Grid Grid.Row="1" Grid.Column="6" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedCerList}" Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
<ListBox ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}">
</ListBox>
</ComboBox>
</Grid>-->
<Grid Grid.Row="1" Grid.Column="7" >
@ -252,6 +253,26 @@
</ComboBox>
</Grid>
</Grid>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" CornerRadius="0" Grid.Row="2" Margin="20">
<TextBox Name="btn_showMarkMessage" Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Grid Grid.Row="3" Margin="20 0 0 0">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<c:BTextBox WaterRemark="添加备注" Height="30" HorizontalAlignment="Stretch" Text="{Binding MarkMessage}" />
<c:BButton Grid.Column="1" Content="提交备注" Width="100" HorizontalAlignment="Right" VerticalAlignment="Stretch" Margin="0,2,5,2" Click="BButton_Click"
Command="{Binding AppendMarkMessageCommand}"
CommandParameter="{Binding MarkMessage}"
Visibility="{Binding TaskId,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
Background="{StaticResource Button.Background}" BorderThickness="0" Foreground="White"/>
</Grid>
</Grid>
</Grid>

22
BBWY.Client/Views/PackTask/PublishTaskWindow.xaml.cs

@ -12,6 +12,7 @@ using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
using WebSocketSharp;
namespace BBWY.Client.Views.PackTask
{
@ -20,15 +21,34 @@ namespace BBWY.Client.Views.PackTask
/// </summary>
public partial class PublishTaskWindow : BWindow
{
public PublishTaskWindow(Action ReflashTask, PackTaskModel model = null)
public PublishTaskWindow(Action ReflashTask, PackTaskModel model = null,SaveType saveType= SaveType.C端)
{
InitializeComponent();
var publicTaskViewModel = (PublishTaskViewModel)this.DataContext;
publicTaskViewModel.SaveType = saveType;
if (publicTaskViewModel.ReflashWindow == null)
publicTaskViewModel.ReflashWindow = ReflashTask;
publicTaskViewModel.InitData(model);
}
private void BButton_Click(object sender, RoutedEventArgs e)
{
try
{
if (btn_showMarkMessage != null && !btn_showMarkMessage.Text.IsNullOrEmpty())
{
btn_showMarkMessage.ScrollToEnd();
}
}
catch
{
}
}
}
}

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

@ -8,7 +8,7 @@
mc:Ignorable="d"
Style="{StaticResource bwstyle}"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
Height="651" Width="577"
Height="380" Width="577"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
xmlns:ctr="clr-namespace:BBWY.Client.Converters"
xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@ -31,49 +31,44 @@
</Border>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" >
<!--{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.精简模板}}" Command="{Binding BarLabelCheckCommand}" CommandParameter="{x:Static cmodel:BarcodeLabelModel.精简模板}" Content="精简" Margin="10,10,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">
<StackPanel Orientation="Vertical" >
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<TextBlock Margin="10,20,10,10" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BarCodeModel.BrandName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Run Text="{Binding BarCodeModel.BrandName}"/>
</TextBlock>
<TextBlock Margin="10,25,10,0" FontSize="15" FontWeight="Black" >
<TextBlock Margin="10" FontSize="15" FontWeight="Black" >
<Run Text="规格:"/>
<Run Text="{Binding BarCodeModel.SkuName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Run Text="{Binding BarCodeModel.SkuName}"/>
</TextBlock>
<Image Source="/resources/images/barcode.png" Margin="10,25,10,0"/>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding BarCodeModel.ShopName}"/>
</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,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Run Text="{Binding BarCodeModel.SkuId}"/>
</TextBlock>
</StackPanel>
</Border>
</StackPanel>
<StackPanel Grid.Column="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,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="品名:"/>
<Run Text="{Binding BarCodeModel.BrandName}"/>
@ -86,6 +81,10 @@
<Run Text="规格:"/>
<Run Text="{Binding BarCodeModel.SkuName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding BarCodeModel.ShopName}"/>
</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}"/>
@ -99,15 +98,12 @@
</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"/>
<!--<StackPanel Grid.Column="0" Grid.Row="0" 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}"/>
@ -117,18 +113,18 @@
<Run Text="规格:"/>
<Run Text="{Binding BarCodeModel.SkuName}"/>
</TextBlock>
<TextBlock Margin="10,10,10,0" FontSize="15" FontWeight="Black" >
<Run Text="店铺:"/>
<Run Text="{Binding BarCodeModel.ShopName}"/>
</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>
</Border>
</StackPanel>
</StackPanel>-->
</Grid>

3
BBWY.Client/Views/PackTask/SetBarCode.xaml.cs

@ -60,7 +60,8 @@ namespace BBWY.Client.Views.PackTask
ProductNo = BarCodeModel.ProductNo,
SkuId = BarCodeModel.SkuId,
SkuName = BarCodeModel.SkuName,
LabelModel = BarCodeModel.LabelModel
LabelModel = BarCodeModel.LabelModel,
ShopName = BarCodeModel.ShopName,
});
if (resData == null)

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

@ -51,7 +51,7 @@
<c:BButton Grid.Row="1" Name="add_goodsnum" Background="{StaticResource Button.Background}" Content="添加配件" HorizontalAlignment="Left" Width="100" VerticalAlignment="Stretch" Margin="20 0 0 0" Click="add_goodsnum_Click"
/>
<hc:TabControl Grid.Row="2" SelectionChanged="tab_SelectionChanged" IsAnimationEnabled="True" ItemsSource="{Binding GoodsNumberCerList,Mode=TwoWay}" IsTabFillEnabled="False" Name="tab" ShowCloseButton="True" DockPanel.Dock="Bottom">
<hc:TabControl Grid.Row="2" SelectionChanged="tab_SelectionChanged" IsAnimationEnabled="True" ItemsSource="{Binding GoodsNumberCerList,Mode=TwoWay}" IsTabFillEnabled="False" Name="tab" ShowCloseButton="True" DockPanel.Dock="Bottom">
<hc:TabControl.Resources>
<ResourceDictionary >
<ResourceDictionary.MergedDictionaries>
@ -63,7 +63,7 @@
</hc:TabControl.Resources>
<TabControl.ItemTemplate>
<DataTemplate>
<TextBlock Width="40" VerticalAlignment="Center" Height="24" Text="{Binding CertificateModel.GoodsNumber,StringFormat=配件{0}}"/>
<TextBlock Width="40" VerticalAlignment="Center" Height="24" Text="{Binding CertificateModel.GoodsNumberIndex,StringFormat=配件{0}}"/>
</DataTemplate>
</TabControl.ItemTemplate>
<TabControl.ContentTemplate>

102
BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs

@ -33,7 +33,7 @@ namespace BBWY.Client.Views.PackTask
InitializeComponent();
}
public void LoadData(CertificateModel[] CertificateModel, PackTaskService packTaskService, CertificateModel SpuCertificateModel, bool IsSetSpuCertificate)
public void LoadData(CertificateModel[] CertificateModel, PackTaskService packTaskService, CertificateModel SpuCertificateModel, bool IsSetSpuCertificate,SaveType saveType)
{
this.CertificateModel = CertificateModel.Copy();
this.SpuCertificateModel = SpuCertificateModel.Copy();
@ -51,9 +51,12 @@ namespace BBWY.Client.Views.PackTask
});
}
this. saveType = saveType;
this.DataContext = this;
}
public SaveType saveType;
public bool IsSetSpuCertificate { get; set; }
public PackTaskService packTaskService { get; set; }
public CertificateModel[] CertificateModel { get; set; }
@ -114,7 +117,7 @@ namespace BBWY.Client.Views.PackTask
ApplyAge = item.CertificateModel.ApplyAge,
GoodsNumber = item.CertificateModel.GoodsNumber,
ProduceDate = item.CertificateModel.ProduceDate,
SaveType = SaveType.C端,
SaveType = saveType,
});
@ -187,33 +190,77 @@ namespace BBWY.Client.Views.PackTask
cer.CertificateModel.ProductShop = SpuCertificateModel.ProductShop;
cer.CertificateModel.ApplyAge = SpuCertificateModel.ApplyAge;
cer.CertificateModel.ProduceDate = SpuCertificateModel.ProduceDate;
}
private void add_goodsnum_Click(object sender, RoutedEventArgs e)
{
int num = 0;
p:
num++;
int goodsNumber = num;
var gncer = GoodsNumberCerList.SingleOrDefault(g => g.CertificateModel.GoodsNumber == goodsNumber);
if (gncer != null) goto p;
GoodsNumberCerList.Add(new GoodsNumberCer
if (saveType== SaveType.C端)
{
CertificateModel = new CertificateModel
int num = 0;
p:
num++;
int goodsNumber = num;
var gncer = GoodsNumberCerList.SingleOrDefault(g => g.CertificateModel.GoodsNumber == goodsNumber);
if (gncer != null) goto p;
GoodsNumberCerList.Add(new GoodsNumberCer
{
GoodsNumber = goodsNumber,
BrandName = CertificateModel[0].BrandName,
Brand = CertificateModel[0].Brand,
SkuId = CertificateModel[0].SkuId,
ProductNo = CertificateModel[0].ProductNo,
SpuId = CertificateModel[0].SkuId,
CertificateModel = new CertificateModel
{
GoodsNumber = goodsNumber,
BrandName = CertificateModel[0].BrandName,
Brand = CertificateModel[0].Brand,
SkuId = CertificateModel[0].SkuId,
ProductNo = CertificateModel[0].ProductNo,
SpuId = CertificateModel[0].SkuId,
GoodsNumberIndex = GoodsNumberCerList.Count + 1
}
});
tab.SelectedIndex = GoodsNumberCerList.Count - 1;
this.UpdateLayout();
}
if (saveType == SaveType.B端)
{
p:
long goodsNumber = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
var gncer = GoodsNumberCerList.SingleOrDefault(g => g.CertificateModel.GoodsNumber == goodsNumber);
if (gncer != null) goto p;
GoodsNumberCerList.Add(new GoodsNumberCer
{
CertificateModel = new CertificateModel
{
GoodsNumber = goodsNumber,
BrandName = CertificateModel[0].BrandName,
Brand = CertificateModel[0].Brand,
SkuId = CertificateModel[0].SkuId,
ProductNo = CertificateModel[0].ProductNo,
SpuId = CertificateModel[0].SkuId,
}
});
int index = 0;
foreach (var item in GoodsNumberCerList)
{
index++;
item.CertificateModel.GoodsNumberIndex = index;
}
});
tab.SelectedIndex = GoodsNumberCerList.Count - 1;
this.UpdateLayout();
tab.SelectedIndex = GoodsNumberCerList.Count - 1;
this.UpdateLayout();
}
}
@ -227,7 +274,24 @@ namespace BBWY.Client.Views.PackTask
if (select != null)
selectCer = select.CertificateModel.GoodsNumber;
}
try
{
int index = 0;
foreach (var item in GoodsNumberCerList)
{
index++;
item.CertificateModel.GoodsNumberIndex = index;
}
}
catch (Exception)
{
}
}
}
public class GoodsNumberCer

55
BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml

@ -47,10 +47,11 @@
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包费用" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="合格证位置" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
@ -148,6 +149,10 @@
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
@ -260,13 +265,10 @@
</Grid>
<Grid Grid.Column="3" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding SkuTitle}"
<TextBlock Text="{Binding SkuTitle}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
@ -289,6 +291,17 @@
</Grid>
<Grid Grid.Column="5" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding PositionType}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
<Grid Grid.Column="6" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
@ -335,7 +348,7 @@
</StackPanel>
</StackPanel>
</Grid>
<Grid Grid.Column="7" >
<Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
@ -354,18 +367,8 @@
</StackPanel>
</Grid>
<Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding MarkMessage}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
<Grid Grid.Column="6">
<Grid Grid.Column="7">
<StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="收费:"/>
<TextBlock
@ -416,6 +419,16 @@
</Grid>-->
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
<Border BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2"
Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
<TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0 5 0 5" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="3" Margin="-1 0 0 0"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="4" Margin="-1 0 0 0"/>

26
BBWY.Client/Views/PackTask/TaskList.xaml

@ -48,10 +48,6 @@
<TextBlock VerticalAlignment="Center" Text="{TemplateBinding Tag}" Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
</StackPanel>
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="true">
@ -126,7 +122,7 @@
/>
</StackPanel>
<Grid Background="{StaticResource Border.Background}" Grid.Row="1" HorizontalAlignment="Stretch" Panel.ZIndex="999" Margin="0,5,0,0" >
@ -141,9 +137,25 @@
<DatePicker SelectedDate="{Binding EndTime}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="10,0,0,0"/>-->
<TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
<StackPanel Orientation="Horizontal"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待出库:Collapsed:Visible}"
>
<TextBlock Text="拳探订单号:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
</StackPanel>
<TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<StackPanel Orientation="Horizontal"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓|待出库:Collapsed:Visible}"
>
<TextBlock Text="SPU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSpuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
</StackPanel>
<Grid Grid.Column="1" HorizontalAlignment="Left">
<Button Content="搜索" Width="100" Height="30" VerticalAlignment="Center" Margin="66,0,0,0"
Command="{Binding SearchTaskCommand}" Grid.Column="1"
@ -152,7 +164,7 @@
</Grid>
</StackPanel>
</Grid>
<Grid Grid.Row="2" HorizontalAlignment="Stretch" Panel.ZIndex="999" Margin="0,5,0,0" >
@ -186,7 +198,7 @@
<local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" />
</Grid>
<c:PageControl PageIndex="{Binding PageIndex}"
PageSize="{Binding PageSize}"
RecordCount="{Binding OrderCount}"

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

@ -39,7 +39,7 @@
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
@ -50,12 +50,11 @@
<TextBlock Text="打包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="物流信息" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="注意事项/对接备注" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="费用" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="10" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
@ -121,6 +120,10 @@
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition MinHeight="90"/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
@ -129,7 +132,7 @@
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
@ -143,7 +146,6 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="90"/>
<ColumnDefinition />
<!--<ColumnDefinition />-->
</Grid.ColumnDefinitions>
<!--{Binding Logo}-->
@ -354,7 +356,7 @@
</ListBox>
</Grid>
<Grid Grid.Column="7" >
<!--<Grid Grid.Column="7" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding MarkMessage}"
@ -364,7 +366,7 @@
</StackPanel>
</Grid>
</Grid>-->
<Grid Grid.Column="8" >
<Grid >
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
@ -403,6 +405,13 @@
</StackPanel>
</Grid>
<Border BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2"
Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
<TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0 5 0 5" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>

385
BBWY.Client/Views/PackTask/UpdatePurchaseTaskWindow.xaml

@ -0,0 +1,385 @@
<c:BWindow x:Class="BBWY.Client.Views.PackTask.UpdatePurchaseTaskWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
mc:Ignorable="d"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
xmlns:ctr="clr-namespace:BBWY.Client.Converters"
xmlns:cmodel="clr-namespace:BBWY.Client.Models"
xmlns:hc="https://handyorg.github.io/handycontrol"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
CloseButtonVisibility="Visible"
CloseButtonColor="{StaticResource WindowButtonColor}"
DataContext="{Binding UpdatePurchaseTask,Source={StaticResource Locator}}"
MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed"
RightButtonGroupMargin="0,5,5,0"
Height="680" Width="1305">
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="cmodel:StorageType"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>-->
</ResourceDictionary>
</Window.Resources>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition Height="60"/>
<RowDefinition/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
<Grid Background="{StaticResource Border.Background}">
<TextBlock Text="配置打包信息" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Grid>
<Grid Grid.Row="1" VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="370"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<TextBlock Text="下单店铺商品信息" FontWeight="Bold" FontSize="13" Height="20" Width="110" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="19 0 0 0" />
<TextBlock Grid.Column="1" Text="配件商品信息" FontWeight="Bold" FontSize="13" Height="20" Width="110" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="19 0 0 0" />
</Grid>
<Grid Grid.Row="2" >
<Grid.RowDefinitions>
<RowDefinition Height="200" />
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Grid.Row="0" VerticalAlignment="Center" Height="150">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="370"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal">
<c:BAsyncImage UrlSource="{Binding Logo}"
Width="150" Height="150" Stretch="Fill"
VerticalAlignment="Top" Margin="25 0 0 0"
Cursor="Hand">
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Window}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BAsyncImage>
<StackPanel Orientation="Vertical" Width="190">
<TextBlock Margin="10 10 0 0" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuId}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="SKU:"/>
<Run Text="{Binding SkuId}"/>
</TextBlock >
<TextBlock Margin="10 10 0 10" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding SkuName}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="名称:"/>
<Run Text="{Binding SkuName}"/>
</TextBlock >
<TextBlock Margin="10 0 0 10">
<Run Text="货号:"/>
<Run Text="{Binding ProductNo}"/>
</TextBlock>
<StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="10 0 0 10" Height="30">
<TextBlock Text="品名:" VerticalAlignment="Center"/>
<c:BTextBox Text="{Binding BrandName}" Height="30" Width="140" WaterRemark="请输入品名"/>
</StackPanel>
<StackPanel Margin="10 0 0 10" Orientation="Horizontal">
<TextBlock Text="条形码:"/>
<c:BButton Content="待设置" Style="{StaticResource LinkButton}" Width="35" Height="15" Command="{Binding SetBarCodeCommand}"
Visibility="{Binding IsSetBarCode, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }"
/>
<StackPanel Visibility="{Binding IsSetBarCode, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }" Orientation="Horizontal" HorizontalAlignment="Center" >
<c:BButton Content="查看" Style="{StaticResource LinkButton}" Width="35" Height="15" Command="{Binding LookBarCommand}"/>
<c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35" Height="15" Command="{Binding SetBarCodeCommand}"/>
</StackPanel >
</StackPanel>
</StackPanel>
</StackPanel>
<Grid Grid.Column="1">
<ListBox x:Name="listbox_order" HorizontalAlignment="Left"
Height="150" Width="900" Margin="0" ScrollViewer.HorizontalScrollBarVisibility="Visible"
ScrollViewer.VerticalScrollBarVisibility="Visible"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
ItemsSource="{Binding PurchaseSkuList,Mode=TwoWay}"
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="0"
Foreground="{StaticResource Text.Color}">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid
MinHeight="150">
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" >
<c:BAsyncImage UrlSource="{Binding Logo}"
Height="150" Width="150" Stretch="Fill"
VerticalAlignment="Top" Margin="25 0 0 0"
Cursor="Hand">
<!--<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.OpenSkuDetailCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Window}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SkuId"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>-->
</c:BAsyncImage>
<DockPanel VerticalAlignment="Top" Width="190" Height="150">
<TextBlock Margin="10 10 0 0" DockPanel.Dock="Top" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding PurchaseSkuId}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="配件商品ID:"/>
<Run Text="{Binding PurchaseSkuId}"/>
</TextBlock >
<TextBlock Margin="10 10 0 10" DockPanel.Dock="Top" TextTrimming="CharacterEllipsis">
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding Title}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="SKU名称:"/>
<Run Text="{Binding Title}"/>
</TextBlock >
<StackPanel Margin="10 0 0 5" Height="25" VerticalAlignment="Bottom" DockPanel.Dock="Bottom" Orientation="Horizontal">
<TextBlock Text="合格证:" VerticalAlignment="Center"/>
<StackPanel Orientation="Horizontal"
Visibility="{Binding IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }">
<c:BButton Content="待设置" Style="{StaticResource LinkButton}" Width="35" Height="15"
Command="{Binding DataContext. SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
CommandParameter="{Binding }"
Visibility="{Binding IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
Visibility="{Binding IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }">
<c:BButton Content="查看" Style="{StaticResource LinkButton}" Width="35" Height="15"
CommandParameter="{Binding PurchaseSkuId}"
Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>
<c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35" Height="15" CommandParameter="{Binding }"
Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
/>
</StackPanel >
</StackPanel>
<StackPanel Orientation="Horizontal"
Visibility="{Binding IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Collapsed:Visible }">
<!--<c:BButton Content="" Style="{StaticResource LinkButton}" Width="35" Height="15"
Command="{Binding DataContext. SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
CommandParameter="{Binding }"
Visibility="{Binding IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }"/>-->
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
>
<TextBlock Text="无需合格证" Height="15" Margin="5 0 0 0"
/>
<!--<c:BButton Content="无需设置" Style="{StaticResource LinkButton}" Height="15" Margin="5 0 0 0"
CommandParameter="{Binding PurchaseSkuId}"
Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>-->
<c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35" Height="15" CommandParameter="{Binding }"
Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
/>
</StackPanel >
</StackPanel>
</StackPanel>
</DockPanel>
</StackPanel>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition Height="40"/>
<RowDefinition Height="80"/>
<RowDefinition MinHeight="70"/>
<RowDefinition Height="40"/>
</Grid.RowDefinitions>
<TextBlock Text="打包配置" FontWeight="Bold" FontSize="13" Margin="19 0 0 0 " HorizontalAlignment="Left" VerticalAlignment="Center"/>
<Grid Height="70" Grid.Row="1" Margin="20 0 20 0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="77"/>
<ColumnDefinition Width="77"/>
<ColumnDefinition MinWidth="77"/>
<ColumnDefinition Width="90"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="86"/>
<ColumnDefinition Width="86"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="35"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Border Grid.Row="0" Grid.ColumnSpan="8" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.Row="0" Grid.ColumnSpan="8" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.Row="1" Grid.ColumnSpan="8" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="0" HorizontalAlignment="Left" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="0" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="1" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="2" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="3" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="4" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="5" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="6" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<Border Grid.RowSpan="2" Grid.Column="7" HorizontalAlignment="Right" Width="1" Background="{StaticResource Border.Brush}"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="0" Text="组合类型"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="1" Text="配件数量"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="2" Text="SKU配件商品"/>
<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="5" Text="条码标签"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="6" Text="合格证"/>
<TextBlock Grid.Row="0" Style="{StaticResource middleTextBlock}" Grid.Column="7" Text="合格证位置"/>
<Grid Grid.Row="1" Grid.Column="0" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding PackTypeList}" Text="{Binding PackType}" >
</ComboBox>
</Grid>
<c:BTextBox BorderBrush="Transparent" Grid.Row="1" Grid.Column="1" Height="30" Margin="5" Text="{Binding GoodsNumber,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<c:BTextBox BorderBrush="Transparent" Grid.Row="1" Grid.Column="2" Height="30" Margin="5" Text="{Binding SkuTitle,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Grid Grid.Row="1" Grid.Column="3" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding BasicPackList}" Text="{Binding BasicPack}" >
</ComboBox>
</Grid>
<Grid Grid.Row="1" Grid.Column="4">
<Grid.Resources>
</Grid.Resources>
<hc:CheckComboBox BorderThickness="0" IsTextSearchEnabled="True" ItemsSource="{Binding IncreateList}"
ShowClearButton="True"
MinWidth="90"
Height="25"
Margin="5,0,5,0">
<hc:CheckComboBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" Margin="5,2.5">
<CheckBox Content="{Binding IncreateName}" IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</StackPanel>
</DataTemplate>
</hc:CheckComboBox.ItemTemplate>
<hc:CheckComboBox.ItemContainerStyle>
<Style TargetType="{x:Type hc:CheckComboBoxItem}" BasedOn="{StaticResource NoBgListBoxItemStyle}">
<Setter Property="IsSelected" Value="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
</Style>
</hc:CheckComboBox.ItemContainerStyle>
</hc:CheckComboBox>
</Grid>
<Grid Grid.Row="1" Grid.Column="5" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedBarCodeList}" Text="{Binding IsNeedBarCode,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}">
</ComboBox>
</Grid>
<Grid Grid.Row="1" Grid.Column="6" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedCerList}" Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
</ComboBox>
</Grid>
<Grid Grid.Row="1" Grid.Column="7" >
<ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding CertificatePositionList}" Text="{Binding CertificatePosition}">
</ComboBox>
</Grid>
</Grid>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" CornerRadius="0" Grid.Row="2" Margin="20">
<TextBox Name="btn_showMarkMessage" Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Grid Grid.Row="3" Margin="20 0 0 0">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<c:BTextBox WaterRemark="添加备注" Height="30" HorizontalAlignment="Stretch" Text="{Binding MarkMessage}" />
<c:BButton Grid.Column="1" Content="提交备注" Width="100" HorizontalAlignment="Right" VerticalAlignment="Stretch" Margin="0,2,5,2" Click="BButton_Click"
Command="{Binding AppendMarkMessageCommand}"
CommandParameter="{Binding MarkMessage}"
Visibility="{Binding TaskId,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
Background="{StaticResource Button.Background}" BorderThickness="0" Foreground="White"/>
</Grid>
<!--<c:BTextBox Grid.Row="3" Text="{Binding MarkMessage,Mode=TwoWay}" WaterRemark="打包备注" AcceptsReturn="True" TextWrapping="Wrap" Grid.ColumnSpan="2" Margin="20 0 20 0" Height="60"/>-->
</Grid>
</Grid>
<Grid Grid.Row="3">
<c:BButton Content="保存" Width="100" HorizontalAlignment="Right" VerticalAlignment="Stretch" Margin="0,2,5,2"
Command="{Binding CreateTaskCommand}"
CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type c:BWindow}}}"
Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
</Grid>
</Grid>
</c:BWindow>

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

@ -0,0 +1,53 @@
using BBWY.Client.Models;
using BBWY.Client.ViewModels.PackTask;
using BBWY.Controls;
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.Shapes;
using WebSocketSharp;
namespace BBWY.Client.Views.PackTask
{
/// <summary>
/// UpdatePurchaseTaskWindow.xaml 的交互逻辑
/// </summary>
public partial class UpdatePurchaseTaskWindow : BWindow
{
public UpdatePurchaseTaskWindow(PackTaskModel obj, Action ReflashWindow = null)
{
InitializeComponent();
var updatePackTask = (this.DataContext as UpdatePurchaseTaskViewModel);
var show = updatePackTask.SearchSku(obj);
if (!show) { this.Close(); IsClosed = true; }
if (ReflashWindow != null)
updatePackTask.ReflashWindow = ReflashWindow;
}
public bool IsClosed { get; set; } = false;
private void BButton_Click(object sender, RoutedEventArgs e)
{
try
{
if (btn_showMarkMessage != null && !btn_showMarkMessage.Text.IsNullOrEmpty())
{
btn_showMarkMessage.ScrollToEnd();
}
}
catch
{
}
}
}
}

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

@ -174,6 +174,10 @@
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/>

145
BBWY.Client/Views/PackTask/WaitPackageControl.xaml

@ -27,13 +27,13 @@
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
</UserControl.Resources>
<Grid>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="460,15,0,0">
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="550,15,0,0">
<c:BTextBox x:Name="tb" Width="150" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
</ListBox>
</StackPanel>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="660,15,0,0"
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="750,15,0,0"
>
<c:BTextBox x:Name="tbShop" Width="150" Height="30" TextChanged="tbShop_TextChanged" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged" Background="{StaticResource Border.Background}">
@ -57,25 +57,57 @@
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Height="30" >
<StackPanel.Resources>
<Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/>
</Style>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</StackPanel.Resources>
<TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
<TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox BorderThickness="0" Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" WaterRemark="任务ID" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=任务ID:Visible:Collapsed}"
/>
<c:BTextBox Width="150" WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
/>
</UniformGrid>
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox BorderThickness="0" VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SKU:Visible:Collapsed}"
/>
<c:BTextBox Width="150" WaterRemark="SPUID" Text="{Binding SearchSpuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
/>
</UniformGrid>
<TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
<c:BTextBox Visibility="Hidden" Width="150" Height="30" TextChanged="tb_TextChanged" ></c:BTextBox>
<c:BTextBox Visibility="Hidden" Width="150" Height="30" ></c:BTextBox>
<TextBlock x:Name="textblock_shop" Text="店铺:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
<TextBlock Text="物流单号:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="精准搜索"/>
<TextBlock Text="物流公司名称:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"/>
<c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" />
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox Width="125" BorderThickness="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="精准搜索"
Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
/>
<c:BTextBox Width="150" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
/>
</UniformGrid>
<Button Content="搜索" Width="94" Height="30" VerticalAlignment="Stretch" Margin="10,0,0,0"
Command="{Binding SearchTaskCommand}"
@ -92,11 +124,11 @@
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
@ -105,11 +137,11 @@
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证、条形码" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证位置" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务、耗材费用" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证、条形码" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证位置" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务、耗材费用" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<Border Height="1" VerticalAlignment="Top" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="13"/>
@ -152,15 +184,12 @@
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
<TextBlock VerticalAlignment="Center" Text="提交时间:" Margin="14,0,0,0" />
@ -217,17 +246,21 @@
</StackPanel>-->
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="150"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="130"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="120"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition Width="120"/>
</Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}"
@ -357,6 +390,18 @@
</Grid>
<Grid Grid.Column="5" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding PositionType}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
<Grid Grid.Column="6" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
@ -406,7 +451,7 @@
</StackPanel>
</Grid>
<Grid Grid.Column="6">
<Grid Grid.Column="7">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding CertificatePosition}"/>
</Grid>
<!--
@ -423,7 +468,7 @@
</StackPanel>
</Grid>-->
<Grid Grid.Column="7">
<Grid Grid.Column="8">
<Grid>
@ -440,9 +485,7 @@
Style="{StaticResource path_question}"
Width="14" Fill="{StaticResource Text.Pink}"
ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="30000"
>
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<local:FeesExcelControl IsWareHouse="True" FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}"
@ -450,28 +493,11 @@
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<!--<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收|已取消|商家自取:Collapsed:Visible}">
<Border Grid.Row="0" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
>
<c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1" Content="设置"
Command="{Binding SetServiceCommand}"
Visibility="Visible" />
</StackPanel>
</Grid>-->
</Grid>
</Grid>
<Grid Grid.Column="8">
<Grid Grid.Column="9">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
@ -509,17 +535,7 @@
</StackPanel>
</StackPanel>
</Grid>
<Grid Grid.Column="9" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding MarkMessage}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
<Grid Grid.Column="10" >
@ -591,6 +607,15 @@
</StackPanel>
</Grid>
<Border BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2"
Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
<TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0 5 0 5" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>

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

@ -13,28 +13,32 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="1500">
<UserControl.Resources>
<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="cmodel:StorageType"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
<ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
<ctr:WaybillNoConverter x:Key="waybillConverter"/>
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
<ResourceDictionary>
<ObjectDataProvider x:Key="storageTypeProvider" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
<ObjectDataProvider.MethodParameters>
<x:Type TypeName="cmodel:StorageType"/>
</ObjectDataProvider.MethodParameters>
</ObjectDataProvider>
<ctr:OrderStorageTypeOptionConverter x:Key="ostConverter"/>
<ctr:ProfitRatioConverter x:Key="profitRatioConverter"/>
<ctr:WaybillNoConverter x:Key="waybillConverter"/>
<ctr:MultiParameterTransferConverter x:Key="mptConverter"/>
<ctr:SaleGrossProfitConverter x:Key="sgpcConverter"/>
</ResourceDictionary>
</UserControl.Resources>
<Grid>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="460,15,0,0">
<c:BTextBox x:Name="tb" Width="150" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="550,15,0,0">
<c:BTextBox x:Name="tb" Width="150" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="部门名称"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
</ListBox>
</StackPanel>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="660,15,0,0"
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="750,15,0,0"
>
<c:BTextBox x:Name="tbShop" Width="150" Height="30" TextChanged="tbShop_TextChanged" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<c:BTextBox x:Name="tbShop" Width="150" Height="30" TextChanged="tbShop_TextChanged" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged" Background="{StaticResource Border.Background}">
</ListBox>
@ -56,25 +60,61 @@
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Height="30" >
<StackPanel.Resources>
<Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/>
</Style>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</StackPanel.Resources>
<TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
<TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox BorderThickness="0" Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" WaterRemark="任务ID" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=任务ID:Visible:Collapsed}"
/>
<c:BTextBox Width="150" WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
/>
</UniformGrid>
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox BorderThickness="0" VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SKU:Visible:Collapsed}"
/>
<c:BTextBox Width="150" WaterRemark="SPUID" Text="{Binding SearchSpuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
/>
</UniformGrid>
<TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
<c:BTextBox Visibility="Hidden" Width="150" Height="30" TextChanged="tb_TextChanged" ></c:BTextBox>
<c:BTextBox Visibility="Hidden" Width="150" Height="30" ></c:BTextBox>
<TextBlock x:Name="textblock_shop" Text="店铺:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
<TextBlock Text="物流单号:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="精准搜索"/>
<TextBlock Text="物流公司名称:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"/>
<c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" />
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox Width="125" BorderThickness="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="精准搜索"
Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
/>
<c:BTextBox Width="150" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
/>
</UniformGrid>
<Button Content="搜索" Width="94" Height="30" VerticalAlignment="Stretch" Margin="10,0,0,0"
Command="{Binding SearchTaskCommand}"
@ -198,6 +238,10 @@
</StackPanel>
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="90"/>
@ -477,6 +521,15 @@
</StackPanel>
</Grid>
<Border BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2"
Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
<TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0 5 0 5" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>

7
BBWY.Client/Views/QualityTask/QualityWindow.xaml

@ -160,7 +160,12 @@
</StackPanel>
</StackPanel>
<c:BTextBox WaterRemark="打包备注" Text="{Binding MarkMessage,Mode=TwoWay}" Grid.Column="1" Margin="0 5 10 5" Height="80"/>
<!--<c:BTextBox WaterRemark="打包备注" Text="{Binding MarkMessage,Mode=TwoWay}" Grid.Column="1" Margin="0 5 10 5" Height="80"/>-->
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" CornerRadius="0" Grid.Column="1" Margin="0 5 10 5" MaxHeight="120" >
<TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
</Grid>
<ListBox Grid.Row="2" Grid.ColumnSpan="2"

120
BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml

@ -35,10 +35,10 @@
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
@ -46,9 +46,10 @@
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="合格证位置" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
@ -94,10 +95,10 @@
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
@ -146,15 +147,19 @@
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}"
@ -285,8 +290,14 @@
</StackPanel>
</Grid>
<Grid Grid.Column="5">
<TextBlock Style="{StaticResource middleTextBlock}" Text="{Binding PositionType}"/>
</Grid>
<Grid Grid.Column="5" >
<Grid Grid.Column="6" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
@ -294,15 +305,10 @@
<StackPanel Orientation="Horizontal" Visibility="{Binding BarCodeModel,Converter={StaticResource objConverter}, ConverterParameter=#null:Collapsed:Visible}">
<c:BButton x:Name="btn_lookBarCode" 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"
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 Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="合格证:"/>
@ -316,8 +322,7 @@
<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>
<TextBlock Text="无需合格证" Style="{StaticResource middleTextBlock}" Margin="5,0,0,0"
@ -333,7 +338,7 @@
</StackPanel>
</StackPanel>
</Grid>
<Grid Grid.Column="6" >
<Grid Grid.Column="7" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding QualityRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
@ -352,76 +357,7 @@
</StackPanel>
</Grid>
<Grid Grid.Column="7" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding MarkMessage}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
<!--<Grid Grid.Column="10">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<StackPanel Margin="20,0,0,0" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="收费:"/>
<TextBlock
Text="{Binding FeesItemResponse.AllFees, StringFormat={}{0:F2}}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
<Path x:Name="path_fees_name"
Style="{StaticResource path_question}"
Width="14" Margin="0,0,0,0" Fill="{StaticResource Text.Pink}"
ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="20000"
Visibility="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible }"
>
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<local:FeesExcelControl IsWareHouse="True" FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}"
/>
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
<Grid Grid.Row="1" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待验收|已取消|商家自取:Collapsed:Visible}">
<Border Grid.Row="0" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"
>
<c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1" Content="设置"
Command="{Binding SetServiceCommand}"
Visibility="Visible" />
</StackPanel>
</Grid>
</Grid>
</Grid>-->
<!--<Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding PackUser}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>-->
<Grid Grid.Column="12" >
@ -435,6 +371,14 @@
</StackPanel>
</Grid>
<Border BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2"
Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
<TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0 5 0 5" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>

130
BBWY.Client/Views/QualityTask/WaitQualityControl.xaml

@ -26,13 +26,13 @@
</UserControl.Resources>
<Grid>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="460,15,0,0">
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="550,15,0,0">
<c:BTextBox x:Name="tb" Width="150" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
</ListBox>
</StackPanel>
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="660,15,0,0"
<StackPanel Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="750,15,0,0"
>
<c:BTextBox x:Name="tbShop" Width="150" Height="30" TextChanged="tbShop_TextChanged" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBoxShop" SelectionChanged="tipBoxShop_SelectionChanged" Background="{StaticResource Border.Background}">
@ -56,25 +56,57 @@
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Height="30" >
<StackPanel.Resources>
<Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/>
</Style>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
<ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</StackPanel.Resources>
<TextBlock Text="任务ID:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark=""/>
<TextBlock Text="SKU:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox BorderThickness="0" Width="110" VerticalContentAlignment="Center" ItemsSource="{Binding SelectIdList}" HorizontalContentAlignment="Center" Text="{Binding SelectTaskId ,Mode=TwoWay}" />
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" WaterRemark="任务ID" Text="{Binding SearchTaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=任务ID:Visible:Collapsed}"
/>
<c:BTextBox Width="150" WaterRemark="拳探订单号" Text="{Binding SearchOrderSn,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectTaskId,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=拳探订单号:Visible:Collapsed}"
/>
</UniformGrid>
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox BorderThickness="0" VerticalContentAlignment="Center" ItemsSource="{Binding SelectSkuList}" HorizontalContentAlignment="Center" Text="{Binding SelectSku ,Mode=TwoWay}" />
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" WaterRemark="SKUID" Text="{Binding SearchSkuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SKU:Visible:Collapsed}"
/>
<c:BTextBox Width="150" WaterRemark="SPUID" Text="{Binding SearchSpuId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SelectSku,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=SPU:Visible:Collapsed}"
/>
</UniformGrid>
<TextBlock Text="部门: " VerticalAlignment="Center" Margin="16,0,2,0"/>
<c:BTextBox Visibility="Hidden" Width="150" Height="30" TextChanged="tb_TextChanged" ></c:BTextBox>
<c:BTextBox Visibility="Hidden" Width="150" Height="30" ></c:BTextBox>
<TextBlock x:Name="textblock_shop" Text="店铺:" VerticalAlignment="Center" Margin="16,0,0,0"/>
<c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" Text="{Binding SearchShopName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="店铺名称"/>
<TextBlock Text="物流单号:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="精准搜索"/>
<TextBlock Text="物流公司名称:" VerticalAlignment="Center" Margin="10,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"/>
<c:BTextBox Name="btbShopName" Width="150" Visibility="Hidden" Margin="5,0,0,0" />
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}" Margin="5,0,0,0">
<ComboBox Width="125" BorderThickness="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" ItemsSource="{Binding SelectExpressList}" Text="{Binding SelectExpress }"/>
</Border>
<UniformGrid Width="150" Margin="5,0,0,0" Rows="1" Columns="1">
<c:BTextBox Width="150" Text="{Binding SearchWayBillNo,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="精准搜索"
Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流单号:Visible:Collapsed}"
/>
<c:BTextBox Width="150" Text="{Binding SearchExpressName,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="模糊搜索"
Visibility="{Binding SelectExpress,Converter={StaticResource objConverter},ConverterParameter=物流公司名称:Visible:Collapsed}"
/>
</UniformGrid>
<Button Content="搜索" Width="94" Height="30" VerticalAlignment="Stretch" Margin="10,0,0,0"
Command="{Binding SearchTaskCommand}"
@ -93,9 +125,9 @@
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<TextBlock Text="商品信息" Style="{StaticResource middleTextBlock}"/>
@ -103,9 +135,10 @@
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="物流信息" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="任务时间" Grid.Column="6" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="7" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="合格证位置" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="注意事项/对接备注" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
@ -152,9 +185,9 @@
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.ColumnSpan="11">
@ -210,15 +243,19 @@
</StackPanel>
</Grid>
<Grid Grid.Row="1">
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="100"/>
<ColumnDefinition MinWidth="280"/>
<ColumnDefinition Width="100"/>
<ColumnDefinition Width="160"/>
<ColumnDefinition Width="140"/>
<ColumnDefinition MinWidth="140"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
<ListBox x:Name="listbox_orerSku" ItemsSource="{Binding ItemList}"
@ -382,7 +419,22 @@
</Grid>
<Grid Grid.Column="5" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding PositionType}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
<Grid Grid.Column="6" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding QualityRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
@ -428,7 +480,7 @@
</StackPanel>
</Grid>-->
<Grid Grid.Column="6" >
<Grid Grid.Column="7" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
@ -475,30 +527,7 @@
</StackPanel>
</StackPanel>
</Grid>
<!--<Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding CertificatePosition}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>-->
<Grid Grid.Column="7" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<TextBlock
Text="{Binding MarkMessage}"
TextWrapping="Wrap"
HorizontalAlignment="Center"
/>
</StackPanel>
</Grid>
<!--<Grid Grid.Column="10">
<Grid>
@ -596,6 +625,13 @@
</StackPanel>
</Grid>
<Border BorderBrush="{StaticResource Border.Brush}" Margin="10 2 10 2"
Visibility="{Binding ShowMarkMessage,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
CornerRadius="0" Grid.Row="1" MaxHeight="66" Grid.ColumnSpan="100">
<TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="0 5 0 5" ScrollViewer.VerticalScrollBarVisibility="Visible"
AcceptsReturn="True" TextWrapping="Wrap" IsReadOnly="True" BorderThickness="0"/>
</Border>
<Border Grid.Row="1" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}" Grid.ColumnSpan="100"/>
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>-->
<!--<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="1"/>-->
<Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Grid.Column="2" Margin="-1 0 0 0"/>

2
BBWY.Client/Views/SealBox/ShopSealBoxListControl.xaml

@ -69,7 +69,7 @@
<RadioButton Content="已配置" Height="35" Width="130" Tag="{Binding SealBoxConfiguredCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:True:False}"
Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.已配置}"
/>
<RadioButton Content="待配置" Height="35" Width="130" Tag="{Binding SealBoxWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"
<RadioButton Content="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:待同步采购单:待配置}" Height="35" Width="130" Tag="{Binding SealBoxWaitConfigureCount,Mode=TwoWay}" IsChecked="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=待配置:True:False}"
Command="{Binding SetSealBoxConfigureTypeCommand}" CommandParameter="{x:Static cmodel:SealBoxConfigureType.待配置}"
/>
<c:BButton Content="配置封箱策略" Width="130" Height="35" Margin="40 0 0 0" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}"

1
BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs

@ -973,7 +973,6 @@ namespace BBWY.Server.Business
if (payOrderResponse.Success)
{
var order = fsql.Select<PurchaseOrderV2>().Where(p => p.Id == request.OrderId).ToOne();
fsql.Update<PurchaseOrderV2>(order)
.Set(a => a.OrderState, payOrderResponse.PurchaseOrderState)
.ExecuteAffrows();

Loading…
Cancel
Save