Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
ac2fdad25b
  1. 66
      BBWY.Client/APIServices/QiKu/PackTaskService.cs
  2. 102
      BBWY.Client/Models/APIModel/Response/PackTask/ShopTotalV2Response.cs
  3. 2
      BBWY.Client/Models/Enums.cs
  4. 119
      BBWY.Client/Models/PackTask/ShopTotal.cs
  5. 5
      BBWY.Client/ViewModels/MainViewModel.cs
  6. 40
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  7. 4
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  8. 10
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  9. 200
      BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs
  10. 11
      BBWY.Client/ViewModels/ViewModelLocator.cs
  11. 4
      BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml
  12. 4
      BBWY.Client/Views/PackTask/FeesExcelControl.xaml
  13. 8
      BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs
  14. 2
      BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml
  15. 96
      BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml.cs
  16. 8
      BBWY.Client/Views/PackTask/PackDetailWindow.xaml
  17. 211
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml
  18. 4
      BBWY.Client/Views/PackTask/PublishTaskWindow.xaml
  19. 4
      BBWY.Client/Views/PackTask/ShopWaitCompletedControl.xaml
  20. 10
      BBWY.Client/Views/PackTask/ShopWaitPackageControl.xaml
  21. 8
      BBWY.Client/Views/PackTask/TaskList.xaml
  22. 4
      BBWY.Client/Views/PackTask/TaskListControl.xaml
  23. 6
      BBWY.Client/Views/PackTask/UpdatePurchaseTaskWindow.xaml
  24. 4
      BBWY.Client/Views/PackTask/WaitCompletedControl.xaml
  25. 14
      BBWY.Client/Views/PackTask/WaitPackageControl.xaml
  26. 8
      BBWY.Client/Views/PackTask/WareHouseList.xaml
  27. 10
      BBWY.Client/Views/PackTask/WareHouseListControl.xaml
  28. 6
      BBWY.Client/Views/QualityTask/QualityWindow.xaml
  29. 6
      BBWY.Client/Views/QualityTask/ShopWaitQualityControl.xaml
  30. 4
      BBWY.Client/Views/QualityTask/WaitQualityControl.xaml
  31. 339
      BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml
  32. 26
      BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml.cs
  33. 4
      BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml

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

@ -36,7 +36,7 @@ namespace BBWY.Client.APIServices
) )
{ {
return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{ {
orderSn, orderSn,
@ -182,29 +182,59 @@ namespace BBWY.Client.APIServices
} }
public ApiResponse<ShopTotalResponse> ShopTotal(string skuId = null, string taskId = null, //public ApiResponse<ShopTotalResponse> ShopTotal(string skuId = null, string taskId = null,
DateTime? startTime = null, // DateTime? startTime = null,
DateTime? endTime = null, // DateTime? endTime = null,
string ShopName = null, // string ShopName = null,
string DepartmentName = null, // string DepartmentName = null,
// int pageIndex = 1,
// int pageSize = 10
// )
//{
// return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/ShopTotal", new
// {
// SkuId = skuId,
// TaskId = taskId,
// StartTime = startTime,
// EndTime = endTime,
// DepartmentName,
// ShopName,
// PageIndex = pageIndex,
// PageSize = pageSize
// }, null, HttpMethod.Post);
//}
public ApiResponse<ShopTotalResponse> ShopTotalV2(string skuId,
string taskId,
string shopId,
DateTime? startTime,
DateTime? endTime,
string ShopName,
string DepartmentName,
int pageIndex = 1, int pageIndex = 1,
int pageSize = 10 int pageSize = 10
) )
{ {
return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/ShopTotal", new return SendRequest<ShopTotalResponse>(globalContext.QKApiHost, "api/PackTask/ShopTotalV2", new
{ {
shopId,
SkuId = skuId, skuId,
TaskId = taskId, taskId,
StartTime = startTime, startTime,
EndTime = endTime, endTime,
DepartmentName, DepartmentName,
ShopName, ShopName,
PageIndex = pageIndex, pageIndex,
PageSize = pageSize pageSize
}, null, HttpMethod.Post); }, null, HttpMethod.Post);
} }
/// <summary> /// <summary>
/// 批量结算 /// 批量结算
/// </summary> /// </summary>
@ -286,7 +316,7 @@ namespace BBWY.Client.APIServices
/// <returns></returns> /// <returns></returns>
public ApiResponse<object> ManualSign(string wayBillNo) public ApiResponse<object> ManualSign(string wayBillNo)
{ {
return SendRequest< object>("http://bbwyb.qiyue666.com", $"Api​/PurchaseOrder​/ManualSign", new return SendRequest<object>("http://bbwyb.qiyue666.com", $"Api​/PurchaseOrder​/ManualSign", new
{ {
wayBillNo wayBillNo
}, null, HttpMethod.Post); }, null, HttpMethod.Post);
@ -299,7 +329,7 @@ namespace BBWY.Client.APIServices
/// <returns></returns> /// <returns></returns>
public ApiResponse<object> BatchManualSign(string[] wayBillNoList) public ApiResponse<object> BatchManualSign(string[] wayBillNoList)
{ {
return SendRequest<object>("http://bbwyb.qiyue666.com", $"api/purchaseorder/batchmanualsign",new { wayBillNoList }, null, HttpMethod.Post); return SendRequest<object>("http://bbwyb.qiyue666.com", $"api/purchaseorder/batchmanualsign", new { wayBillNoList }, null, HttpMethod.Post);
} }
/// <summary> /// <summary>
@ -343,9 +373,11 @@ namespace BBWY.Client.APIServices
public ApiResponse<object> SendToSetSkuConfigure(long taskId) public ApiResponse<object> SendToSetSkuConfigure(long taskId)
{ {
return SendRequest<object>(globalContext.QKApiHost, $"api/PackTask/SendToSetSkuConfigure?taskid={taskId}",null, null, HttpMethod.Post); return SendRequest<object>(globalContext.QKApiHost, $"api/PackTask/SendToSetSkuConfigure?taskid={taskId}", null, null, HttpMethod.Post);
} }
} }
public class CompeteSealBox public class CompeteSealBox

102
BBWY.Client/Models/APIModel/Response/PackTask/ShopTotalV2Response.cs

@ -0,0 +1,102 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace BBWY.Client.Models.APIModel.Response.PackTask
{
public class ShopTotalV2Response
{
/// <summary>
///总量
/// </summary>
public int TotalCount { get; set; }
/// <summary>
///
/// </summary>
public List<ShopTotalV2> ShopTotals { get; set; }
}
public class ShopTotalV2
{
/// <summary>
/// 任务id
/// </summary>
public long TaskId { get; set; }
/// <summary>
/// 完成打包时间日期
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 是否结清
/// </summary>
public Settle IsSettle { get; set; }
/// <summary>
/// 部门
/// </summary>
public string DepartmentName { get; set; }
/// <summary>
/// 店铺
/// </summary>
public string ShopName { get; set; }
/// <summary>
/// 对接人
/// </summary>
public string AcceptUserName { get; set; }
/// <summary>
/// sku标题
/// </summary>
public string SkuName { get; set; }
/// <summary>
/// sku数量(任务数量)
/// </summary>
public int SkuCount { get; set; }
/// <summary>
/// 耗材费
/// </summary>
public decimal ConsumableFees { get; set; }
/// <summary>
/// 到货数量
/// </summary>
public int? ArrivalQuantity { get; set; }
/// <summary>
/// 打包费(原价)
/// </summary>
public decimal PackFees { get; set; }
/// <summary>
/// 折扣系数
/// </summary>
public decimal? DiscountFactor { get; set; }
/// <summary>
/// 打包费用折扣价
/// </summary>
public decimal? PackDisCountFees { get; set; }
///// <summary>
///// 折扣类型
///// </summary>
//public FeesMode? FeesMode { get; set; }
/// <summary>
/// 总费用
/// </summary>
public decimal? AllFees { get; set; }
/// <summary>
/// 工序类型名称
/// </summary>
public string ProcessTypeName { get; set; }
/// <summary>
/// 工序套餐名称
/// </summary>
public string ProcessComboName { get; set; }
/// <summary>
/// 工序套餐单价
/// </summary>
public decimal ProcessComboPrice { get; set; }
/// <summary>
/// 工序套餐任务量
/// </summary>
public int ProcessComboTaskCount { get; set; }
/// <summary>
/// 耗材服务数据
/// </summary>
public List<ServiceItemResponse> ConsumableList { get; set; }
}
}

2
BBWY.Client/Models/Enums.cs

@ -225,7 +225,7 @@
= 0, = 0,
= 1, = 1,
= 2,//已到货 = 2,//已到货
= 3, = 3,
= 4, = 4,
= 5, = 5,
= 6, = 6,

119
BBWY.Client/Models/PackTask/ShopTotal.cs

