From 67f6792a7be1bfa59a58ecbc82e2d42c97a7dbd2 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sat, 10 Jun 2023 21:32:31 +0800
Subject: [PATCH] 1
---
BBWY.Client/APIServices/PackTaskService.cs | 35 +--
BBWY.Client/BBWYAppSettings.json | 4 +-
.../Models/APIModel/Request/CerRequest.cs | 7 +-
.../APIModel/Request/CreateTaskRequest.cs | 13 +-
.../PackTask/ProductSkuCountsResponse.cs | 5 +
.../Response/PackTask/ProductSkuResponse.cs | 15 +-
.../PackTask/SearchTaskListResponse.cs | 2 +-
.../Models/BatchPurchase/BatchPublishTask.cs | 6 +-
BBWY.Client/Models/Enums.cs | 51 +++-
.../Models/PackTask/CertificateModel.cs | 9 +-
BBWY.Client/Models/PackTask/PackTaskModel.cs | 112 ++------
BBWY.Client/ViewModels/BaseVM.cs | 2 +-
.../PackTask/CreatePackTaskViewModel.cs | 19 +-
.../PackTask/PublishTaskViewModel.cs | 14 +-
.../ViewModels/PackTask/TaskListViewModel.cs | 162 ++++++------
.../PackTask/WareHouseListViewModel.cs | 112 +++-----
.../QualityTask/QualityViewModel.cs | 4 +-
.../Views/PackTask/SetCerWindow.xaml.cs | 2 +-
BBWY.Client/Views/PackTask/TaskList.xaml | 250 +++++-------------
.../Views/PackTask/TaskListControl.xaml | 236 +----------------
BBWY.Client/Views/PackTask/WareHouseList.xaml | 18 +-
.../Views/PackTask/WareHouseListControl.xaml | 2 +-
22 files changed, 297 insertions(+), 783 deletions(-)
diff --git a/BBWY.Client/APIServices/PackTaskService.cs b/BBWY.Client/APIServices/PackTaskService.cs
index 7159590b..ff06dc66 100644
--- a/BBWY.Client/APIServices/PackTaskService.cs
+++ b/BBWY.Client/APIServices/PackTaskService.cs
@@ -26,37 +26,33 @@ namespace BBWY.Client.APIServices
- public ApiResponse<PackTaskResultResponse> GetOrderList(string skuId = null, string taskId = null,
+ public ApiResponse<SearchTaskListResponse> GetTaskList(string skuId = null, string taskId = null,
DateTime? startTime = null,
DateTime? endTime = null,
- TaskState? availability = null,
- int? taskStatus = null,
+ TaskState? TaskState = null,
int pageIndex = 1,
int pageSize = 10
)
{
- if (taskId!=null&&!string.IsNullOrEmpty(taskId.Trim()))
+ if (taskId != null && !string.IsNullOrEmpty(taskId.Trim()))
{
- return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNewPackTaskList", new
+ return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{
-
-
TaskId = taskId,
-
ShopId = globalContext.User.Shop.ShopId.ToString()
+
}, null, HttpMethod.Post);
}
- return SendRequest<PackTaskResultResponse>(globalContext.QKApiHost, "api/PackTask/SearchNewPackTaskList", new
+ return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{
SkuId = skuId,
TaskId = taskId,
StartTime = startTime,
EndTime = endTime,
- Availability = availability,
- TaskStatus = taskStatus,
+ TaskState = TaskState,
PageIndex = pageIndex,
PageSize = pageSize,
ShopId = globalContext.User.Shop.ShopId.ToString()
@@ -65,7 +61,7 @@ namespace BBWY.Client.APIServices
public ApiResponse<SearchTaskListResponse> GetWareHouseList(string WayBillNo=null,string SourceExpressName=null, int? isWorry = null, string departmentName = null, string skuId = null, string taskId = null,
DateTime? startTime = null,
DateTime? endTime = null,
- PackTaskState? TaskState = null,
+ TaskState? TaskState = null,
string ShopName = null,
int pageIndex = 1,
int pageSize = 10
@@ -98,16 +94,9 @@ namespace BBWY.Client.APIServices
-
- public ApiResponse<ProductSkuCountsResponse> GetAllCount()
- {
- return SendRequest<ProductSkuCountsResponse>(globalContext.QKApiHost, $"api/PackTask/GetProductSkuCount?shopId={globalContext.User.Shop.ShopId.ToString()}",
- null
- , null, HttpMethod.Get);
- }
- public ApiResponse<ProductSkuCountsResponse> GetWareAllCount()
+ public ApiResponse<ProductSkuCountsResponse> GetTaskAllCount(string shopId=null)
{
- return SendRequest<ProductSkuCountsResponse>(globalContext.QKApiHost, "api/PackTask/GetProductSkuCount",
+ return SendRequest<ProductSkuCountsResponse>(globalContext.QKApiHost, $"api/PackTask/GetProductSkuCount?shopId={shopId}",
null
, null, HttpMethod.Get);
}
@@ -178,12 +167,12 @@ namespace BBWY.Client.APIServices
/// <param name="taskId"></param>
/// <param name="packTaskState"></param>
/// <returns></returns>
- public ApiResponse<object> SetPackTaskState(long taskId, PackTaskState packTaskState)
+ public ApiResponse<object> SetPackTaskState(long taskId, TaskState taskState)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackTask/SetPackTaskState", new
{
taskId = taskId,
- TaskState= packTaskState
+ TaskState= taskState
}
, null, HttpMethod.Post);
}
diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json
index 9622efaf..11018a67 100644
--- a/BBWY.Client/BBWYAppSettings.json
+++ b/BBWY.Client/BBWYAppSettings.json
@@ -4,6 +4,6 @@
"MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "",
"1688ApiHost": "",
- //"QKApiHost": "http://localhost:8080"
- "QKApiHost": "http://qiku.qiyue666.com"
+ "QKApiHost": "http://localhost:8080"
+ // "QKApiHost": "http://qiku.qiyue666.com"
}
\ No newline at end of file
diff --git a/BBWY.Client/Models/APIModel/Request/CerRequest.cs b/BBWY.Client/Models/APIModel/Request/CerRequest.cs
index 194e8bee..fe8a11c8 100644
--- a/BBWY.Client/Models/APIModel/Request/CerRequest.cs
+++ b/BBWY.Client/Models/APIModel/Request/CerRequest.cs
@@ -68,11 +68,16 @@ namespace BBWY.Client.Models.APIModel.Request
/// </summary>
public string ApplyAge { get; set; }
- public int GoodsNumber { get; set; }
+ public long? GoodsNumber { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
public string ProduceDate { get; set; }
public string PurchaseSkuId { get; set; }
+
+
}
}
diff --git a/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs b/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs
index 990f7540..de52bcb8 100644
--- a/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs
+++ b/BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs
@@ -62,10 +62,7 @@ namespace BBWY.Client.Models.APIModel.Request
/// 增量耗材
/// </summary>
public string Increment1 { get; set; }
- /// <summary>
- /// 增量耗材
- /// </summary>
- public int Increment2 { get; set; }
+
//条形码 合格证数据
@@ -92,11 +89,6 @@ namespace BBWY.Client.Models.APIModel.Request
/// </summary>
public long? BarCodeId { get; set; }
-
- /// <summary>
- /// 合格证Id
- /// </summary>
- public long? CertificateId { get; set; }
/// <summary>
/// 合格证Id
/// </summary>
@@ -106,8 +98,9 @@ namespace BBWY.Client.Models.APIModel.Request
/// </summary>
public int? CertificatePosition { get; set; }
- public Worry IsWorry { get; set; }
+ //public Worry IsWorry { get; set; }
public string OrderId { get; set; }
+
public Platform Platform { get; set; }
public bool NeedBar { get;set; }
diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs
index 51a9a651..1da09f27 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuCountsResponse.cs
@@ -41,5 +41,10 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// 待落仓
/// </summary>
public int? WaitFallWareCount { get; set; }
+
+ /// <summary>
+ /// 待完结
+ /// </summary>
+ public string WaitCompleted { get; set; }
}
}
diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs
index 713ae946..8e1396b6 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs
@@ -92,16 +92,6 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// </summary>
public string Increment1 { get; set; }
- /// <summary>
- /// 条形码id
- /// </summary>
- public long? BarcodeId { get; set; }
-
- /// <summary>
- /// 合格证
- /// </summary>
- public string CertificateId { get; set; }
-
/// <summary>
/// 合格证位置（外部包装=0，产品包装=1）
/// </summary>
@@ -122,10 +112,7 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
/// 注意事项（对接备注）
/// </summary>
public string MarkMessage { get; set; }
- /// <summary>
- /// 到货情况(待收货=2，部分收货=1，已到货=0)
- /// </summary>
- public int Availability { get; set; }
+
public bool NeedBar { get; set; }
diff --git a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
index adaa3bc9..a5d37c0d 100644
--- a/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackTask/SearchTaskListResponse.cs
@@ -40,7 +40,7 @@ namespace BBWY.Client.Models.APIModel
/// <summary>
/// 任务状态
/// </summary>
- public PackTaskState TaskState { get; set; }
+ public TaskState TaskState { get; set; }
/// <summary>
/// 需求方团队
diff --git a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
index 64475d89..48e8f88d 100644
--- a/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
+++ b/BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs
@@ -120,11 +120,11 @@ namespace BBWY.Client.Models
/// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
- private TaskState availability;
+ private Availability availability;
/// <summary>
/// 到货情况(待收货=0，部分收货=1，已到货=2)
/// </summary>
- public TaskState Availability { get => availability; set { Set(ref availability, value); } }
+ public Availability Availability { get => availability; set { Set(ref availability, value); } }
private PackType packType;
/// <summary>
@@ -470,7 +470,7 @@ namespace BBWY.Client.Models
GoodsNumber = config.GoodsNumber;
PackType = (PackType)config.PackType;
BasicPack = (BasicPack)config.BasicPack;
- Availability = (TaskState)config.Availability;
+ // Availability = (Availability)config.Availability;
MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1;
diff --git a/BBWY.Client/Models/Enums.cs b/BBWY.Client/Models/Enums.cs
index 5cc2ec9c..b9b9b2ec 100644
--- a/BBWY.Client/Models/Enums.cs
+++ b/BBWY.Client/Models/Enums.cs
@@ -209,22 +209,29 @@
}
- ///// <summary>
- ///// 快递到货情况
- ///// </summary>
- public enum TaskState
- {
- 已到货 = 0,
- 部分到货 = 1,
- 未到货 = 2,
- 已完成 = 3,
- 全部 = 4,
- 加急 = 5
- }
+ public enum Availability
+ {
+ 已到货 = 0,
+ 部分到货 = 1,
+ 未到货 = 2,
+ }
+
+ /////// <summary>
+ /////// 快递到货情况
+ /////// </summary>
+ //public enum TaskState
+ //{
+ // 已到货 = 0,
+ // 部分到货 = 1,
+ // 未到货 = 2,
+ // 已完成 = 3,
+ // 全部 = 4,
+ // 加急 = 5
+ //}
/// <summary>
/// 仓库打包任务状态
/// </summary>
- public enum PackTaskState
+ public enum TaskState
{
未到货 = 0,
部分到货 = 1,
@@ -234,7 +241,8 @@
待出库 = 5,
已完成 = 6,
已取消 = 7,
- 待落仓 = 8
+ 待落仓 = 8,
+ 待完结 = 9
}
@@ -453,4 +461,19 @@
{
增值服务工序 = 0, 基础包装工序 = 1/*,其他=2//基础包装 增量配件*/
}
+
+ /// <summary>
+ /// 存放区分(任务区分)
+ /// </summary>
+ public enum SaveType
+ {
+ /// <summary>
+ /// c端
+ /// </summary>
+ C端 = 0,
+ /// <summary>
+ /// B端
+ /// </summary>
+ B端 = 1
+ }
}
diff --git a/BBWY.Client/Models/PackTask/CertificateModel.cs b/BBWY.Client/Models/PackTask/CertificateModel.cs
index 437d9a1a..d37faf3c 100644
--- a/BBWY.Client/Models/PackTask/CertificateModel.cs
+++ b/BBWY.Client/Models/PackTask/CertificateModel.cs
@@ -85,11 +85,6 @@ namespace BBWY.Client.Models
/// </summary>
public string ProductNo { get => productNo; set { Set(ref productNo, value); } }
- ///// <summary>
- ///// 生产日期
- ///// </summary>
- //public DateTime ProductDate { get; set; }
-
/// <summary>
/// 经销商
/// </summary>
@@ -142,11 +137,11 @@ namespace BBWY.Client.Models
- private int goodsNumber = 1;
+ private long goodsNumber = 1;
/// <summary>
/// 配件序号
/// </summary>
- public int GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
+ public long GoodsNumber { get => goodsNumber; set { Set(ref goodsNumber, value); } }
private string produceDate;
/// <summary>
diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs
index 97fb48ed..96ed9782 100644
--- a/BBWY.Client/Models/PackTask/PackTaskModel.cs
+++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs
@@ -14,6 +14,7 @@ using System.Text;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
+using WebSocketSharp;
namespace BBWY.Client.Models
{
@@ -59,6 +60,12 @@ namespace BBWY.Client.Models
if (publicTaskViewModel.ReflashWindow == null)
publicTaskViewModel.ReflashWindow = ReflashTask;
+ if (!this.OrderId.IsNullOrEmpty())
+ {
+ System.Windows.MessageBox.Show("暂不支持修改采购组的任务");
+ return;
+ }
+
publicTaskViewModel.InitData(this);
PublishTaskWindow publish = new PublishTaskWindow();
publish.Show();
@@ -96,22 +103,9 @@ namespace BBWY.Client.Models
//加载数据
ViewModelLocator viewModelLocator = new ViewModelLocator();
var qualityViewModel = viewModelLocator.QualityTask;
-
if (qualityViewModel.ReflashWindow == null)
qualityViewModel.ReflashWindow = ReflashTask;
- //qualityViewModel.TaskCount = SkuCount;
- // qualityViewModel.TaskId = TaskId;
- qualityViewModel.OrderId = OrderId;
- qualityViewModel.SkuId = SkuId;
qualityViewModel.SearchSku(this);
- //qualityViewModel.LoadPackDatas();
- //qualityViewModel.SetAllFees = new Action<FeesItemResponse, List<string>>((feesItem, packUsers) =>
- //{
- // FeesItemResponse = feesItem;
- // PackUser = string.Join("\r\n", packUsers);
- // FeesItemResponse.DiscountAllFees = feesItem.disCount * feesItem.AllFees;
- // IsShowFees = feesItem.AllFees > 0 ? true : false;
- //});
service.Show();
}
@@ -221,71 +215,7 @@ namespace BBWY.Client.Models
printWindow.Show();
}
- /*
- public Dictionary<string, string> LoadBarLabelModels()
- {
- Dictionary<string, string> data = new Dictionary<string, string>();
- data.Add("pinming", $"品名: {BarCodeModel.BrandName}");
- data.Add("guige", $"规格: {BarCodeModel.SkuName}");
- data.Add("pop", $"POP{BarCodeModel.SkuId}");
- switch (BarCodeModel.LabelModel)
- {
- case BarcodeLabelModel.barstander:
- data.Add("pinpai", $"品牌: {BarCodeModel.Brand}");
- data.Add("xinghao", $"型号: {BarCodeModel.ProductNo}");
- return data;
- case BarcodeLabelModel.barsimplify:
- return data;
- default:
- break;
- }
- return data;
- }
-
- public Dictionary<string, string> LoadCerLabelModels()
- {
- Dictionary<string, string> data = new Dictionary<string, string>();
- data.Add("pinming", $"品名: {CertificateModel.BrandName}");
- data.Add("pinpai", $"品牌: {CertificateModel.Brand}");
- data.Add("xinghao", $"型号: {CertificateModel.ProductNo}");
- data.Add("dizhi", $"地址: {CertificateModel.ProductAdress}");
- data.Add("caizhi", $"材质: {CertificateModel.Shader}");
- data.Add("changshang", $"生产商: {CertificateModel.ProductShop}");
-
-
- switch (CertificateModel.IsLogo)
- {
- case 0://无图
- data.Add("gongchangid", $"无");
- break;
- case 1://有图
- data.Add("gongchangid", $"{CertificateModel.FactoryNumber}");
- break;
- default:
- break;
- }
-
- string[] excutes = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
- StringBuilder sb = new StringBuilder();
- sb.Append("执行标准: ");
- for (int i = 0; i < excutes.Count(); i++)
- {
- if (i % 2 == 0 && i > 0)//间隔两个换行
- {
- sb.Append("\r\n").Append(" ");
- }
- sb.Append(excutes[i]).Append(" ");
- }
- sb.Remove(sb.Length - 3, 3);
-
-
- data.Add("biaozhun", sb.ToString());
-
-
-
- return data;
- }
- */
+
private DateTime endTime;
/// <summary>
@@ -322,11 +252,11 @@ namespace BBWY.Client.Models
public int SkuCount { get => skuCount; set { Set(ref skuCount, value); } }
- private TaskState availability;
+ private Availability availability;
/// <summary>
/// 到货情况(待收货=0，部分收货=1，已到货=2)
/// </summary>
- public TaskState Availability { get => availability; set { Set(ref availability, value); } }
+ public Availability Availability { get => availability; set { Set(ref availability, value); } }
private Worry isWorry;
@@ -343,11 +273,11 @@ namespace BBWY.Client.Models
public TaskStateType TaskStatus { get => taskStatus; set { Set(ref taskStatus, value); } }
- private PackTaskState taskState;
+ private TaskState taskState;
/// <summary>
/// 打包仓库任务状态
/// </summary>
- public PackTaskState TaskState { get => taskState; set { Set(ref taskState, value); } }
+ public TaskState TaskState { get => taskState; set { Set(ref taskState, value); } }
private PackType packType;
@@ -385,14 +315,6 @@ namespace BBWY.Client.Models
/// </summary>
public string Increment1 { get => increment1; set { Set(ref increment1, value); } }
-
- private Increment increment2;
- /// <summary>
- /// 增量2()
- /// </summary>
- public Increment Increment2 { get => increment2; set { Set(ref increment2, value); } }
-
-
private string positionType;
/// <summary>
/// 落仓(本地仓=0，云仓=1，京仓=2)
@@ -446,11 +368,11 @@ 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 string modelNo;
+ ///// <summary>
+ ///// 型号
+ ///// </summary>
+ //public string ModelNo { get => modelNo; set { Set(ref modelNo, value); } }
#endregion
diff --git a/BBWY.Client/ViewModels/BaseVM.cs b/BBWY.Client/ViewModels/BaseVM.cs
index c4a8b336..a48a7b9c 100644
--- a/BBWY.Client/ViewModels/BaseVM.cs
+++ b/BBWY.Client/ViewModels/BaseVM.cs
@@ -26,7 +26,7 @@ namespace BBWY.Client.ViewModels
{
try
{
- Clipboard.SetText(s.ToString());
+ Clipboard.SetText(s?.ToString());
}
catch (Exception ex)
{
diff --git a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
index fd9434b1..c1bd7658 100644
--- a/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/CreatePackTaskViewModel.cs
@@ -192,11 +192,11 @@ namespace BBWY.Client.ViewModels.PackTask
public int SkuCount { get => skuCount; set { Set(ref skuCount, value); } }
- private TaskState availability;
+ private Availability availability;
/// <summary>
/// 到货情况(待收货=0，部分收货=1，已到货=2)
/// </summary>
- public TaskState Availability { get => availability; set { Set(ref availability, value); } }
+ public Availability Availability { get => availability; set { Set(ref availability, value); } }
private PackType packType;
@@ -220,18 +220,7 @@ namespace BBWY.Client.ViewModels.PackTask
- private Increment increment1;
- /// <summary>
- /// 增量1()
- /// </summary>
- public Increment Increment1 { get => increment1; set { Set(ref increment1, value); } }
-
- private Increment increment2;
- /// <summary>
- /// 增量2()
- /// </summary>
- public Increment Increment2 { get => increment2; set { Set(ref increment2, value); } }
private PositionType positionType;
@@ -883,7 +872,6 @@ namespace BBWY.Client.ViewModels.PackTask
SkuId = SkuId,
CreateTime = DateTime.Now,
Increment1 = increateStr,
- Increment2 = (int)Increment2,
CertificatePosition = (int)CertificatePosition,
PackType = (int)PackType,
MarkMessage = MarkMessage,
@@ -987,10 +975,9 @@ namespace BBWY.Client.ViewModels.PackTask
GoodsNumber = config.GoodsNumber;
PackType = (PackType)config.PackType;
BasicPack = (BasicPack)config.BasicPack;
- Availability = (TaskState)config.Availability;
+ //Availability = (Availability)config.Availability;
MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value;
- // Increment1 = config.Increment1;
string[] increateDatas = config.Increment1.Split(',');
bool isSelected = false;
diff --git a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
index 7f90713c..eae1740d 100644
--- a/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs
@@ -124,11 +124,11 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
- private TaskState availability;
+ private Availability availability;
/// <summary>
/// 到货情况(待收货=0，部分收货=1，已到货=2)
/// </summary>
- public TaskState Availability { get => availability; set { Set(ref availability, value); } }
+ public Availability Availability { get => availability; set { Set(ref availability, value); } }
private PackType packType;
/// <summary>
@@ -743,16 +743,6 @@ namespace BBWY.Client.ViewModels.PackTask
new TipsWindow("请设置合格证模板").Show();
return;
}
- try
- {
- createTaskModel.CertificateId = CertificateModel.Where(c => c.Id > 0).FirstOrDefault()?.Id;
- }
- catch
- {
-
-
- }
-
createTaskModel.CerId = string.Join(",", CertificateModel.Where(c => c.Id > 0).Select(c => c.Id));//
}
ApiResponse<object> res = null;
diff --git a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
index 6218e4b8..fdfe8d8c 100644
--- a/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
@@ -22,6 +22,7 @@ using HandyControl.Tools.Extension;
using Newtonsoft.Json;
using BBWY.Client.Models.APIModel.Response.PackTask;
using BBWY.Client.Models.PackTask;
+using WebSocketSharp;
namespace BBWY.Client.ViewModels.PackTask
{
@@ -84,31 +85,57 @@ namespace BBWY.Client.ViewModels.PackTask
/// <summary>
/// 未到货数量
/// </summary>
- public int NoArrivedCount { get => noArrivedCount; set { Set(ref noArrivedCount, value); } }
- private int noArrivedCount;
- private int someArrivedCount;
+ public string NoArrivedCount { get => noArrivedCount; set { Set(ref noArrivedCount, value); } }
+ private string noArrivedCount;
+ private string someArrivedCount;
/// <summary>
/// 部分到货数量
/// </summary>
- public int SomeArrivedCount { get => someArrivedCount; set { Set(ref someArrivedCount, value); } }
+ public string SomeArrivedCount { get => someArrivedCount; set { Set(ref someArrivedCount, value); } }
- private int arrivedCount;
+ private string arrivedCount;
/// <summary>
/// 已到货数量
/// </summary>
- public int ArrivedCount { get => arrivedCount; set { Set(ref arrivedCount, value); } }
- //private int totalCount;
- ///// <summary>
- ///// 全部数量
- ///// </summary>
- //public int TotalCount { get => totalCount; set { Set(ref totalCount, value); } }
+ public string ArrivedCount { get => arrivedCount; set { Set(ref arrivedCount, value); } }
+ private bool isLoading;
+ public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
+
+
+ private string waitPackCount;
+ /// <summary>
+ /// 待打包任务数
+ /// </summary>
+ public string WaitPackCount { get => waitPackCount; set { Set(ref waitPackCount, value); } }
+ private string waitSealBoxCount;
+ /// <summary>
+ /// 带封箱任务数
+ /// </summary>
+ public string WaitSealBoxCount { get => waitSealBoxCount; set { Set(ref waitSealBoxCount, value); } }
+ private string waitFallWareCount;
+ /// <summary>
+ /// 待落仓任务数
+ /// </summary>
+ public string WaitFallWareCount { get => waitFallWareCount; set { Set(ref waitFallWareCount, value); } }
+
+ private string waitOutbound;
+ /// <summary>
+ /// 待出库任务数
+ /// </summary>
+ public string WaitOutbound { get => waitOutbound; set { Set(ref waitOutbound, value); } }
+
+
+ private string waitCompleted;
+ /// <summary>
+ /// 待完成任务数
+ /// </summary>
+ public string WaitCompleted { get => waitCompleted; set { Set(ref waitCompleted, value); } }
+
- private bool isLoading;
- public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
private readonly PackTaskService packTaskService;
@@ -133,7 +160,6 @@ namespace BBWY.Client.ViewModels.PackTask
this.workProcessService = workProcessService;
this.increateServiceService = increateServiceService;
this.packTaskService = packTaskService;
- //TaskState = BBWY.Client.Models. TaskState.全部;
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
SetTaskStateCommand = new RelayCommand<TaskState?>(SetTaskState);
@@ -155,40 +181,55 @@ namespace BBWY.Client.ViewModels.PackTask
EndTime = DateTime.Now.Date;
IsLoading = false;
//加载数据
- SetTaskState(Models.TaskState.全部);
+ SetTaskState(null);
}
private void DeletedTask(object obj)
{
-
+ var packTaskmodel = (PackTaskModel)obj;
+ if (!packTaskmodel.OrderId.IsNullOrEmpty())
+ {
+ System.Windows.MessageBox.Show("暂不支持删除采购组的任务");
+ return;
+ }
MessageBoxResult result = MessageBox.Show("确定取消任务?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning);
- long taskId = (long)obj;
+
+
+
+
+
+
+
+
+
if (result != MessageBoxResult.Yes) return;
- packTaskService.DeletedTask(taskId);
+ packTaskService.DeletedTask(packTaskmodel.TaskId);
Task.Factory.StartNew(() => SearchTaskList());
}
private void IsLoadCount()
{
- var packTaskResult = packTaskService.GetAllCount();
- if (packTaskResult != null && packTaskResult.Success)
+ var packTaskResult = packTaskService.GetTaskAllCount(globalContext.User.Shop.ShopId.ToString());
+ if (packTaskResult != null && packTaskResult.Success && packTaskResult.Data != null)
{
- App.Current.Dispatcher.Invoke(() =>
+ App.Current.Dispatcher.Invoke(new Action(() =>
{
- ArrivedCount = packTaskResult.Data.ArrivedCount;
- NoArrivedCount = packTaskResult.Data.NoArrivedCount;
- SomeArrivedCount = packTaskResult.Data.SomeArrivedCount;
- });
-
-
+ ArrivedCount = packTaskResult.Data.ArrivedCount.ToString();
+ NoArrivedCount = packTaskResult.Data.NoArrivedCount.ToString();
+ SomeArrivedCount = packTaskResult.Data.SomeArrivedCount.ToString();
+ //WorryCount = packTaskResult.Data.WorryCount.ToString();
+ WaitOutbound = packTaskResult.Data.WaitOutbound?.ToString();
+ WaitPackCount = packTaskResult.Data.WaitPackCount?.ToString();
+ WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString();
+ WaitFallWareCount = packTaskResult.Data.WaitFallWareCount?.ToString();
+ WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
+ }));
}
-
-
}
private void LoadIndex(int pageIndex)
@@ -233,33 +274,12 @@ namespace BBWY.Client.ViewModels.PackTask
public void SetTaskState(TaskState? taskState)
{
+ PageIndex = 1;
TaskState = taskState;
- switch (taskState)
- {
- case null:
- break;
- case Models.TaskState.已到货:
- case Models.TaskState.部分到货: //未完成的数据
- case Models.TaskState.未到货:
- taskStatus = null;
- TaskState = taskState;
- taskStatus = 0;
- break;
- case Models.TaskState.全部: //所有数据
- TaskState = null;
- taskStatus = null;
- break;
- case Models.TaskState.已完成:
- TaskState = null;
- taskStatus = 1;
- break;
-
- default:
- break;
- }
SearchTaskList();
}
+
private ConsumableService consumableService;
private IncreateServiceService increateServiceService;
@@ -294,7 +314,7 @@ namespace BBWY.Client.ViewModels.PackTask
try
{
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
- var datas = packTaskService.GetOrderList(SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState), taskStatus,
+ var datas = packTaskService.GetTaskList(SearchSkuId, SearchTaskId, StartTime, EndTime, (this.TaskState),
PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{
@@ -308,14 +328,12 @@ namespace BBWY.Client.ViewModels.PackTask
Brand = item.Brand,
SkuId = item.SkuId,
AcceptName = item.UserName,
- Availability = (TaskState)item.Availability,
+ Availability = (Availability)item.Availability,
BasicPack = (BasicPack)item.BasicPack,
DepartmentName = item.DepartmentName,
CertificatePosition = (CertificatePosition)item.CertificatePosition,
-
GoodsNumber = item.GoodsNumber,
Increment1 = item.Increment1,
- Increment2 = (Increment)item.Increment2,
ItemList = new List<SkuMessage>() { new SkuMessage
{ BrandName = item.BrandName,
GoodsNo = item.ProductItemNum, Logo= item.Logo,
@@ -326,21 +344,25 @@ namespace BBWY.Client.ViewModels.PackTask
MarkMessage = item.MarkMessage,
PackType = (PackType)item.PackType,
- PositionType = ((PositionType)item.PositionType).ToString(),
+ PositionType = item.PositionType,
SkuCount = item.SkuCount,
SkuTitle = item.SkuGoodsTitle,
TaskId = item.TaskId,
- TaskStatus = (TaskStateType)item.TaskStatus,
+
EndTime = item.CreateTime,
- IsWorry = (Worry)item.IsWorry,
+ BrandName = item.BrandName,
+ OrderId = item.OrderId,
+ TaskState = item.TaskState,
+
+ // IsWorry = (Worry)item.IsWorry,
};
if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
{
data.BarCodeModel = item.BarCodeDTO;
}
- if (item.cers != null)
+ if (item.Cers != null)
{
- data.CertificateModel = item.cers;
+ data.CertificateModel = item.Cers;
}
if (item.FeesItemResponse != null)
{
@@ -386,7 +408,6 @@ namespace BBWY.Client.ViewModels.PackTask
}
-
IsLoading = false;
});
@@ -415,23 +436,6 @@ namespace BBWY.Client.ViewModels.PackTask
publicTaskViewModel.InitData();
PublishTaskWindow publish = new PublishTaskWindow();
publish.Show();
-
- //ViewModelLocator viewModel = new ViewModelLocator();
-
- //var createViewModel = viewModel.CreateTaskView;
- //if (createViewModel.ReflashWindow == null)
- //{
- // createViewModel.ReflashWindow = ReflashTask;
- //}
-
-
-
-
- //CreatePackTask create = new CreatePackTask();
- //create.SendData();
-
- //create.Show();
-
}
diff --git a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
index 66377368..488d17d3 100644
--- a/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
@@ -23,6 +23,7 @@ using BBWY.Client.Models.APIModel;
using BBWY.Client.Models.PackTask;
using BBWY.Client.Views.SealBox;
+
namespace BBWY.Client.ViewModels.PackTask
{
@@ -108,11 +109,11 @@ namespace BBWY.Client.ViewModels.PackTask
private string searchSkuId;
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
- public PackTaskState? taskState;
+ public TaskState? taskState;
/// <summary>
/// 任务状态
/// </summary>
- public PackTaskState? TaskState
+ public TaskState? TaskState
{
get => taskState; private set
{
@@ -182,6 +183,13 @@ namespace BBWY.Client.ViewModels.PackTask
public string WaitOutbound { get => waitOutbound; set { Set(ref waitOutbound, value); } }
+ private string waitCompleted;
+ /// <summary>
+ /// 待完成任务数
+ /// </summary>
+ public string WaitCompleted { get => waitCompleted; set { Set(ref waitCompleted, value); } }
+
+
public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } }
@@ -226,7 +234,7 @@ namespace BBWY.Client.ViewModels.PackTask
//Messenger.Default.Send(globalContext, "AcceptGlobalContext");
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
- SetTaskStateCommand = new RelayCommand<PackTaskState?>(SetTaskState);
+ SetTaskStateCommand = new RelayCommand<TaskState?>(SetTaskState);
SearchTaskCommand = new RelayCommand(() =>
{
@@ -239,21 +247,7 @@ namespace BBWY.Client.ViewModels.PackTask
});
OpenSkuDetailCommand = new RelayCommand<object>(OpenSkuDetail);
- CopyTextCommand = new RelayCommand<object>(s =>
- {
- try
- {
- if (s != null)
-
- Clipboard.SetText(s.ToString());
- }
- catch (Exception ex)
- {
- Console.ForegroundColor = ConsoleColor.Red;
- Console.WriteLine(ex);
- Console.ResetColor();
- }
- });
+
StartTime = DateTime.Now.Date;
EndTime = DateTime.Now.Date;
IsLoading = false;
@@ -308,10 +302,7 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public ICommand OpenSkuDetailCommand { get; set; }
- /// <summary>
- /// 复制
- /// </summary>
- public ICommand CopyTextCommand { get; set; }
+
/// <summary>
/// 筛选数据
/// </summary>
@@ -375,24 +366,24 @@ namespace BBWY.Client.ViewModels.PackTask
{
var objList = (object[])obj;
long taskId = (long)objList[0];
- var packTaskState = (PackTaskState)objList[1];
+ var packTaskState = (TaskState)objList[1];
ApiResponse<object> res = null;
switch (packTaskState)
{
- case PackTaskState.未到货:
- case PackTaskState.部分到货:
+ case Models.TaskState.未到货:
+ case Models.TaskState.部分到货:
if (System.Windows.MessageBox.Show("是否确认收货?", "提示",
MessageBoxButton.YesNo,
MessageBoxImage.Warning) != MessageBoxResult.Yes)
return;
- res = packTaskService.SetPackTaskState(taskId, PackTaskState.待质检);
+ res = packTaskService.SetPackTaskState(taskId, Models.TaskState.待质检);
break;
- case PackTaskState.待质检:
+ case Models.TaskState.待质检:
break;
- case PackTaskState.待打包:
+ case Models.TaskState.待打包:
var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId);
if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0)
@@ -401,15 +392,15 @@ namespace BBWY.Client.ViewModels.PackTask
return;
}
- res = packTaskService.SetPackTaskState(taskId, PackTaskState.待封箱);
+ res = packTaskService.SetPackTaskState(taskId, Models.TaskState.待封箱);
break;
- case PackTaskState.待封箱:
+ case Models.TaskState.待封箱:
break;
- case PackTaskState.待出库:
+ case Models.TaskState.待出库:
break;
- case PackTaskState.已完成:
+ case Models.TaskState.已完成:
break;
- case PackTaskState.已取消:
+ case Models.TaskState.已取消:
break;
default:
break;
@@ -434,44 +425,13 @@ namespace BBWY.Client.ViewModels.PackTask
SearchTaskList();
}
- public void SetTaskState(PackTaskState? taskState)
+ public void SetTaskState(TaskState? taskState)
{
TaskState = taskState;
SearchTaskList();
}
- //public void SetTaskState(TaskState? taskState)
- //{
- // IsWorry = null;
- // TaskState = null;
- // taskStatus = null;
- // switch (taskState)
- // {
- // case null:
- // break;
- // case Models.TaskState.已到货:
- // case Models.TaskState.部分到货: //未完成的数据
- // case Models.TaskState.未到货:
- // TaskState = taskState;
- // taskStatus = 0;
- // break;
- // case Models.TaskState.全部: //所有数据
-
- // break;
- // case Models.TaskState.已完成:
-
- // taskStatus = 1;
- // break;
- // case Models.TaskState.加急:
- // taskStatus = 0;
- // IsWorry = 1;
- // break;
- // default:
- // break;
- // }
- // SearchTaskList();
-
- //}
+
/// <summary>
@@ -490,14 +450,8 @@ namespace BBWY.Client.ViewModels.PackTask
taskId = null;
}
-
-
-
-
-
IsLoading = true;
-
- if (TaskState == PackTaskState.待落仓)
+ if (TaskState == Models.TaskState.待落仓)
Task.Factory.StartNew(() =>
{
@@ -540,7 +494,7 @@ namespace BBWY.Client.ViewModels.PackTask
IsLoading = false;
});
- else if (TaskState == PackTaskState.待封箱)
+ else if (TaskState == Models.TaskState.待封箱)
Task.Factory.StartNew(() =>
{
@@ -597,7 +551,7 @@ namespace BBWY.Client.ViewModels.PackTask
var data = new PackTaskModel()
{
AcceptName = item.UserName,
- Availability = (TaskState)item.Availability,
+ Availability = (Availability)item.Availability,
BasicPack = (BasicPack)item.BasicPack,
DepartmentName = item.DepartmentName,
CertificatePosition = (CertificatePosition)item.CertificatePosition,
@@ -671,16 +625,11 @@ namespace BBWY.Client.ViewModels.PackTask
IsLoadCount();
IsLoading = false;
});
-
-
-
-
-
}
private void IsLoadCount()
{
- var packTaskResult = packTaskService.GetWareAllCount();
+ var packTaskResult = packTaskService.GetTaskAllCount();
if (packTaskResult != null && packTaskResult.Success && packTaskResult.Data != null)
{
App.Current.Dispatcher.Invoke(new Action(() =>
@@ -693,6 +642,7 @@ namespace BBWY.Client.ViewModels.PackTask
WaitPackCount = packTaskResult.Data.WaitPackCount?.ToString();
WaitSealBoxCount = packTaskResult.Data.WaitSealBox?.ToString();
WaitFallWareCount= packTaskResult.Data.WaitFallWareCount?.ToString();
+ WaitCompleted = packTaskResult.Data.WaitCompleted?.ToString();
}));
}
}
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index 4995c86d..f4534dc2 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -184,11 +184,11 @@ namespace BBWY.Client.ViewModels
/// </summary>
public Worry IsWorry { get => isWorry; set { Set(ref isWorry, value); } }
- private TaskState availability;
+ private Availability availability;
/// <summary>
/// 到货情况(待收货=0，部分收货=1，已到货=2)
/// </summary>
- public TaskState Availability { get => availability; set { Set(ref availability, value); } }
+ public Availability Availability { get => availability; set { Set(ref availability, value); } }
private PackType packType;
/// <summary>
diff --git a/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs b/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
index 55073097..fb46342b 100644
--- a/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
+++ b/BBWY.Client/Views/PackTask/SetCerWindow.xaml.cs
@@ -139,7 +139,7 @@ namespace BBWY.Client.Views.PackTask
setSpuCerWindow.Show();
}
- int selectCer = -1;//tabcontrol 选中事件
+ long selectCer = -1;//tabcontrol 选中事件
private void InseartCer_Click(object sender, RoutedEventArgs e)
{
if (IsSetSpuCertificate)
diff --git a/BBWY.Client/Views/PackTask/TaskList.xaml b/BBWY.Client/Views/PackTask/TaskList.xaml
index 3eb57140..d20a9abe 100644
--- a/BBWY.Client/Views/PackTask/TaskList.xaml
+++ b/BBWY.Client/Views/PackTask/TaskList.xaml
@@ -21,7 +21,46 @@
<sys:Int32 x:Key="d7">6</sys:Int32>
<sys:Int32 x:Key="d15">14</sys:Int32>
<sys:Int32 x:Key="d30">29</sys:Int32>
+ <Style TargetType="RadioButton">
+ <Setter Property="IsChecked" Value="False" />
+ <Setter Property="Background" Value="#8080FF" />
+ <Setter Property="Foreground" Value="Black" />
+ <!--<Setter Property="Content" Value="{Binding ElementName=txt,Path=Text}"/>-->
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="RadioButton">
+ <Grid Background="#F2F2F2" >
+ <Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="{TemplateBinding Width}" RenderTransformOrigin="0.5,0.5">
+ <Rectangle.RenderTransform>
+ <TransformGroup>
+ <ScaleTransform ScaleY="-1"/>
+ <SkewTransform/>
+ <RotateTransform/>
+ <TranslateTransform/>
+ </TransformGroup>
+ </Rectangle.RenderTransform>
+ </Rectangle>
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="35">
+ <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Content}" />
+ <TextBlock VerticalAlignment="Center" Text="{TemplateBinding Tag}" Foreground="{StaticResource Text.Pink}" Margin="5 0 0 0" />
+
+ </StackPanel>
+
+
+
+
+ </Grid>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsChecked" Value="true">
+ <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
+ <Setter Property="Foreground" Value="white"/>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
</Page.Resources>
<Grid>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
@@ -67,195 +106,34 @@
</Grid>
<StackPanel Grid.Row="1" Grid.RowSpan="1" HorizontalAlignment="Left" Orientation="Horizontal">
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" IsChecked="True" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.全部}" >
- <RadioButton.Style >
- <Style TargetType="RadioButton">
- <Setter Property="IsChecked" Value="False" />
- <Setter Property="Background" Value="#8080FF" />
- <Setter Property="Foreground" Value="Black" />
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="RadioButton">
- <Grid Background="#F2F2F2" >
- <Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="126" RenderTransformOrigin="0.5,0.5">
- <Rectangle.RenderTransform>
- <TransformGroup>
- <ScaleTransform ScaleY="-1"/>
- <SkewTransform/>
- <RotateTransform/>
- <TranslateTransform/>
- </TransformGroup>
- </Rectangle.RenderTransform>
- </Rectangle>
- <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">
- <Run Text="全部"/>
- </TextBlock>
- </Grid>
- <ControlTemplate.Triggers>
- <Trigger Property="IsChecked" Value="true">
- <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
- <Setter Property="Foreground" Value="white"/>
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" IsChecked="True" Content="全部" Command="{Binding SetTaskStateCommand}" />
+
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.未到货}" Content="未到货" Tag="{Binding NoArrivedCount,Mode=TwoWay}" />
+
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.部分到货}" Content="部分到货" Tag="{Binding SomeArrivedCount,Mode=TwoWay}"/>
+
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检" />
+
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"/>
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待封箱}" Content="待封箱" Tag="{Binding WaitSealBoxCount,Mode=TwoWay}"/>
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"/>
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待出库" Tag="{Binding WaitOutbound,Mode=TwoWay}"/>
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已完成}" Content="已完成" />
+
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已取消}" Content="已取消" />
+
+
- </Trigger>
- </ControlTemplate.Triggers>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- </Style>
- </RadioButton.Style>
- </RadioButton>
- <RadioButton VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已到货}" >
- <RadioButton.Style >
- <Style TargetType="RadioButton">
- <Setter Property="IsChecked" Value="False" />
- <Setter Property="Background" Value="#8080FF" />
- <Setter Property="Foreground" Value="Black" />
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="RadioButton">
- <Grid Background="#F2F2F2" >
- <Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="126" RenderTransformOrigin="0.5,0.5">
- <Rectangle.RenderTransform>
- <TransformGroup>
- <ScaleTransform ScaleY="-1"/>
- <SkewTransform/>
- <RotateTransform/>
- <TranslateTransform/>
- </TransformGroup>
- </Rectangle.RenderTransform>
- </Rectangle>
- <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">
- <Run Text="已到货"/>
- <Run Text="{Binding ArrivedCount ,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
- Foreground="{StaticResource Text.Pink}" />
- </TextBlock>
- </Grid>
- <ControlTemplate.Triggers>
- <Trigger Property="IsChecked" Value="true">
- <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
- <Setter Property="Foreground" Value="white"/>
- </Trigger>
- </ControlTemplate.Triggers>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- </Style>
- </RadioButton.Style>
- </RadioButton>
- <RadioButton VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.部分到货}" >>
- <RadioButton.Style >
- <Style TargetType="RadioButton">
- <Setter Property="IsChecked" Value="False" />
- <Setter Property="Background" Value="#8080FF" />
- <Setter Property="Foreground" Value="Black" />
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="RadioButton">
- <Grid Background="#F2F2F2" >
- <Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="126" RenderTransformOrigin="0.5,0.5">
- <Rectangle.RenderTransform>
- <TransformGroup>
- <ScaleTransform ScaleY="-1"/>
- <SkewTransform/>
- <RotateTransform/>
- <TranslateTransform/>
- </TransformGroup>
- </Rectangle.RenderTransform>
- </Rectangle>
- <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">
- <Run Text="部分到货"/>
- <Run Text="{Binding SomeArrivedCount ,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
- Foreground="{StaticResource Text.Pink}" />
- </TextBlock>
- </Grid>
- <ControlTemplate.Triggers>
- <Trigger Property="IsChecked" Value="true">
- <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
- <Setter Property="Foreground" Value="white"/>
- </Trigger>
- </ControlTemplate.Triggers>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- </Style>
- </RadioButton.Style>
- </RadioButton>
- <RadioButton VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.未到货}" >
- <RadioButton.Style >
- <Style TargetType="RadioButton">
- <Setter Property="IsChecked" Value="False" />
- <Setter Property="Background" Value="#8080FF" />
- <Setter Property="Foreground" Value="Black" />
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="RadioButton">
- <Grid Background="#F2F2F2" >
- <Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="126" RenderTransformOrigin="0.5,0.5">
- <Rectangle.RenderTransform>
- <TransformGroup>
- <ScaleTransform ScaleY="-1"/>
- <SkewTransform/>
- <RotateTransform/>
- <TranslateTransform/>
- </TransformGroup>
- </Rectangle.RenderTransform>
- </Rectangle>
- <TextBlock VerticalAlignment="Center" HorizontalAlignment="Center">
- <Run Text="未到货"/>
- <Run Text="{Binding NoArrivedCount ,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
- Foreground="{StaticResource Text.Pink}" />
- </TextBlock>
- </Grid>
- <ControlTemplate.Triggers>
- <Trigger Property="IsChecked" Value="true">
- <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
- <Setter Property="Foreground" Value="white"/>
- </Trigger>
- </ControlTemplate.Triggers>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- </Style>
- </RadioButton.Style>
- </RadioButton>
- <RadioButton VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已完成}" >
- <RadioButton.Style >
- <Style TargetType="RadioButton">
- <Setter Property="IsChecked" Value="False" />
- <Setter Property="Background" Value="#8080FF" />
- <Setter Property="Foreground" Value="Black" />
- <Setter Property="Template">
- <Setter.Value>
- <ControlTemplate TargetType="RadioButton">
- <Grid Background="#F2F2F2" >
- <Rectangle x:Name="_Rect" Fill="#F2F2F2" HorizontalAlignment="Center" Height="35" VerticalAlignment="Center" Width="126" RenderTransformOrigin="0.5,0.5">
- <Rectangle.RenderTransform>
- <TransformGroup>
- <ScaleTransform ScaleY="-1"/>
- <SkewTransform/>
- <RotateTransform/>
- <TranslateTransform/>
- </TransformGroup>
- </Rectangle.RenderTransform>
- </Rectangle>
- <TextBlock Text="已完成" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
- <ControlTemplate.Triggers>
- <Trigger Property="IsChecked" Value="true">
- <Setter TargetName="_Rect" Property="Fill" Value="#8080FF" />
- <Setter Property="Foreground" Value="white"/>
- </Trigger>
- </ControlTemplate.Triggers>
- </ControlTemplate>
- </Setter.Value>
- </Setter>
- </Style>
- </RadioButton.Style>
- </RadioButton>
- <Button Content="发布任务" Width="118" Height="35" VerticalAlignment="Stretch" Margin="50,0,0,0" Command="{Binding CreateTaskCommand}"
- Grid.Row="2" HorizontalAlignment="Left" Background="{StaticResource Button.Selected.Background}" BorderThickness="0" Foreground="White"/>
</StackPanel>
<Border Grid.Row="2" Margin="0,5,0,0" BorderBrush="{StaticResource Border.Brush}" BorderThickness="0,1,0,0"/>
diff --git a/BBWY.Client/Views/PackTask/TaskListControl.xaml b/BBWY.Client/Views/PackTask/TaskListControl.xaml
index 39c31f7a..5b6cfeab 100644
--- a/BBWY.Client/Views/PackTask/TaskListControl.xaml
+++ b/BBWY.Client/Views/PackTask/TaskListControl.xaml
@@ -111,17 +111,22 @@
CommandParameter="{Binding TaskId}"
Margin=" 5,0,7,0"/>
- <Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskStatus}" Foreground="White" Background="{Binding TaskStatus,Converter={StaticResource objConverter} , ConverterParameter=未完成:#facd91:#02a7f0 }" Margin="5,0,0,0"/>
+ <Label Width="70" Height="25" HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" VerticalAlignment="Center" Content="{Binding TaskState}" Foreground="White" Background="{Binding TaskStatus,Converter={StaticResource objConverter} , ConverterParameter=未完成:#facd91:#02a7f0 }" Margin="5,0,0,0"/>
<TextBlock VerticalAlignment="Center" Text="部门:" Margin="14,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding DepartmentName}" Margin="5,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptName}" Margin="5,0,0,0" />
</StackPanel>
- <StackPanel Grid.Column="11" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center" >
+ <StackPanel Grid.Column="11" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
+
+ Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=未到货|部分到货|待质检:Visible:Collapsed}"
+ >
<c:BButton Command="{Binding UpdateTaskCommand}"
Style="{StaticResource LinkButton}" Content="修改" />
- <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding TaskId}"
- Margin="5,0,0,0" Style="{StaticResource LinkButton}" Content="取消" />
+ <c:BButton Command="{Binding DataContext.DeletedTaskCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" CommandParameter="{Binding}"
+ Margin="5,0,0,0" Style="{StaticResource LinkButton}" Content="取消"
+
+ />
</StackPanel>
</Grid>
@@ -220,7 +225,7 @@
/>
</StackPanel>
</Grid>
- <Grid Grid.Column="2" Background="{Binding Availability,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }">
+ <Grid Grid.Column="2" Background="{Binding Availability,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:Availability} }">
<TextBlock Text="{Binding Availability}"
VerticalAlignment="Center"
TextWrapping="Wrap"
@@ -353,232 +358,13 @@
ToolTipService.ShowDuration="20000">
<Path.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
- <local:FeesExcelControl IsWareHouse="False" FeesItem="{Binding FeesItemResponse,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
+ <local:FeesExcelControl FeesItem="{Binding FeesItemResponse,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
/>
-
- <!--<Grid Height="100">
- <Grid.ColumnDefinitions>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- <ColumnDefinition/>
- </Grid.ColumnDefinitions>
- <Grid.RowDefinitions>
- <RowDefinition Height="30"/>
- <RowDefinition Height="30"/>
- <RowDefinition Height="30"/>
- </Grid.RowDefinitions>
- <Border Background="#F2F2F2" Grid.RowSpan="2" Grid.ColumnSpan="17"/>
-
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="13" Grid.Row="0" Grid.RowSpan="3" BorderThickness="1,0,0,0"/>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="16" Grid.Row="0" Grid.RowSpan="3" BorderThickness="1,0,0,0"/>
- <Border Width="1" HorizontalAlignment="Right" BorderBrush="#D7D7D7" Grid.Column="16" Grid.Row="0" Grid.RowSpan="3" BorderThickness="0,0,1,0"/>
-
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="0" Grid.Row="0" Grid.RowSpan="3" BorderThickness="1,0,0,0"/>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="1" Grid.Row="0" Grid.RowSpan="3" BorderThickness="1,0,0,0"/>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="4" Grid.Row="0" Grid.RowSpan="3" BorderThickness="1,0,0,0"/>
-
- <Border Height="1" VerticalAlignment="Top" BorderBrush="#D7D7D7" Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="17" BorderThickness="0,1,0,0"/>
- <Border Height="1" VerticalAlignment="Top" BorderBrush="#D7D7D7" Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="15" BorderThickness="0,1,0,0"/>
- <Border Height="1" VerticalAlignment="Bottom" BorderBrush="#D7D7D7" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="17" BorderThickness="0,1,0,0"/>
- <Border Height="1" VerticalAlignment="Bottom" BorderBrush="#D7D7D7" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="17" BorderThickness="0,1,0,0"/>
-
-
- <TextBlock Width="84" TextAlignment="Center" Text="任务ID" Grid.Column="0" Grid.RowSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="增值服务" Grid.Column="1" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="打包服务" Grid.Column="4" Grid.ColumnSpan="9" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="打包耗材" Grid.Column="13" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Width="101" TextAlignment="Center" Text="总计" Grid.Column="16" Grid.RowSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <Grid Grid.Column="1" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsAcceptGoods,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="收货、卸货" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.AcceptGoods,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-
- </Grid>
-
- <Grid Grid.Column="2" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsSendGoods ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="装箱、送货" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.SendGoods,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-
- </Grid>
-
- <Grid Grid.Column="3" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsRuturnGoods ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="退货质检" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.RuturnGoods,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
-
- </Grid>
-
- <Grid Grid.Column="4" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsBasicPackFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="基础包装费" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Grid.Row="1" Text="{Binding FeesItemTypeDTO.BasicPackFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
-
- <Grid Grid.Column="5" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsBoxPackFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="箱子包装" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.BoxPackFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
-
- <Grid Grid.Column="6" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsExpressPackFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="快递袋包装" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.ExpressPackFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
-
- <Grid Grid.Column="7" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsExpressCloseSideFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="快递袋封边" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.ExpressCloseSideFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
- <Grid Grid.Column="8" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsAirPaperPackFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="气泡纸包装" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.AirPaperPackFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
-
- <Grid Grid.Column="9" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsAirBagPackFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="气泡袋包装" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.AirBagPackFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
- <Grid Grid.Column="10" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsPOPBagPackFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="POP袋" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.POPBagPackFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
- <Grid Grid.Column="11" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsTapePackFees ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="胶带工序" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.TapePackFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
- <Grid Grid.Column="12" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsIncreateGoods ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="增量配件" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.IncreateGoods,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
-
- <Grid Grid.Column="13" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsPaperBox ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center">
- <Run Text="{Binding FeesItemTypeDTO.BoxNumber ,Converter={StaticResource intToStringConverter},ConverterParameter=号纸箱}"/>
-
- </TextBlock>
- <TextBlock Text="{Binding FeesItemTypeDTO.PaperBox,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
- <Grid Grid.Column="14" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsAirPaper ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="气泡纸" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.AirPaper,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
- <Grid Grid.Column="15" Width="84" Grid.Row="1" Grid.RowSpan="2" Visibility="{Binding FeesItemTypeDTO.IsTape ,ConverterParameter=true:Collapsed:Visible,Converter={StaticResource objConverter}}" >
- <Grid.RowDefinitions>
- <RowDefinition/>
- <RowDefinition/>
- </Grid.RowDefinitions>
- <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.RowSpan="2" BorderThickness="0,0,1,0"/>
- <TextBlock Text="胶带" Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.Tape,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>
- <TextBlock Text="{Binding TaskId,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- <TextBlock Text="{Binding FeesItemTypeDTO.TotalFees,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="16" VerticalAlignment="Center" HorizontalAlignment="Center"/>
- </Grid>-->
</ToolTip>
</Path.ToolTip>
</Path>
</StackPanel>
-
- <!--<Grid Grid.Row="1" >
- <Border Grid.Row="0" VerticalAlignment="Top" Height="1" Background="{StaticResource Border.Brush}"/>
-
- <c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="White" Foreground="Black" Grid.Row="1" Content="设置"
- Command="{Binding SetServiceCommand}"
- Visibility="Visible" />
- </Grid>-->
-
-
-
-
-
</Grid>
</Grid>
<Grid Grid.Column="11" >
diff --git a/BBWY.Client/Views/PackTask/WareHouseList.xaml b/BBWY.Client/Views/PackTask/WareHouseList.xaml
index a97aceb7..43cf0944 100644
--- a/BBWY.Client/Views/PackTask/WareHouseList.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseList.xaml
@@ -142,26 +142,26 @@
<RadioButton Height="35" Width="126" VerticalAlignment="Center" x:Name="qb" IsChecked="True" Content="全部" Command="{Binding SetTaskStateCommand}" />
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.未到货}" Content="未到货" Tag="{Binding NoArrivedCount,Mode=TwoWay}" />
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.未到货}" Content="未到货" Tag="{Binding NoArrivedCount,Mode=TwoWay}" />
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.部分到货}" Content="部分到货" Tag="{Binding SomeArrivedCount,Mode=TwoWay}"/>
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.部分到货}" Content="部分到货" Tag="{Binding SomeArrivedCount,Mode=TwoWay}"/>
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检" />
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待质检}" Tag="{Binding ArrivedCount,Mode=TwoWay}" Content="待质检" />
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"/>
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待打包}" Content="待打包" Tag="{Binding WaitPackCount,Mode=TwoWay}"/>
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.待封箱}" Content="待封箱" Tag="{Binding WaitSealBoxCount,Mode=TwoWay}"/>
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待封箱}" Content="待封箱" Tag="{Binding WaitSealBoxCount,Mode=TwoWay}"/>
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"/>
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待落仓}" Content="待落仓" Tag="{Binding WaitFallWareCount,Mode=TwoWay}"/>
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.待出库}" Content="待出库" Tag="{Binding WaitOutbound,Mode=TwoWay}"/>
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待出库}" Content="待出库" Tag="{Binding WaitOutbound,Mode=TwoWay}"/>
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.已完成}" Content="已完成" />
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已完成}" Content="已完成" />
- <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:PackTaskState.已取消}" Content="已取消" />
+ <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.已取消}" Content="已取消" />
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 8523915c..c457c441 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -229,7 +229,7 @@
/>
</StackPanel>
</Grid>
- <Grid Grid.Column="2" Background="{Binding Availability,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:TaskState} }">
+ <Grid Grid.Column="2" Background="{Binding Availability,Converter={StaticResource enumToColorConverter} , ConverterParameter={x:Type cmodel:Availability} }">
<TextBlock Text="{Binding Availability}"
VerticalAlignment="Center"
TextWrapping="Wrap"