@ -1,4 +1,5 @@
using BBWY.Client.ViewModels; using BBWY.Client.Models.APIModel.Response.PackTask;
using BBWY.Client.ViewModels;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
@ -7,23 +8,29 @@ namespace BBWY.Client.Models.PackTask
{ {
public class ShopTotal :NotifyObject public class ShopTotal :NotifyObject
{ {
private FeesItemResponse feesItemResponse;
public FeesItemResponse FeesItemResponse { get => feesItemResponse; set { Set(ref feesItemResponse, value); } }
private long id; private long id;
public long Id { get => id; set { Set(ref id, value); } } public long Id { get => id; set { Set(ref id, value); } }
private bool taskChecked; private bool taskChecked;
public bool TaskChecked { get => taskChecked; set { Set(ref taskChecked, value); } } public bool TaskChecked { get => taskChecked; set { Set(ref taskChecked, value); } }
/// <summary>
/// 任务id
/// </summary>
public long TaskId { get; set; } public long TaskId { get; set; }
/// <summary> /// <summary>
/// 需求方创建日期 /// 完成打包时间日期
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime? CreateTime { get; set; }
/// <summary> /// <summary>
/// 是否结清 /// 是否结清
/// </summary> /// </summary>
//
public Settle IsSettle { get; set; } public Settle IsSettle { get; set; }
/// <summary> /// <summary>
/// 部门 /// 部门
@ -38,101 +45,67 @@ namespace BBWY.Client.Models.PackTask
/// </summary> /// </summary>
public string AcceptUserName { get; set; } public string AcceptUserName { get; set; }
/// <summary> /// <summary>
/// sku /// sku标题
/// </summary> /// </summary>
public string SkuName { get; set; } public string SkuName { get; set; }
/// <summary> /// <summary>
/// sku数量(任务数量) /// sku数量(任务数量)
/// </summary> /// </summary>
public int SkuCount { get; set; } public int SkuCount { get; set; }
public decimal IncreaseFees { get; set; }
public decimal PackFees { get; set; }
public decimal ConsumableFees { get; set; }
// public decimal Price { get; set; }
//public decimal Discount { get; set; }
public decimal DiscountPrice { get; set; }
/// <summary>
/// 注意事项(对接备注)
/// </summary>
public string MarkMessage { get; set; }
/// <summary>
/// 打包单价
/// </summary>
public decimal? PackSingleFees { get; set; }
/// <summary> /// <summary>
/// 打包费用 /// 耗材费
/// </summary> /// </summary>
//public decimal? PackAllFees { get; set; } public decimal ConsumableFees { get; set; }
/// <summary>
/// 箱子费用
/// </summary>
public decimal? BoxConsumableFees { get; set; }
/// <summary>
/// 气泡纸耗材费
/// </summary>
public decimal? AirConsumableFees { get; set; }
/// <summary> /// <summary>
/// 胶带耗材费 /// 到货数量
/// </summary> /// </summary>
public decimal? TapeConsumableFees { get; set; } public int? ArrivalQuantity { get; set; }
/// <summary> /// <summary>
/// 其他耗材费 /// 打包费(原价)
/// </summary> /// </summary>
public decimal? OtherConsumableFees { get; set; } public decimal PackFees { get; set; }
/// <summary> /// <summary>
/// 折扣系数 /// 折扣系数
/// </summary> /// </summary>
public decimal? DiscountFactor { get; set; } public decimal? DiscountFactor { get; set; }
/// <summary> /// <summary>
/// 到货数量 /// 打包费用折扣价
/// </summary> /// </summary>
public int? ArrivalQuantity { get; set; } public decimal? PackDisCountFees { get; set; }
///// <summary>
///// 折扣类型
///// </summary>
//public FeesMode? FeesMode { get; set; }
/// <summary> /// <summary>
/// 基础价格(基础包装费、仅贴码) /// 总费用
/// </summary> /// </summary>
public decimal? BasicPrice { get; set; } public decimal? AllFees { get; set; }
/// <summary> /// <summary>
/// 增量价格 /// 工序类型名称
/// </summary> /// </summary>
public decimal? IncrementPartPrice { get; set; } public string ProcessTypeName { get; set; }
/// <summary> /// <summary>
/// 增量工序价 /// 工序套餐名称
/// </summary> /// </summary>
public decimal? IncrementProcessPrice { get; set; } public string ProcessComboName { get; set; }
/// <summary> /// <summary>
/// 折扣类型 /// 工序套餐单价
/// </summary> /// </summary>
public FeesMode? FeesMode { get; set; } public decimal ProcessComboPrice { get; set; }
/// <summary> /// <summary>
/// 总费用 /// 工序套餐任务量
/// </summary> /// </summary>
public decimal? AllFees { get; set; } public int ProcessComboTaskCount { get; set; }
/// <summary> /// <summary>
/// 打包费用折扣价 /// 耗材服务数据
/// </summary> /// </summary>
public decimal? PackDisCountFees { get; set; } public List<ServiceItemResponse> ConsumableList { get; set; }
// string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,打包原价,打包折扣系数,打包折扣价,总收费";
public override string ToString() public override string ToString()
{ {
return $"{TaskId},{CreateTime?.ToString("MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
return $"{TaskId},{CreateTime.ToString("MM-dd")},{IsSettle},{DepartmentName},{ShopName}" + $",{SkuCount},{ArrivalQuantity},{ConsumableFees},{ProcessTypeName},{ProcessComboName},{ProcessComboPrice},{PackFees},{DiscountFactor},{PackDisCountFees},{AllFees}";
$",{SkuCount},{BoxConsumableFees},{AirConsumableFees},{TapeConsumableFees},{OtherConsumableFees},{ConsumableFees},{ArrivalQuantity},{BasicPrice},{IncrementPartPrice},{IncrementProcessPrice},{PackSingleFees},{PackFees},{FeesMode},{DiscountFactor},{PackDisCountFees},{IncreaseFees},{AllFees}";
} }
} }
@ -144,5 +117,15 @@ namespace BBWY.Client.Models.PackTask
public int TotalCount { get; set; } public int TotalCount { get; set; }
public ShopTotal[] ShopTotals { get; set; } public ShopTotal[] ShopTotals { get; set; }
/// <summary>
/// 总打包费用
/// </summary>
public decimal TotalPackDiscountFees { get; set; }
/// <summary>
/// 总耗材费
/// </summary>
public decimal TotalConsumableFees { get; set; }
} }
} }

5
BBWY.Client/ViewModels/MainViewModel.cs

@ -133,7 +133,7 @@ namespace BBWY.Client.ViewModels
Name = "齐库仓库端", Name = "齐库仓库端",
ChildList = new List<MenuModel>() ChildList = new List<MenuModel>()
{ {
new MenuModel(){ Name="包任务",Url="/Views/PackTask/WareHouseList.xaml" }, new MenuModel(){ Name="包任务",Url="/Views/PackTask/WareHouseList.xaml" },
new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" }, new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" },
new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" }, new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" },
new MenuModel(){ Name="收益账单",Url="/Views/TotalPackTask/PackUserSalaryList.xaml" } new MenuModel(){ Name="收益账单",Url="/Views/TotalPackTask/PackUserSalaryList.xaml" }
@ -196,6 +196,7 @@ namespace BBWY.Client.ViewModels
ChildList = new List<MenuModel>() ChildList = new List<MenuModel>()
{ {
new MenuModel(){ Name="发布任务",Url="/Views/PackTask/TaskList.xaml" }, new MenuModel(){ Name="发布任务",Url="/Views/PackTask/TaskList.xaml" },
new MenuModel(){ Name="包装账单",Url="/Views/TotalPackTask/ShopPackTaskTotal.xaml" },
} }
@ -213,7 +214,7 @@ namespace BBWY.Client.ViewModels
Name = "齐库仓库端", Name = "齐库仓库端",
ChildList = new List<MenuModel>() ChildList = new List<MenuModel>()
{ {
new MenuModel(){ Name="包任务",Url="/Views/PackTask/WareHouseList.xaml" }, new MenuModel(){ Name="包任务",Url="/Views/PackTask/WareHouseList.xaml" },
new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" }, new MenuModel(){ Name="耗材管理",Url="/Views/PackTask/Consumable.xaml" },
new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" }, new MenuModel(){ Name="账单管理",Url="/Views/PackTask/PackTaskTotal.xaml" },
new MenuModel(){ Name="收益账单",Url="/Views/TotalPackTask/PackUserSalaryList.xaml" } new MenuModel(){ Name="收益账单",Url="/Views/TotalPackTask/PackUserSalaryList.xaml" }

40
BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs

@ -18,6 +18,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using WebSocketSharp;
namespace BBWY.Client.ViewModels.PackTask namespace BBWY.Client.ViewModels.PackTask
{ {
@ -56,6 +57,18 @@ namespace BBWY.Client.ViewModels.PackTask
public int PageSize { get => pageSize; set { Set(ref pageSize, value); } } public int PageSize { get => pageSize; set { Set(ref pageSize, value); } }
public int OrderCount { get => orderCount; set { Set(ref orderCount, value); } } public int OrderCount { get => orderCount; set { Set(ref orderCount, value); } }
private decimal totalPackDiscountFees;
/// <summary>
/// 总打包费用
/// </summary>
public decimal TotalPackDiscountFees { get => totalPackDiscountFees; set { Set(ref totalPackDiscountFees, value); } }
private decimal totalConsumableFees;
/// <summary>
/// 总耗材费
/// </summary>
public decimal TotalConsumableFees { get => totalConsumableFees; set { Set(ref totalConsumableFees, value); } }
public ICommand SetSearchDateCommand { get; set; } public ICommand SetSearchDateCommand { get; set; }
@ -107,7 +120,7 @@ namespace BBWY.Client.ViewModels.PackTask
SearchTaskTotal(); SearchTaskTotal();
} }
private void Export() private void Export()
{ {
@ -125,12 +138,12 @@ namespace BBWY.Client.ViewModels.PackTask
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
IsLoading = true; IsLoading = true;
var res = packTaskService.ShopTotal(SearchSkuId, SearchTaskId, StartDate, EndDate, SearchShopName, var res = packTaskService.ShopTotalV2(SearchSkuId, SearchTaskId, null, StartDate, EndDate, SearchShopName,
SearchDepartment, 0, 0);//获取全部数据 SearchDepartment, 0, 0);//获取全部数据
if (res.Success) if (res.Success)
{ {
//string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注"; //string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
string title = "任务ID,日期,是否结清,所属部门,所属店铺,打包数量,箱子,气泡纸,胶带,其他,耗材总价,收货数量,基础价格,增量配件价,增量工序价格,打包单价,打包原价,收费方式,打包折扣系数,打包折扣价,增值费用,总收费"; string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,包装原价,包装折扣系数,包装折扣价,总收费";
var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList(); var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
excelList.Insert(0, title); excelList.Insert(0, title);
System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8); System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);
@ -196,18 +209,35 @@ namespace BBWY.Client.ViewModels.PackTask
private void SearchTaskTotal() private void SearchTaskTotal()
{ {
PackTaskTotalList = new ObservableCollection<ShopTotal>(); PackTaskTotalList = new ObservableCollection<ShopTotal>();
Task.Factory.StartNew(() => Task.Factory.StartNew(() =>
{ {
IsLoading = true; IsLoading = true;
var res = packTaskService.ShopTotal(SearchSkuId, SearchTaskId, StartDate, EndDate, SearchShopName, var res = packTaskService.ShopTotalV2(SearchSkuId, SearchTaskId, null, StartDate, EndDate, SearchShopName,
SearchDepartment, PageIndex, PageSize); SearchDepartment, PageIndex, PageSize);
if (res != null && res.Success) if (res != null && res.Success)
{ {
OrderCount = res.Data.TotalCount; OrderCount = res.Data.TotalCount;
TotalConsumableFees = res.Data.TotalConsumableFees;
TotalPackDiscountFees = res.Data.TotalPackDiscountFees;
foreach (var shopTotal in res.Data.ShopTotals) foreach (var shopTotal in res.Data.ShopTotals)
{ {
if (!shopTotal.ProcessComboName.IsNullOrEmpty())
shopTotal.FeesItemResponse = new Models.APIModel.Response.PackTask.FeesItemResponse
{
AllFees = shopTotal.AllFees.Value,
PackFees=shopTotal.PackDisCountFees.Value,
TaskId = shopTotal.TaskId,
ProcessTypeName = shopTotal.ProcessTypeName,
ProcessComboName = shopTotal.ProcessComboName,
ConsumableFees =shopTotal.ConsumableFees,
ConsumableList = shopTotal.ConsumableList,
ProcessComboPrice = shopTotal.ProcessComboPrice,
ProcessComboTaskCount = shopTotal.ProcessComboTaskCount,
DiscountFoctor = shopTotal.DiscountFactor
};
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>
{ {
PackTaskTotalList.Add(shopTotal); PackTaskTotalList.Add(shopTotal);

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

@ -687,9 +687,9 @@ namespace BBWY.Client.ViewModels.PackTask
} }
//任务状态为待打包 //任务状态为待打包
if (TaskState == Models.TaskState.) if (TaskState == Models.TaskState.)
{ {
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList(); var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList();
if (packCompletedTasks.Count() > 0) if (packCompletedTasks.Count() > 0)
{ {

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

@ -612,7 +612,7 @@ namespace BBWY.Client.ViewModels.PackTask
case Models.TaskState.: case Models.TaskState.:
overTimeTaskType = Models.OverTimeTaskType.; overTimeTaskType = Models.OverTimeTaskType.;
break; break;
case Models.TaskState.: case Models.TaskState.:
overTimeTaskType = Models.OverTimeTaskType.; overTimeTaskType = Models.OverTimeTaskType.;
break; break;
case Models.TaskState.: case Models.TaskState.:
@ -922,7 +922,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
var model = (SealBoxModel)obj; var model = (SealBoxModel)obj;
if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState. || s.TaskState == Models.TaskState.)) if (model.SealBoxSkus.Any(s => s.TaskState == Models.TaskState. || s.TaskState == Models.TaskState.))
{ {
System.Windows.MessageBox.Show("无法封箱,存在未打包完成的任务"); System.Windows.MessageBox.Show("无法封箱,存在未打包完成的任务");
return; return;
@ -1115,7 +1115,7 @@ namespace BBWY.Client.ViewModels.PackTask
break; break;
case Models.TaskState.: case Models.TaskState.:
break; break;
case Models.TaskState.: case Models.TaskState.:
var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId); var packModel = PackTaskList.SingleOrDefault(p => p.TaskId == taskId);
if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0) if (packModel == null || packModel.FeesItemResponse == null || packModel.FeesItemResponse.DiscountAllFees == 0)
@ -1645,9 +1645,9 @@ namespace BBWY.Client.ViewModels.PackTask
//任务状态为待验收 //任务状态为待验收
} }
if (TaskState == Models.TaskState.) if (TaskState == Models.TaskState.)
{ {
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList(); var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState. && p.PackCompletionOverTime != null).ToList();
if (packCompletedTasks.Count() > 0) if (packCompletedTasks.Count() > 0)
{ {

200
BBWY.Client/ViewModels/TotalPackTask/ShopPackTaskTotalViewModel.cs

@ -0,0 +1,200 @@
using BBWY.Client.APIServices;
using BBWY.Client.Models.PackTask;
using BBWY.Common.Models;
using BBWY.Controls;
using GalaSoft.MvvmLight.Command;
using Microsoft.Win32;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
using System.Windows;
using System.Linq;
using AutoMapper.Internal;
using WebSocketSharp;
namespace BBWY.Client.ViewModels.TotalPackTask
{
public class ShopPackTaskTotalViewModel : BaseVM, IDenpendency
{
private readonly PackTaskService packTaskService;
private bool isLoading;
private DateTime startDate;
private DateTime endDate;
private int pageIndex = 1;
private int pageSize = 15;
private int orderCount;
private string searchTaskId;
private string searchSkuId;
private ObservableCollection<ShopTotal> packTaskTotalList;
public ObservableCollection<ShopTotal> PackTaskTotalList { get => packTaskTotalList; set { Set(ref packTaskTotalList, value); } }
public string SearchSkuId { get => searchSkuId; set { Set(ref searchSkuId, value); } }
public string SearchTaskId { get => searchTaskId; set { Set(ref searchTaskId, value); } }
public bool IsLoading { get => isLoading; set { Set(ref isLoading, value); } }
public DateTime StartDate { get => startDate; set { Set(ref startDate, value); } }
public DateTime EndDate { get => endDate; set { Set(ref endDate, value); } }
public int PageIndex { get => pageIndex; set { Set(ref pageIndex, value); } }
public int PageSize { get => pageSize; set { Set(ref pageSize, value); } }
public int OrderCount { get => orderCount; set { Set(ref orderCount, value); } }
private decimal totalPackDiscountFees;
/// <summary>
/// 总打包费用
/// </summary>
public decimal TotalPackDiscountFees { get => totalPackDiscountFees; set { Set(ref totalPackDiscountFees, value); } }
private decimal totalConsumableFees;
/// <summary>
/// 总耗材费
/// </summary>
public decimal TotalConsumableFees { get => totalConsumableFees; set { Set(ref totalConsumableFees, value); } }
public ICommand SetSearchDateCommand { get; set; }
public ICommand SearchTaskTotalCommand { get; set; }
public ICommand ExportCommand { get; set; }
public ICommand OrderPageIndexChangedCommand { get; set; }
//public IList<Department> departmentList;
//ShopService shopService;
public ShopPackTaskTotalViewModel(PackTaskService packTaskService, GlobalContext globalContext)
{
this.packTaskService = packTaskService;
SearchTaskTotalCommand = new RelayCommand(() =>
{
SearchTask(1);
});
StartDate = DateTime.Now;
EndDate = DateTime.Now;
SetSearchDateCommand = new RelayCommand<int>(d =>
{
EndDate = d == 1 ? DateTime.Now.Date.AddDays(-1) : DateTime.Now;
StartDate = DateTime.Now.Date.AddDays(d * -1);
PageIndex = 1;
Task.Factory.StartNew(() => LoadOrder(1)); //点击日期查询订单
});
OrderPageIndexChangedCommand = new RelayCommand<PageArgs>(p =>
{
LoadOrder(p.PageIndex);
});
ExportCommand = new RelayCommand(Export);
SearchTaskTotal();
this.globalContext = globalContext;
}
GlobalContext globalContext;
private void Export()
{
SaveFileDialog save = new SaveFileDialog();
save.Filter = "csv files(*.csv)|*.csv";
var result = save.ShowDialog();
if (result == null || !result.Value)
{
return;
}
string fileName = save.FileName;
Task.Factory.StartNew(() =>
{
IsLoading = true;
var res = packTaskService.ShopTotalV2(SearchSkuId, SearchTaskId, globalContext.User.Shop.ShopId.ToString(), StartDate, EndDate, null,
null, 0, 0);//获取全部数据
if (res.Success)
{
//string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,包装原价,包装折扣系数,包装折扣价,总收费";
var excelList = res.Data.ShopTotals.Select(x => x.ToString()).ToList();
excelList.Insert(0, title);
System.IO.File.WriteAllLines(fileName, excelList, Encoding.UTF8);
}
IsLoading = false;
});
}
private void SearchTaskTotal()
{
PackTaskTotalList = new ObservableCollection<ShopTotal>();
Task.Factory.StartNew(() =>
{
IsLoading = true;
var res = packTaskService.ShopTotalV2(SearchSkuId, SearchTaskId, globalContext.User.Shop.ShopId.ToString(), StartDate, EndDate, null,
null, PageIndex, PageSize);
if (res != null && res.Success)
{
OrderCount = res.Data.TotalCount;
TotalConsumableFees = res.Data.TotalConsumableFees;
TotalPackDiscountFees = res.Data.TotalPackDiscountFees;
foreach (var shopTotal in res.Data.ShopTotals)
{
if (!shopTotal.ProcessComboName.IsNullOrEmpty())
shopTotal.FeesItemResponse = new Models.APIModel.Response.PackTask.FeesItemResponse
{
AllFees = shopTotal.AllFees.Value,
PackFees = shopTotal.PackDisCountFees.Value,
TaskId = shopTotal.TaskId,
ProcessTypeName = shopTotal.ProcessTypeName,
ProcessComboName = shopTotal.ProcessComboName,
ConsumableFees = shopTotal.ConsumableFees,
ConsumableList = shopTotal.ConsumableList,
ProcessComboPrice = shopTotal.ProcessComboPrice,
ProcessComboTaskCount = shopTotal.ProcessComboTaskCount,
DiscountFoctor = shopTotal.DiscountFactor
};
App.Current.Dispatcher.Invoke(() =>
{
PackTaskTotalList.Add(shopTotal);
});
}
}
IsLoading = false;
});
}
private void LoadOrder(int pageIndex)
{
SearchTask(pageIndex);
}
private void SearchTask(int pageIndex)
{
PageIndex = pageIndex;
SearchTaskTotal();
}
}
}

11
BBWY.Client/ViewModels/ViewModelLocator.cs

@ -100,6 +100,17 @@ namespace BBWY.Client.ViewModels
} }
} }
public ShopPackTaskTotalViewModel ShopPackTaskTotal
{
get
{
using (var s = sp.CreateScope())
{
return s.ServiceProvider.GetRequiredService<ShopPackTaskTotalViewModel>();
}
}
}
public ServiceOrderViewModel ServiceOrderList public ServiceOrderViewModel ServiceOrderList
{ {
get get

4
BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml

@ -132,7 +132,7 @@
<TextBlock Text="任务信息" FontWeight="Bold" Margin="19 23" HorizontalAlignment="Left" VerticalAlignment="Top"/> <TextBlock Text="任务信息" FontWeight="Bold" Margin="19 23" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<StackPanel Height="30" VerticalAlignment="Center" Margin="19 64" Orientation="Horizontal" HorizontalAlignment="Left" > <StackPanel Height="30" VerticalAlignment="Center" Margin="19 64" Orientation="Horizontal" HorizontalAlignment="Left" >
<TextBlock Text="数量:" VerticalAlignment="Center"/> <TextBlock Text="数量:" VerticalAlignment="Center"/>
<c:BTextBox WaterRemark="包数量" Height="25" Width="90" Text="{Binding SkuCount}" /> <c:BTextBox WaterRemark="包数量" Height="25" Width="90" Text="{Binding SkuCount}" />
<TextBlock Margin="30 0 0 0" Text="到货情况:" VerticalAlignment="Center"/> <TextBlock Margin="30 0 0 0" Text="到货情况:" VerticalAlignment="Center"/>
<Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1"> <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1">
<ComboBox BorderThickness="0" VerticalContentAlignment="Center" ItemsSource="{Binding AvailabilityList}" Text="{Binding Availability}" > <ComboBox BorderThickness="0" VerticalContentAlignment="Center" ItemsSource="{Binding AvailabilityList}" Text="{Binding Availability}" >
@ -147,7 +147,7 @@
</StackPanel> </StackPanel>
<c:BTextBox HorizontalAlignment="Left" Text="{Binding MarkMessage}" VerticalAlignment="Top" Height="100" Width="350" <c:BTextBox HorizontalAlignment="Left" Text="{Binding MarkMessage}" VerticalAlignment="Top" Height="100" Width="350"
WaterRemark="包备注" Margin="400 64 0 0 " AcceptsReturn="True" TextWrapping="Wrap"> WaterRemark="包备注" Margin="400 64 0 0 " AcceptsReturn="True" TextWrapping="Wrap">
</c:BTextBox> </c:BTextBox>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Height="30" <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Top" Height="30"

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

@ -51,10 +51,10 @@
<TextBlock Text="任务ID" TextAlignment="Center" Grid.Column="0" Grid.RowSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="任务ID" TextAlignment="Center" Grid.Column="0" Grid.RowSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Text="增值服务" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="增值服务" Grid.Column="1" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="4" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/> <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="4" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/>
<TextBlock Text="包服务" Grid.Column="4" Grid.ColumnSpan="6" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="包服务" Grid.Column="4" Grid.ColumnSpan="6" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="10" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/> <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="10" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/>
<TextBlock Text="包耗材" Grid.Column="10" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="包耗材" Grid.Column="10" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="12" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/> <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="12" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/>

8
BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs

@ -184,7 +184,7 @@ namespace BBWY.Client.Views.PackTask
/// <summary> /// <summary>
/// index 从1开始 0+1 增值服务 和包耗材 /// index 从1开始 0+1 增值服务 和包耗材
/// </summary> /// </summary>
string columnData = @" string columnData = @"
<Grid Grid.Column=""[:index:]"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" > <Grid Grid.Column=""[:index:]"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
@ -330,9 +330,9 @@ namespace BBWY.Client.Views.PackTask
string increateService = @" <TextBlock Text=""增值服务"" Grid.Column=""1"" Grid.ColumnSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> string increateService = @" <TextBlock Text=""增值服务"" Grid.Column=""1"" Grid.ColumnSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Column=""[:1+IncreateCount:]"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""1,0,0,0""/>"; <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Column=""[:1+IncreateCount:]"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""1,0,0,0""/>";
string workProcess = "<TextBlock Text=\"包服务\" Grid.Column=\"[:1+IncreateCount:]\" Grid.ColumnSpan=\"[:ProcessCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+IncreateCount+ProcessCount:]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n "; string workProcess = "<TextBlock Text=\"包服务\" Grid.Column=\"[:1+IncreateCount:]\" Grid.ColumnSpan=\"[:ProcessCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+IncreateCount+ProcessCount:]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n ";
string consumableService = "<TextBlock Text=\"包耗材\" Grid.Column=\"[:1+IncreateCount+ProcessCount:]\" Grid.ColumnSpan=\"[:ConsumableCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+IncreateCount+ProcessCount:+ConsumableCount]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n "; string consumableService = "<TextBlock Text=\"包耗材\" Grid.Column=\"[:1+IncreateCount+ProcessCount:]\" Grid.ColumnSpan=\"[:ConsumableCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+IncreateCount+ProcessCount:+ConsumableCount]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n ";
@ -436,7 +436,7 @@ namespace BBWY.Client.Views.PackTask
if (basicProcessList.Count > 0)//包服务 if (basicProcessList.Count > 0)//包服务
{ {
rowIndex++; rowIndex++;

2
BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml

@ -43,7 +43,7 @@
<TextBlock Text="包装服务" Grid.Column="1" Grid.ColumnSpan="4" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="包装服务" Grid.Column="1" Grid.ColumnSpan="4" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="4" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/> <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="4" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/>
<TextBlock Text="包耗材" Grid.Column="5" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="包耗材" Grid.Column="5" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="12" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/> <Border Width="1" HorizontalAlignment="Left" BorderBrush="#D7D7D7" Grid.Column="12" Grid.Row="0" Grid.RowSpan="4" BorderThickness="1,0,0,0"/>

96
BBWY.Client/Views/PackTask/FeesExcelV2Control.xaml.cs

@ -25,6 +25,25 @@ namespace BBWY.Client.Views.PackTask
{ {
InitializeComponent(); InitializeComponent();
} }
public bool IsShopTotal
{
get
{
return (bool)GetValue(IsShopTotalProperty);
}
set
{
SetValue(IsShopTotalProperty, value);
}
}
public static readonly DependencyProperty IsShopTotalProperty =
DependencyProperty.Register("IsShopTotal", typeof(bool), typeof(FeesExcelV2Control),new PropertyMetadata(false));
//["IsShopTotal"]
public FeesItemResponse FeesItem public FeesItemResponse FeesItem
{ {
get get
@ -54,12 +73,9 @@ namespace BBWY.Client.Views.PackTask
} }
string xaml = @" <Grid xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""> string xaml = @" <Grid xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"">
<Grid.ColumnDefinitions > <Grid.ColumnDefinitions >
<ColumnDefinition /> <ColumnDefinition [:IsShopTotal:] />
[:Columns:] [:Columns:]
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -69,15 +85,9 @@ namespace BBWY.Client.Views.PackTask
<RowDefinition Height=""30"" /> <RowDefinition Height=""30"" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Background=""#F2F2F2"" Grid.RowSpan=""3"" Grid.ColumnSpan=""[:ColumnCount:]""/> <Border Background=""#F2F2F2"" Grid.RowSpan=""3"" Grid.ColumnSpan=""[:ColumnCount:]""/>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""1,0,0,0""/> <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""1,0,0,0""/>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Column=""1"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""1,0,0,0""/> <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Column=""1"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""1,0,0,0""/>
<Border Width=""1"" HorizontalAlignment=""Right"" BorderBrush=""#D7D7D7"" Grid.Column=""[:1+ProcessCount:+ConsumableCount]"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""0,0,1,0""/>
<Border Width=""1"" HorizontalAlignment=""Right"" BorderBrush=""#D7D7D7"" Grid.Column=""[:1+ProcessCount:+ConsumableCount]"" Grid.Row=""0"" Grid.RowSpan=""4"" BorderThickness=""0,0,1,0""/>
<Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""0"" Grid.ColumnSpan=""[:ColumnCount:]"" BorderThickness=""0,1,0,0""/> <Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""0"" Grid.ColumnSpan=""[:ColumnCount:]"" BorderThickness=""0,1,0,0""/>
<Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""1"" Grid.Row=""1"" Grid.ColumnSpan=""[:ColumnCount-2:]"" BorderThickness=""0,1,0,0""/> <Border Height=""1"" VerticalAlignment=""Top"" BorderBrush=""#D7D7D7"" Grid.Column=""1"" Grid.Row=""1"" Grid.ColumnSpan=""[:ColumnCount-2:]"" BorderThickness=""0,1,0,0""/>
<Border Height=""1"" VerticalAlignment=""Bottom"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""2"" Grid.ColumnSpan=""[:ColumnCount:]"" BorderThickness=""0,1,0,0""/> <Border Height=""1"" VerticalAlignment=""Bottom"" BorderBrush=""#D7D7D7"" Grid.Column=""0"" Grid.Row=""2"" Grid.ColumnSpan=""[:ColumnCount:]"" BorderThickness=""0,1,0,0""/>
@ -90,51 +100,6 @@ namespace BBWY.Client.Views.PackTask
<TextBlock Text=""[:AllFees:]"" Grid.Row=""3"" Grid.Column=""[:1+ProcessCount:+ConsumableCount]"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text=""[:AllFees:]"" Grid.Row=""3"" Grid.Column=""[:1+ProcessCount:+ConsumableCount]"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
[:ListData:] [:ListData:]
</Grid>"; </Grid>";
string processComboStr1 = @"<Grid Grid.Column=""1"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
<Grid.RowDefinitions>
<RowDefinition />
<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=""[:ProcessTypeName:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<Border Height=""1"" VerticalAlignment=""Bottom"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.ColumnSpan=""2"" BorderThickness=""0,1,0,0""/>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.RowSpan=""3"" BorderThickness=""1,0,0,0""/>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.Column=""1"" Grid.RowSpan=""2"" BorderThickness=""1,0,0,0""/>
</Grid>
<Grid Grid.Column=""2"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.RowSpan=""2"" BorderThickness=""0,0,1,0""/>
<TextBlock Text="""" Grid.Row=""0"" Grid.Column=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<TextBlock Text=""[:ProcessComboName:]"" Grid.Row=""1"" Grid.Column=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
<Border Height=""1"" VerticalAlignment=""Bottom"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.ColumnSpan=""2"" BorderThickness=""0,1,0,0""/>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.RowSpan=""2"" BorderThickness=""1,0,0,0""/>
</Grid>
<TextBlock Text=""[:ProcessComboPrice:]"" Grid.Row=""3"" Grid.Column=""1"" Grid.ColumnSpan=""2"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>";
string processComboStr = @" <Grid Grid.Column=""1"" MinWidth=""168"" Grid.Row=""1"" Grid.RowSpan=""3"" Grid.ColumnSpan=""2"" > string processComboStr = @" <Grid Grid.Column=""1"" MinWidth=""168"" Grid.Row=""1"" Grid.RowSpan=""3"" Grid.ColumnSpan=""2"" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition /> <RowDefinition />
@ -162,10 +127,6 @@ namespace BBWY.Client.Views.PackTask
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.RowSpan=""3"" BorderThickness=""1,0,0,0""/> <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.RowSpan=""3"" BorderThickness=""1,0,0,0""/>
<Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.Column=""1"" Grid.RowSpan=""2"" BorderThickness=""1,0,0,0""/> <Border Width=""1"" HorizontalAlignment=""Left"" BorderBrush=""#D7D7D7"" Grid.Row=""0"" Grid.Column=""1"" Grid.RowSpan=""2"" BorderThickness=""1,0,0,0""/>
</Grid>"; </Grid>";
string discountFactorStr = @" <Grid Grid.Column=""3"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" > string discountFactorStr = @" <Grid Grid.Column=""3"" MinWidth=""84"" Grid.Row=""1"" Grid.RowSpan=""3"" >
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height=""2*""/> <RowDefinition Height=""2*""/>
@ -188,10 +149,6 @@ namespace BBWY.Client.Views.PackTask
<TextBlock Text=""[:PackFees:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/> <TextBlock Text=""[:PackFees:]"" Grid.Row=""1"" VerticalAlignment=""Center"" HorizontalAlignment=""Center""/>
</Grid>"; </Grid>";
string columnStr = "<ColumnDefinition Width=\"[:Width:]\"/>"; string columnStr = "<ColumnDefinition Width=\"[:Width:]\"/>";
string workProcess = "<TextBlock Text=\"包装服务\" Grid.Column=\"1\" Grid.ColumnSpan=\"[:ProcessCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+ProcessCount:]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n "; string workProcess = "<TextBlock Text=\"包装服务\" Grid.Column=\"1\" Grid.ColumnSpan=\"[:ProcessCount:]\" VerticalAlignment=\"Center\" HorizontalAlignment=\"Center\"/>\r\n <Border Width=\"1\" HorizontalAlignment=\"Left\" BorderBrush=\"#D7D7D7\" Grid.Column=\"[:1+ProcessCount:]\" Grid.Row=\"0\" Grid.RowSpan=\"4\" BorderThickness=\"1,0,0,0\"/>\r\n ";
@ -329,10 +286,17 @@ namespace BBWY.Client.Views.PackTask
//.Replace("[:DiscountFees:]", $"{discountFees.ToString(" 0.00")}"); //.Replace("[:DiscountFees:]", $"{discountFees.ToString(" 0.00")}");
//
newGrid = newGrid.Replace(@"[:Visity:]", ""); newGrid = newGrid.Replace(@"[:Visity:]", "");
if (IsShopTotal)//[:IsShopTotal:]
{
newGrid = newGrid.Replace(@"[:IsShopTotal:]", @"Width=""0""");
}
else
{
newGrid = newGrid.Replace(@"[:IsShopTotal:]", "");
}
var grid = XamlReader.Parse(newGrid) as Grid; var grid = XamlReader.Parse(newGrid) as Grid;

8
BBWY.Client/Views/PackTask/PackDetailWindow.xaml

@ -83,7 +83,7 @@
<Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}" <Border BorderThickness="0,0,0,1" BorderBrush="{StaticResource MainMenu.BorderBrush}"
Background="{StaticResource Border.Background}"> Background="{StaticResource Border.Background}">
<TextBlock Text="包任务配置" HorizontalAlignment="Center" VerticalAlignment="Center"/> <TextBlock Text="包任务配置" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border> </Border>
<Grid Grid.Row="1" > <Grid Grid.Row="1" >
@ -319,7 +319,7 @@
<TextBlock Margin="20 10 20 10"> <TextBlock Margin="20 10 20 10">
<Run Text="推荐包人:"/> <Run Text="推荐包人:"/>
<Run Text="{Binding SuggestPackUserName}" Foreground="Red"/> <Run Text="{Binding SuggestPackUserName}" Foreground="Red"/>
</TextBlock> </TextBlock>
@ -343,7 +343,7 @@
<Border HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="2"/> <Border HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="2"/>
<Border HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="3"/> <Border HorizontalAlignment="Left" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="3"/>
<Border HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="3"/> <Border HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Width="1" Grid.Column="3"/>
<TextBlock Grid.Column="0" Text="包人" Style="{StaticResource middleTextBlock}"/> <TextBlock Grid.Column="0" Text="包人" Style="{StaticResource middleTextBlock}"/>
<TextBlock Grid.Column="1" Text="任务量" Style="{StaticResource middleTextBlock}"/> <TextBlock Grid.Column="1" Text="任务量" Style="{StaticResource middleTextBlock}"/>
<TextBlock Grid.Column="2" Text="操作" Style="{StaticResource middleTextBlock}"/> <TextBlock Grid.Column="2" Text="操作" Style="{StaticResource middleTextBlock}"/>
@ -599,7 +599,7 @@
<Run Text="{Binding PackTaskModel.GoodsNumber}"/> <Run Text="{Binding PackTaskModel.GoodsNumber}"/>
</TextBlock> </TextBlock>
</Grid> </Grid>
<TextBlock> <TextBlock TextWrapping="Wrap" >
<Run Text="配件:"/> <Run Text="配件:"/>
<Run Text="{Binding PackTaskModel.SkuTitle }"/> <Run Text="{Binding PackTaskModel.SkuTitle }"/>
</TextBlock> </TextBlock>

211
BBWY.Client/Views/PackTask/PackTaskTotal.xaml

@ -13,14 +13,12 @@
d:DesignHeight="450" d:DesignWidth="2048" d:DesignHeight="450" d:DesignWidth="2048"
Title="OrderList"> Title="OrderList">
<Page.Resources> <Page.Resources>
<sys:Int32 x:Key="d0">0</sys:Int32> <sys:Int32 x:Key="d0">0</sys:Int32>
<sys:Int32 x:Key="d1">1</sys:Int32> <sys:Int32 x:Key="d1">1</sys:Int32>
<sys:Int32 x:Key="d3">2</sys:Int32> <sys:Int32 x:Key="d3">2</sys:Int32>
<sys:Int32 x:Key="d7">6</sys:Int32> <sys:Int32 x:Key="d7">6</sys:Int32>
<sys:Int32 x:Key="d15">14</sys:Int32> <sys:Int32 x:Key="d15">14</sys:Int32>
<sys:Int32 x:Key="d30">29</sys:Int32> <sys:Int32 x:Key="d30">29</sys:Int32>
</Page.Resources> </Page.Resources>
<Grid> <Grid>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/> <c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
@ -37,9 +35,10 @@
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999"> <Grid Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition Width="900"/>
<ColumnDefinition />
<ColumnDefinition Width="auto"/> <ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
@ -47,7 +46,7 @@
<RowDefinition Height="5"/> <RowDefinition Height="5"/>
<RowDefinition Height="0.5*"/> <RowDefinition Height="0.5*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0" Height="30"> <StackPanel Orientation="Horizontal" Margin="0,5,0,0" Height="30" >
<StackPanel.Resources> <StackPanel.Resources>
<Style TargetType="DatePickerTextBox"> <Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/> <Setter Property="IsReadOnly" Value="True"/>
@ -88,7 +87,7 @@
/> />
</StackPanel> </StackPanel>
<Grid Grid.Column="1" Grid.RowSpan="3"> <Grid Grid.Column="1" Grid.RowSpan="3" Margin="50 0 0 0" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition/> <ColumnDefinition/>
<ColumnDefinition/> <ColumnDefinition/>
@ -103,6 +102,28 @@
Background="#02a7f0" BorderThickness="0" Foreground="White"/> Background="#02a7f0" BorderThickness="0" Foreground="White"/>
</Grid> </Grid>
<Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0" Background="{StaticResource Button.Background}" Width="420"
Visibility="{Binding OrderCount,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0">
<TextBlock Text="包装服务费" Foreground="White"/>
<TextBlock Text="{Binding TotalPackDiscountFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
<TextBlock Text="包装耗材费" Foreground="White"/>
<TextBlock Text="{Binding TotalConsumableFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
<TextBlock Text="总任务量" Foreground="White"/>
<TextBlock Text="{Binding OrderCount}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
</Grid>
</Grid> </Grid>
<Grid Grid.Row="1" HorizontalAlignment="Left"> <Grid Grid.Row="1" HorizontalAlignment="Left">
@ -113,7 +134,7 @@
<Grid Grid.Row="2" Margin="0 5 0 0"> <Grid Grid.Row="2" Margin="0 5 0 0">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="30"/> <RowDefinition Height="30" />
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -121,51 +142,25 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="50"/>
<ColumnDefinition MinWidth="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition MinWidth="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/> <ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Background="{StaticResource Border.Background}" Grid.ColumnSpan="20"/>
<CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsBatchChecked,Mode=TwoWay}" Command="{Binding BatchCheckedCommand}" HorizontalContentAlignment="Center" Grid.Column="0"/> <CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsBatchChecked,Mode=TwoWay}" Command="{Binding BatchCheckedCommand}" HorizontalContentAlignment="Center" Grid.Column="0"/>
<TextBlock Text="任务ID" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="任务ID" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="日期" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="日期" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="状态" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="状态" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="所属部门" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="所属部门" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="所属店铺" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="所属店铺" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包数量" Grid.Column="6" 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="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="胶带" Grid.Column="9" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="其他" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="耗材总价" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="收货数量" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="基础价格" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增量配件价" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增量工序价" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包单价" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包原价" Grid.Column="17" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="收费方式" Grid.Column="18" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包折扣系数" Grid.Column="19" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包折扣价" Grid.Column="20" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="增值费用" Grid.Column="21" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="总费用" Grid.Column="22" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="23" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Left" 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}"/>
@ -211,26 +206,12 @@
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/> <ColumnDefinition Width="50"/>
<ColumnDefinition MinWidth="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition MinWidth="130"/> <ColumnDefinition Width="130"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="80"/> <ColumnDefinition Width="80"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="60"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Margin="0 0 1 0"> <Grid Margin="0 0 1 0">
<CheckBox Grid.Column="8" IsChecked="{Binding TaskChecked,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" /> <CheckBox Grid.Column="8" IsChecked="{Binding TaskChecked,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" />
@ -282,76 +263,54 @@
<TextBlock Text="{Binding SkuCount}" TextWrapping="Wrap" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding SkuCount}" TextWrapping="Wrap" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="7" Margin="0 0 1 0"> <Grid Grid.Column="7" Margin="0 0 1 1" >
<TextBlock Text="{Binding BoxConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}" TextTrimming="CharacterEllipsis">
</TextBlock>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="8" Margin="0 0 1 0">
<TextBlock Text="{Binding AirConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="9" Margin="0 0 1 0">
<TextBlock Text="{Binding TapeConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="10" Margin="0 0 1 0">
<TextBlock Text="{Binding OtherConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="11" Margin="0 0 1 0" >
<TextBlock Text="{Binding ConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="12" Margin="0 0 1 0" >
<TextBlock Text="{Binding ArrivalQuantity}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding ArrivalQuantity}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="13" Margin="0 0 1 0" > <Grid Grid.Column="8" Margin="-1" >
<TextBlock Text="{Binding BasicPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="14" Margin="0 0 1 0" >
<TextBlock Text="{Binding IncrementPartPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="15" Margin="0 0 1 0" >
<TextBlock Text="{Binding IncrementProcessPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="16" Margin="0 0 1 0" >
<TextBlock Text="{Binding PackSingleFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="17" Margin="0 0 1 0"> <local:FeesExcelV2Control
<TextBlock Text="{Binding PackFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> Visibility="{Binding ProcessComboName,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> IsShopTotal="True" FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" />
</Grid>
<Grid Grid.Column="18" Margin="0 0 1 0"> <Grid
<TextBlock Text="{Binding FeesMode}" Style="{StaticResource middleTextBlock}"/> Visibility="{Binding ProcessComboName,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> >
</Grid> <Grid.ColumnDefinitions>
<Grid Grid.Column="19" Margin="0 0 1 0"> <ColumnDefinition/>
<TextBlock Text="{Binding DiscountFactor,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <ColumnDefinition/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <ColumnDefinition/>
</Grid> </Grid.ColumnDefinitions>
<Grid Grid.Column="20" Margin="0 0 1 0"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<TextBlock Text="{Binding PackDisCountFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Style="{StaticResource middleTextBlock}" >
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <!--<Run Text="包装费用:" />
</Grid> <Run Text="{Binding PackFees}"/>
<Grid Grid.Column="21" Margin="0 0 1 0"> </TextBlock>
<TextBlock Text="{Binding IncreaseFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Style="{StaticResource middleTextBlock}" Margin="10 0 10 0">
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Run Text="折扣系数:" />
</Grid> <Run Text="{Binding DiscountFactor}"/>
<Grid Grid.Column="22" Margin="0 0 1 0"> </TextBlock>
<TextBlock Text="{Binding AllFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Style="{StaticResource middleTextBlock}">-->
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Run Text="包装费用:" />
</Grid> <Run Text="{Binding PackDisCountFees}"/>
</TextBlock>
</StackPanel>
<TextBlock Grid.Column="1" Style="{StaticResource middleTextBlock}">
<Run Text="包装耗材费用:" />
<Run Text="{Binding ConsumableFees}"/>
</TextBlock>
<TextBlock Grid.Column="2" Style="{StaticResource middleTextBlock}">
<Run Text="总费用:" />
<Run Text="{Binding AllFees}"/>
</TextBlock>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="23" Margin="0 0 1 0"> <Grid Grid.Column="23" Margin="0 0 1 0">
<c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent" Foreground="#02a7f0" Grid.Row="1" Content="结清" <c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent" Foreground="#02a7f0" Grid.Row="1" Content="结清"
Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
@ -359,10 +318,6 @@
Visibility="Visible" /> Visibility="Visible" />
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
</Grid> </Grid>
<Border Grid.Row="1" Grid.Column="18" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> <Border Grid.Row="1" Grid.Column="18" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
@ -370,12 +325,8 @@
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
</Grid> </Grid>
</Grid> </Grid>

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

@ -128,7 +128,7 @@
<TextBlock Text="任务信息" FontWeight="Bold" Margin="19 23 0 0" HorizontalAlignment="Left" VerticalAlignment="Top"/> <TextBlock Text="任务信息" FontWeight="Bold" Margin="19 23 0 0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<StackPanel Height="30" VerticalAlignment="Top" Margin="19 23 0 0" Orientation="Horizontal" HorizontalAlignment="Left" > <StackPanel Height="30" VerticalAlignment="Top" Margin="19 23 0 0" Orientation="Horizontal" HorizontalAlignment="Left" >
<TextBlock Text="数量:" VerticalAlignment="Center"/> <TextBlock Text="数量:" VerticalAlignment="Center"/>
<c:BTextBox WaterRemark="包数量" Height="25" Width="90" Text="{Binding SkuCount}" /> <c:BTextBox WaterRemark="包数量" Height="25" Width="90" Text="{Binding SkuCount}" />
<!--<TextBlock Margin="30 0 0 0" Text="到货情况:" VerticalAlignment="Center"/> <!--<TextBlock Margin="30 0 0 0" Text="到货情况:" VerticalAlignment="Center"/>
<Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}"> <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}">
<ComboBox BorderThickness="0" VerticalContentAlignment="Center" ItemsSource="{Binding AvailabilityList}" Text="{Binding Availability}" > <ComboBox BorderThickness="0" VerticalContentAlignment="Center" ItemsSource="{Binding AvailabilityList}" Text="{Binding Availability}" >
@ -156,7 +156,7 @@
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" Text="包配置" FontWeight="Bold" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20 0 0 0"/> <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 Height="70" Grid.Row="1" Margin="20 0 20 0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="77"/> <ColumnDefinition Width="77"/>

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

@ -210,7 +210,7 @@
</StackPanel> </StackPanel>
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0"> <!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/> <Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包:Red:black}" Text="{Binding TaskState}"/> <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>--> </TextBlock>-->
</StackPanel> </StackPanel>
@ -269,7 +269,7 @@
> >
</c:BButton> </c:BButton>
--><!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" --><!-- --><!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" --><!--
</StackPanel> </StackPanel>

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

@ -46,16 +46,16 @@
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="6" 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="8" 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="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包员" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>--> <TextBlock Text="包员" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>-->
<!--<TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>--> <!--<TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>-->
@ -275,7 +275,7 @@
<Grid Grid.Column="4"> <Grid Grid.Column="4">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="基础包:"/> <TextBlock Text="基础包:"/>
<TextBlock Text="{Binding BasicPack}"/> <TextBlock Text="{Binding BasicPack}"/>
</StackPanel> </StackPanel>
<Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" > <Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" >
@ -349,7 +349,7 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
<Grid Grid.Column="8" > <Grid Grid.Column="8" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
> >

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

@ -96,8 +96,8 @@
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}" <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}"
/> />
<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 WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:True:False}"
/> />
<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 WaitSealBoxCount,Mode=TwoWay}"
@ -187,7 +187,7 @@
<Grid Grid.Row="3" Margin="0,5,0,0"> <Grid Grid.Row="3" Margin="0,5,0,0">
<local:TaskListControl x:Name="listbox_task" <local:TaskListControl x:Name="listbox_task"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包|待出库|待排单:Collapsed:Visible}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包|待出库|待排单:Collapsed:Visible}"
/> />
@ -198,7 +198,7 @@
<waitquality:ShopWaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" /> <waitquality:ShopWaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" />
<local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}" /> <local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}" />
<local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" /> <local:ShopWaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" />
<local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" /> <local:ShopWaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" />
</Grid> </Grid>

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

@ -47,7 +47,7 @@
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="合格证.条形码" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="物流信息" Grid.Column="6" 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}"/>-->
@ -248,7 +248,7 @@
<Grid Grid.Column="4" > <Grid Grid.Column="4" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="基础包:"/> <TextBlock Text="基础包:"/>
<TextBlock Text="{Binding BasicPack}"/> <TextBlock Text="{Binding BasicPack}"/>
</StackPanel> </StackPanel>
<Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" > <Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" >

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

@ -42,7 +42,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/> <c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
<Grid Background="{StaticResource Border.Background}"> <Grid Background="{StaticResource Border.Background}">
<TextBlock Text="配置包信息" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="配置包信息" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Grid> </Grid>
<Grid Grid.Row="1" VerticalAlignment="Center"> <Grid Grid.Row="1" VerticalAlignment="Center">
@ -251,7 +251,7 @@
<RowDefinition MinHeight="70"/> <RowDefinition MinHeight="70"/>
<RowDefinition Height="40"/> <RowDefinition Height="40"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Text="包配置" FontWeight="Bold" FontSize="13" Margin="19 0 0 0 " HorizontalAlignment="Left" VerticalAlignment="Center"/> <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 Height="70" Grid.Row="1" Margin="20 0 20 0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="77"/> <ColumnDefinition Width="77"/>
@ -367,7 +367,7 @@
Visibility="{Binding TaskId,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}" Visibility="{Binding TaskId,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
Background="{StaticResource Button.Background}" BorderThickness="0" Foreground="White"/> Background="{StaticResource Button.Background}" BorderThickness="0" Foreground="White"/>
</Grid> </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"/>--> <!--<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>

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

@ -265,7 +265,7 @@
</StackPanel> </StackPanel>
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0"> <!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/> <Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包:Red:black}" Text="{Binding TaskState}"/> <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>--> </TextBlock>-->
</StackPanel> </StackPanel>
@ -324,7 +324,7 @@
> >
</c:BButton> </c:BButton>
<!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" --> <!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" -->
</StackPanel> </StackPanel>

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

@ -31,7 +31,7 @@
Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=部门:Visible:Collapsed}" Visibility="{Binding SelectShop,Mode=OneWay,Converter={StaticResource objConverter},ConverterParameter=部门:Visible:Collapsed}"
> >
<c:BTextBox x:Name="tb" Width="150" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="部门名称" <c:BTextBox x:Name="tb" Width="150" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" WaterRemark="部门名称"
/> />
<ListBox MaxHeight="300" x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}"/> <ListBox MaxHeight="300" x:Name="tipBox" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}"/>
@ -170,7 +170,7 @@
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证、条形码" Grid.Column="6" 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}"/>
@ -384,7 +384,7 @@
<Grid Grid.Column="4" > <Grid Grid.Column="4" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="基础包:"/> <TextBlock Text="基础包:"/>
<TextBlock Text="{Binding BasicPack}"/> <TextBlock Text="{Binding BasicPack}"/>
</StackPanel> </StackPanel>
<Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" > <Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" >
@ -513,7 +513,7 @@
<Grid Grid.Column="9"> <Grid Grid.Column="9">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" Visibility="{Binding PackRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
> >
@ -597,7 +597,7 @@
<Grid Grid.Column="10" > <Grid Grid.Column="10" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
<c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1" <c:BButton HorizontalAlignment="Center" Height="20" Style="{StaticResource LinkButton}" VerticalAlignment="Center" Grid.Row="1"
Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:包设置:修改设置 }" Content="{Binding FeesItemResponse,Converter={StaticResource objConverter},ConverterParameter=#null:包设置:修改设置 }"
Command="{Binding SetServiceCommand}" Command="{Binding SetServiceCommand}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已取消|未到货|部分到货|待验收|:Collapsed:Visible}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已取消|未到货|部分到货|待验收|:Collapsed:Visible}"
/> />
@ -606,7 +606,7 @@
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}"
/> />
<StackPanel <StackPanel
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}"
> >
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成" <c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
CommandParameter="{Binding}" CommandParameter="{Binding}"
@ -632,7 +632,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待包:Visible:Collapsed}"
/> />
<hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0" HorizontalAlignment="Stretch"> <hc:SplitButton Content="更多操作" Foreground="{StaticResource Button.Background}" BorderThickness="0" HorizontalAlignment="Stretch">
<hc:SplitButton.Resources> <hc:SplitButton.Resources>

8
BBWY.Client/Views/PackTask/WareHouseList.xaml

@ -102,8 +102,8 @@
<RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}" <RadioButton Height="35" Width="126" VerticalAlignment="Center" Command="{Binding SetTaskStateCommand}" CommandParameter="{x:Static cmodel:TaskState.待排单}" Content="待排单" Tag="{Binding WaitScheduleCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:True:False}"
/> />
<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 WaitPackCount,Mode=TwoWay}"
IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:True:False}" IsChecked="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:True:False}"
/> />
<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 WaitSealBoxCount,Mode=TwoWay}"
@ -146,11 +146,11 @@
<Grid Grid.Row="1" Margin="0,5,0,0"> <Grid Grid.Row="1" Margin="0,5,0,0">
<fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}" /> <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待落仓:Visible:Collapsed}" />
<local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包|待转运|已超时|待出库|待排单:Collapsed:Visible}" /> <local:WareHouseListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱|待落仓|待验收|待包|待转运|已超时|待出库|待排单:Collapsed:Visible}" />
<fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}" /> <fallware:WareFallWareListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待封箱:Visible:Collapsed}" />
<waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" /> <waitquality:WaitQualityControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收:Visible:Collapsed}" />
<local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}" /> <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单:Visible:Collapsed}" />
<local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" /> <local:WaitPackageControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" />
<waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}" /> <waittransport:WareWaitTransportListControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待转运:Visible:Collapsed}" />
<taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}" /> <taskovertime:WareTaskOverTimeControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=已超时:Visible:Collapsed}" />
<local:WaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" /> <local:WaitCompletedControl Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待出库:Visible:Collapsed}" />

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

@ -174,11 +174,11 @@
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="物流信息" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<!--<TextBlock Text="注意事项/对接备注" Grid.Column="6" 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="8" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="操作" Grid.Column="9" Style="{StaticResource middleTextBlock}"/>
@ -398,7 +398,7 @@
<Grid Grid.Column="4" > <Grid Grid.Column="4" >
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="基础包:"/> <TextBlock Text="基础包:"/>
<TextBlock Text="{Binding BasicPack}"/> <TextBlock Text="{Binding BasicPack}"/>
</StackPanel> </StackPanel>
<Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" > <Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" >
@ -530,7 +530,7 @@
/> />
<StackPanel <StackPanel
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}"
> >
<c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成" <c:BButton Grid.Column="11" HorizontalAlignment="Stretch" Style="{StaticResource LinkButton}" Margin="0 5 0 5 " VerticalAlignment="Center" Content="完成"
CommandParameter="{Binding}" CommandParameter="{Binding}"
@ -543,7 +543,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待包:Visible:Collapsed}"
/> />

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

@ -37,7 +37,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/> <c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
<Grid Background="{StaticResource Border.Background}"> <Grid Background="{StaticResource Border.Background}">
<TextBlock Text="包配置" VerticalAlignment="Center" HorizontalAlignment="Center" /> <TextBlock Text="包配置" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Grid> </Grid>
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
@ -160,7 +160,7 @@
</StackPanel> </StackPanel>
</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" > <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" <TextBox Text="{Binding ShowMarkMessage}" HorizontalAlignment="Stretch" VerticalAlignment="Top" ScrollViewer.VerticalScrollBarVisibility="Visible"
@ -380,7 +380,7 @@
</ListBox> </ListBox>
</Grid> </Grid>
<TextBlock Text="包配置" FontWeight="Bold" FontSize="13" Margin="20 23 0 0" HorizontalAlignment="Left" VerticalAlignment="Top"/> <TextBlock Text="包配置" FontWeight="Bold" FontSize="13" Margin="20 23 0 0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
<Grid Height="70" Margin="20 20 20 0"> <Grid Height="70" Margin="20 20 20 0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="77"/> <ColumnDefinition Width="77"/>

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

@ -45,7 +45,7 @@
<TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="数量" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="组合类型" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="SKU配件商品" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="包需求" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="落仓" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="合格证.条形码" Grid.Column="6" 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}"/>
@ -53,7 +53,7 @@
<!--<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="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包员" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>--> <TextBlock Text="包员" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="操作" Grid.Column="8" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="操作" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
@ -276,7 +276,7 @@
<Grid Grid.Column="4"> <Grid Grid.Column="4">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Left"> <StackPanel VerticalAlignment="Center" HorizontalAlignment="Left">
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" > <StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Left" >
<TextBlock Text="基础包:"/> <TextBlock Text="基础包:"/>
<TextBlock Text="{Binding BasicPack}"/> <TextBlock Text="{Binding BasicPack}"/>
</StackPanel> </StackPanel>
<Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" > <Grid Margin="10,5" VerticalAlignment="Center" HorizontalAlignment="Left" >

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

@ -177,7 +177,7 @@
<!--<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="9" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="服务 耗材费用" Grid.Column="10" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="包员" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>--> <TextBlock Text="包员" Grid.Column="11" Style="{StaticResource middleTextBlock}"/>-->
<TextBlock Text="操作" Grid.Column="8" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="操作" Grid.Column="8" Style="{StaticResource middleTextBlock}"/>
@ -598,7 +598,7 @@
<c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取" <c:BButton HorizontalAlignment="Center" Style="{StaticResource LinkButton}" Height="20" Margin="0 5 0 5 " VerticalAlignment="Center" Grid.Row="1" Content="商家自取"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"
Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}" Command="{Binding DataContext.StoreGetBySelfCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待包:Visible:Collapsed}" Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待排单|待包:Visible:Collapsed}"
/> />

339
BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml

@ -0,0 +1,339 @@
<Page x:Class="BBWY.Client.Views.TotalPackTask.ShopPackTaskTotal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
mc:Ignorable="d"
xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
DataContext="{Binding ShopPackTaskTotal,Source={StaticResource Locator}}"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
Background="White"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
d:DesignHeight="450" d:DesignWidth="2048"
Title="OrderList">
<Page.Resources>
<sys:Int32 x:Key="d0">0</sys:Int32>
<sys:Int32 x:Key="d1">1</sys:Int32>
<sys:Int32 x:Key="d3">2</sys:Int32>
<sys:Int32 x:Key="d7">6</sys:Int32>
<sys:Int32 x:Key="d15">14</sys:Int32>
<sys:Int32 x:Key="d30">29</sys:Int32>
</Page.Resources>
<Grid>
<!--<c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
<StackPanel Background="Black" Panel.ZIndex="100" HorizontalAlignment="Left" VerticalAlignment="Top" Orientation="Vertical" Margin="572,13,0,0" Width="140">
<c:BTextBox x:Name="tbDepartment" Width="140" Height="30" TextChanged="tb_TextChanged" Text="{Binding SearchDepartment,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></c:BTextBox>
<ListBox MaxHeight="300" x:Name="tipBoxDepartment" SelectionChanged="SelectionChangeCommand" Background="{StaticResource Border.Background}">
</ListBox>
</StackPanel>-->
<Grid Margin="5,0">
<Grid.RowDefinitions>
<RowDefinition Height="90"/>
<RowDefinition/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<Grid Background="{StaticResource Border.Background}" HorizontalAlignment="Left" Height="75" Panel.ZIndex="999">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="750"/>
<ColumnDefinition />
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="0.5*"/>
<RowDefinition Height="5"/>
<RowDefinition Height="0.5*"/>
</Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0" Height="30" >
<StackPanel.Resources>
<Style TargetType="DatePickerTextBox">
<Setter Property="IsReadOnly" Value="True"/>
</Style>
</StackPanel.Resources>
<TextBlock Text="下单时间" VerticalAlignment="Center" Margin="5,0,0,0"/>
<DatePicker SelectedDate="{Binding StartDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
<DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
<TextBlock Text="任务ID:" Width="40" VerticalAlignment="Center" Margin="5,0,0,0"/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchTaskId}" />
<TextBlock Width="40" Text=" SKU:" VerticalAlignment="Center" Margin="5,0,0,0"
/>
<c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSkuId}"
/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,0,0,5" Height="30">
<c:BButton Content="今天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d0}"/>
<c:BButton Content="昨天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d1}"/>
<c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d3}"/>
<c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d7}"/>
<c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d15}"/>
<c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d30}"/>
</StackPanel>
<Grid Grid.Column="1" Grid.RowSpan="3" Margin="50 0 0 0" >
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Button Content="搜索" Width="50" VerticalAlignment="Stretch" Margin="5,0,0,0" Command="{Binding SearchTaskTotalCommand}"
Grid.RowSpan="2" Background="#8080ff" BorderThickness="0" Foreground="White"/>
<Button Grid.RowSpan="2" Content="导出" Command="{Binding ExportCommand}" Width="50" Grid.Column="1"
Background="#02a7f0" BorderThickness="0" Foreground="White"/>
</Grid>
<Grid Grid.Column="2" Grid.RowSpan="3" Margin="50 0 0 0" Background="{StaticResource Button.Background}" Width="420"
Visibility="{Binding OrderCount,Converter={StaticResource objConverter},ConverterParameter=0:Collapsed:Visible}"
>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0">
<TextBlock Text="包装服务费" Foreground="White"/>
<TextBlock Text="{Binding TotalPackDiscountFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="1">
<TextBlock Text="包装耗材费" Foreground="White"/>
<TextBlock Text="{Binding TotalConsumableFees,StringFormat='0.00'}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
<StackPanel VerticalAlignment="Center" Orientation="Vertical" Margin="10 0 0 0" Grid.Column="2">
<TextBlock Text="总任务量" Foreground="White"/>
<TextBlock Text="{Binding OrderCount}" Foreground="White" FontSize="20" FontWeight="Bold"/>
</StackPanel>
</Grid>
</Grid>
<Grid Grid.Row="1" Margin="0 5 0 0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="30" />
<RowDefinition/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="0"/>
</Grid.ColumnDefinitions>
<Grid Background="{StaticResource Border.Background}" Grid.ColumnSpan="20"/>
<CheckBox HorizontalAlignment="Center" IsChecked="{Binding IsBatchChecked,Mode=TwoWay}" Command="{Binding BatchCheckedCommand}" HorizontalContentAlignment="Center" Grid.Column="0"/>
<TextBlock Text="任务ID" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="日期" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="状态" 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}"/>
<Border Width="1" HorizontalAlignment="Left" Grid.Column="1" 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"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="2"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="3"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="8"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="9"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="10"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="11"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="12"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="13"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="14"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="16"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="17"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="18"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="19"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="20"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="21"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="22"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="23"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="24" Background="{StaticResource Border.Brush}" Grid.Row="0"/>
<ListBox x:Name="listbox_order"
Grid.Row="1" Grid.ColumnSpan="24"
ItemsSource="{Binding PackTaskTotalList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}"
BorderThickness="1,1,1,0"
Foreground="{StaticResource Text.Color}">
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
MinHeight="40">
<Grid >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="60"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="50"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="0"/>
</Grid.ColumnDefinitions>
<Grid Margin="0 0 1 0">
<CheckBox Grid.Column="8" IsChecked="{Binding TaskChecked,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" HorizontalContentAlignment="Center" />
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="1" Margin="0 0 1 0" >
<c:BButton Content="{Binding TaskId}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding TaskId}"
Margin=" 5,0,0,0"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="2" Margin="0 0 1 0">
<TextBlock Text="{Binding CreateTime,StringFormat=MM-dd}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="3" Margin="0 0 1 0">
<TextBlock TextWrapping="Wrap" Text="{Binding IsSettle}" Foreground="{Binding IsSettle,Converter={StaticResource objConverter},ConverterParameter=未结算:#ec808d:#00aaaa}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="4" Margin="0 0 1 0">
<c:BButton Content="{Binding DepartmentName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding DepartmentName}"
Margin=" 5,0,0,0">
<c:BButton.ToolTip>
<ToolTip>
<TextBlock Text="{Binding DepartmentName}"></TextBlock>
</ToolTip>
</c:BButton.ToolTip>
</c:BButton>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="5" Margin="0 0 1 0">
<c:BButton Content="{Binding ShopName}" Style="{StaticResource LinkButton}" HorizontalAlignment="Center" VerticalAlignment="Center"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Page}}}"
CommandParameter="{Binding ShopName}"
Margin=" 5,0,0,0">
<c:BButton.ToolTip>
<ToolTip>
<TextBlock Text="{Binding ShopName}"></TextBlock>
</ToolTip>
</c:BButton.ToolTip>
</c:BButton>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="6" Margin="0 0 1 0">
<TextBlock Text="{Binding SkuCount}" TextWrapping="Wrap" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="7" Margin="0 0 1 1" >
<TextBlock Text="{Binding ArrivalQuantity}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="8" Margin="-1" >
<local:FeesExcelV2Control
Visibility="{Binding ProcessComboName,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
IsShopTotal="True" FeesItem="{Binding FeesItemResponse,Mode=TwoWay,NotifyOnSourceUpdated=True,UpdateSourceTrigger=PropertyChanged}" />
<Grid
Visibility="{Binding ProcessComboName,Converter={StaticResource objConverter},ConverterParameter=#null:Visible:Collapsed}"
>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<TextBlock Style="{StaticResource middleTextBlock}" >
<!--<Run Text="包装费用:" />
<Run Text="{Binding PackFees}"/>
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}" Margin="10 0 10 0">
<Run Text="折扣系数:" />
<Run Text="{Binding DiscountFactor}"/>
</TextBlock>
<TextBlock Style="{StaticResource middleTextBlock}">-->
<Run Text="包装费用:" />
<Run Text="{Binding PackDisCountFees}"/>
</TextBlock>
</StackPanel>
<TextBlock Grid.Column="1" Style="{StaticResource middleTextBlock}">
<Run Text="包装耗材费用:" />
<Run Text="{Binding ConsumableFees}"/>
</TextBlock>
<TextBlock Grid.Column="2" Style="{StaticResource middleTextBlock}">
<Run Text="总费用:" />
<Run Text="{Binding AllFees}"/>
</TextBlock>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
<Border Width="1" Grid.Column="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="23" Margin="0 0 1 0">
<c:BButton HorizontalAlignment="Center" Height="20" VerticalAlignment="Center" Background="Transparent" Foreground="#02a7f0" Grid.Row="1" Content="结清"
Command="{Binding DataContext.SettleCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding TaskId}"
Visibility="Visible" />
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
</Grid>
<Border Grid.Row="1" Grid.Column="18" VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
</Grid>
</Grid>
<c:PageControl PageIndex="{Binding PageIndex}"
PageSize="{Binding PageSize}"
RecordCount="{Binding OrderCount}"
Grid.Row="3"
HorizontalAlignment="Left">
<b:Interaction.Triggers>
<b:EventTrigger EventName="OnPageIndexChanged">
<b:InvokeCommandAction Command="{Binding OrderPageIndexChangedCommand}" PassEventArgsToCommand="True"/>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:PageControl>
</Grid>
</Grid>
</Page>

26
BBWY.Client/Views/TotalPackTask/ShopPackTaskTotal.xaml.cs

@ -0,0 +1,26 @@
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.Navigation;
using System.Windows.Shapes;
namespace BBWY.Client.Views.TotalPackTask
{
/// <summary>
/// ShopPackTaskTotal.xaml 的交互逻辑
/// </summary>
public partial class ShopPackTaskTotal : Page
{
public ShopPackTaskTotal()
{
InitializeComponent();
}
}
}

4
BBWY.Client/Views/WaitTransport/WareWaitTransportControl.xaml

@ -210,7 +210,7 @@
</StackPanel> </StackPanel>
<!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0"> <!--<TextBlock Foreground="{StaticResource Text.Gray}" TextWrapping="Wrap" Margin="0,10,0 0">
<Run Text="任务状态:"/> <Run Text="任务状态:"/>
<Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包:Red:black}" Text="{Binding TaskState}"/> <Run Foreground="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待验收|待包:Red:black}" Text="{Binding TaskState}"/>
</TextBlock>--> </TextBlock>-->
</StackPanel> </StackPanel>
@ -305,7 +305,7 @@
> >
</c:BButton> </c:BButton>
<!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" --> <!-- Visibility="{Binding TaskState,Converter={StaticResource objConverter},ConverterParameter=待包:Visible:Collapsed}" -->
</StackPanel> </StackPanel>

Loading…
Cancel
Save