pengcong001
/
bbwy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

AddValidOverTime
506583276@qq.com 1 year ago
parent
739d83a6a2
commit
d3af990dc6
15 changed files with 354 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      BBWY.Client/APIServices/QiKu/PackTaskOverTimeDetailService.cs
  2. 37
      BBWY.Client/APIServices/QiKu/PackTaskService.cs
  3. 4
      BBWY.Client/BBWYAppSettings.json
  4. 21
      BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs
  5. 18
      BBWY.Client/Models/Enums.cs
  6. 9
      BBWY.Client/Models/PackTask/ShopTotal.cs
  7. 2
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  8. 71
      BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
  9. 76
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
  10. 14
      BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs
  11. 73
      BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
  12. 4
      BBWY.Client/Views/PackagingTask/ShopWaitPackingTaskControl.xaml
  13. 10
      BBWY.Client/Views/PackagingTask/WaitPackingTaskControl.xaml
  14. 28
      BBWY.Client/Views/TaskOverTime/SubmitOverTimeMarkMsgWindow.xaml.cs

86
BBWY.Client/APIServices/QiKu/PackTaskOverTimeDetailService.cs
View File

@ -0,0 +1,86 @@
using BBWY.Client.Models;
using BBWY.Client.Models.APIModel;
using BBWY.Common.Http;
using BBWY.Common.Models;
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Text;
namespace BBWY.Client.APIServices.QiKu
{
public class PackTaskOverTimeDetailService : BaseApiService, IDenpendency
{
public PackTaskOverTimeDetailService(RestApiService restApiService, GlobalContext globalContext) : base(restApiService, globalContext)
{
}
public ApiResponse<SearchTaskListResponse> SearchTaskList(string skuId = null, string taskId = null
, string spuId = null, string orderSn = null,
TaskState? TaskState = null,
int pageIndex = 1,
int pageSize = 10
)
{
return SendRequest<SearchTaskListResponse>(globalContext.QKApiHost, "api/PackTask/SearchTaskList", new
{
orderSn,
spuId,
skuId,
taskId,
TaskState,
pageIndex,
pageSize,
ShopId = globalContext.User.Shop.ShopId.ToString(),
}, null, HttpMethod.Post);
}
/// <summary>
/// 查询超时任务列表
/// </summary>
/// <param name="taskId"></param>
/// <returns></returns>
public ApiResponse<SearchOverTimeTaskResponse> SearchOverTimeTaskList(string ShopId, DateTime? StartTime, DateTime? EndTime, OverTimeTaskState? overTimeTaskState, OverTimeTaskType? OverTimeType, int? PageIndex, int? PageSize = 20)
{
return SendRequest<SearchOverTimeTaskResponse>(globalContext.QKApiHost, $"api/PackTaskOverTimeDetail/SearchOverTimeTaskList", new
{
ShopId,
StartTime,
EndTime,
OverTimeType= OverTimeType==0?null: OverTimeType,
PageIndex,
PageSize,
OverTimeTaskState= (overTimeTaskState == OverTimeTaskState.全部) ? null : overTimeTaskState,
}, null, HttpMethod.Post);
}
// <summary>
/// 任务超时提交备注(解释超时原因)
/// </summary>
/// <param name="submitOverTimeMarkMsgRequest"></param>
/// <returns></returns>
public ApiResponse<object> SubmitOverTimeMarkMsg(TaskMessageType TaskType, long OverTimeTaskId, OverTimeType OverTimeType, string OverTimeRemarkMsg)
{
return SendRequest<object>(globalContext.QKApiHost, "api/PackTaskOverTimeDetail/SubmitOverTimeMarkMsg", new
{
TaskType,
OverTimeTaskId,
OverTimeType,
OverTimeRemarkMsg,
UserName=globalContext.User.Name,
}, null, HttpMethod.Post);
}
}
}

37
BBWY.Client/APIServices/QiKu/PackTaskService.cs
View File

@ -332,34 +332,17 @@ namespace BBWY.Client.APIServices
return SendRequest<object>("http://bbwyb.qiyue666.com", $"api/purchaseorder/batchmanualsign", new { wayBillNoList }, null, HttpMethod.Post);
}
/// <summary>
/// 查询超时任务列表
/// </summary>
/// <param name="taskId"></param>
/// <returns></returns>
public ApiResponse<SearchOverTimeTaskResponse> SearchOverTimeTaskList(string ShopId, DateTime? StartTime, DateTime? EndTime, OverTimeTaskState overTimeTaskState, OverTimeTaskType? OverTimeTaskType, int? PageIndex, int? PageSize = 20)
{
return SendRequest<SearchOverTimeTaskResponse>(globalContext.QKApiHost, $"api/PackTask/SearchOverTimeTaskList", new
{
ShopId,
StartTime,
EndTime,
OverTimeTaskType,
PageIndex,
PageSize,
overTimeTaskState
}, null, HttpMethod.Post);
}
public ApiResponse<object> SubmitOverTimeMarkMsg(OverTimeTaskType OverTimeTaskType, long Id, string MarkMsg)
{
return SendRequest<object>(globalContext.QKApiHost, $"api/PackTask/SubmitOverTimeMarkMsg", new
{
OverTimeTaskType,
Id,
MarkMsg,
}, null, HttpMethod.Post);
}
//public ApiResponse<object> SubmitOverTimeMarkMsg(OverTimeTaskType OverTimeTaskType, long Id, string MarkMsg)
//{
// return SendRequest<object>(globalContext.QKApiHost, $"api/PackTask/SubmitOverTimeMarkMsg", new
// {
// OverTimeTaskType,
// Id,
// MarkMsg,
// }, null, HttpMethod.Post);
//}
public ApiResponse<object> SendToSetSkuConfigure(long taskId)
{

4
BBWY.Client/BBWYAppSettings.json
View File

@ -4,6 +4,6 @@
"MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "",
"1688ApiHost": "",
//"QKApiHost": "http://localhost:8080"
"QKApiHost": "http://qiku.qiyue666.com"
"QKApiHost": "http://localhost:8080"
// "QKApiHost": "http://qiku.qiyue666.com"
}

21
BBWY.Client/Models/APIModel/Response/PackTask/SearchWaitFallWareResponse.cs
View File

@ -78,6 +78,11 @@ namespace BBWY.Client.Models.APIModel
/// 提交采购单过期时间
/// </summary>
public DateTime? SetPurchaseOrderOverTime { get; set; }
public DateTime? SetWaybillNoOverTime { get; set; }
/// <summary>
/// 贴单超时时间备注
/// </summary>
public string SetWaybillNoOverTimeMsg { get; set; }
}
public class WaitFallWareModel:NotifyObject
@ -154,6 +159,22 @@ namespace BBWY.Client.Models.APIModel
public bool IsFallWareOverTime { get => isFallWareOverTime; set { Set(ref isFallWareOverTime, value); } }
/// <summary>
/// 贴单过期时间
/// </summary>
public DateTime? SetWaybillNoOverTime { get; set; }
/// <summary>
/// 贴单超时时间备注
/// </summary>
public string SetWaybillNoOverTimeMsg { get; set; }
private string setWaybillNoRemainTime;
public string SetWaybillNoRemainTime { get => setWaybillNoRemainTime; set { Set(ref setWaybillNoRemainTime, value); } }
private bool isSetWaybillNoOverTime;
public bool IsSetWaybillNoOverTime { get => isSetWaybillNoOverTime; set { Set(ref isSetWaybillNoOverTime, value); } }
}
public class BoxConfigureData
{

18
BBWY.Client/Models/Enums.cs
View File

@ -519,9 +519,25 @@
待验收 = 2,//已到货
待打包 = 3,
待封箱 = 4,
待落仓 = 8,
待同步采购单 = 8,
待转运 = 11,
待排单=13,
待贴单 = 15,
}
/// <summary>
/// 超时任务类型 (待验收 = 2, 待包装 = 3,待封箱 = 4,待设置采购单 = 8,待转运 = 11,待排单 = 13,待贴单 = 15)
/// </summary>
public enum OverTimeType
{
全部 = 0,
待验收 = 2,
待包装 = 3,
待封箱 = 4,
待设置采购单 = 8,
待转运 = 11,
待排单 = 13,
待贴单 = 15,
}
/// <summary>

9
BBWY.Client/Models/PackTask/ShopTotal.cs
View File

@ -2,11 +2,12 @@
using BBWY.Client.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BBWY.Client.Models.PackTask
{
public class ShopTotal :NotifyObject
public class ShopTotal : NotifyObject
{
private FeesItemResponse feesItemResponse;
@ -106,8 +107,12 @@ namespace BBWY.Client.Models.PackTask
// string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,打包原价,打包折扣系数,打包折扣价,总收费";
public override string ToString()
{
string ConsumableStr = string.Empty;
if (ConsumableList != null && ConsumableList.Count > 0)
ConsumableStr = string.Join(",", ConsumableList.Select(x => $"{x.ItemName} {x.ItemPrice}*{x.ItemCount}"));
return $"{TaskId},{CreateTime?.ToString("MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +
$",{SkuCount},{ArrivalQuantity},{ConsumableFees},{ProcessTypeName},{ProcessComboName},{ProcessComboPrice},{PackFees},{DiscountFactor},{PackDisCountFees},{AllFees}";
$",{SkuCount},{ArrivalQuantity},\"{ConsumableStr}\" ,{ConsumableFees},{ProcessTypeName},{ProcessComboName},{ProcessComboPrice},{PackFees},{DiscountFactor},{PackDisCountFees},{AllFees}";
}
}

2
BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
View File

@ -148,7 +148,7 @@ namespace BBWY.Client.ViewModels.PackTask
if (res.Success)
{
//string title = "任务ID,日期,是否结清,部门,店铺,对接人,sku名称,sku数量,增值服务,打包服务,耗材服务,原价,促销折扣,结算价格,对接备注";
string title = "任务ID,日期,是否结清,所属部门,所属店铺,包装数量,收货数量,耗材总价,工序类型,工序套餐,工序单价,包装原价,包装折扣系数,包装折扣价,总收费";
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);

71
BBWY.Client/ViewModels/PackTask/TaskListViewModel.cs
View File

@ -406,7 +406,7 @@ namespace BBWY.Client.ViewModels.PackTask
public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, ProductService productService, MarkMessageService markMessageService, PackagingTaskService packagingTaskService, QualityTaskService qualityTaskService)
public TaskListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, ProductService productService, MarkMessageService markMessageService, PackagingTaskService packagingTaskService, QualityTaskService qualityTaskService, PackTaskOverTimeDetailService packTaskOverTimeDetailService)
{
this.globalContext = globalContext;
this.markMessageService = markMessageService;
@ -494,6 +494,7 @@ namespace BBWY.Client.ViewModels.PackTask
else
PageIndex = 1;
});
this.packTaskOverTimeDetailService = packTaskOverTimeDetailService;
}
MarkMessageService markMessageService;
@ -684,12 +685,13 @@ namespace BBWY.Client.ViewModels.PackTask
addProductWindow.ShowDialog();
}
PackTaskOverTimeDetailService packTaskOverTimeDetailService;
private void SubmitOverTimeMarkMsg(object param)
{
var paramList = (object[])param;
var id = (long)paramList[0];
var markMsg = paramList[1].ToString();
SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(OverTimeTaskType.待落仓, id, markMsg, packTaskService, ReflashTask);
var markMsg = paramList[1]?.ToString();
SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(packTaskOverTimeDetailService , id, markMsg, TaskMessageType.封箱ID, OverTimeType.待设置采购单, ReflashTask);
submitOverTimeMarkMsgWindow.ShowDialog();
}
@ -1259,18 +1261,20 @@ namespace BBWY.Client.ViewModels.PackTask
data.SkuTitle = item.SkuGoodsTitle;
data.AcceptName = item.UserName;
if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
{
var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
if (expressData != null && expressData.Success && expressData.Data != null)
{
expressData.Data.ForEach(e =>
{
e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
});
data.ExpressOrderList = expressData.Data;
}
}
//if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())//加载物流信息
//{
// var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
// if (expressData != null && expressData.Success && expressData.Data != null)
// {
// expressData.Data.ForEach(e =>
// {
// e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
// });
// data.ExpressOrderList = expressData.Data;
// }
//}
if (item.BarCodeDTO != null && item.BarCodeDTO.Id > 0)
{
data.BarCodeModel = item.BarCodeDTO;
@ -1355,8 +1359,39 @@ namespace BBWY.Client.ViewModels.PackTask
}
}
Task.Factory.StartNew(() =>
{
foreach (var item in PackTaskList)
{
if (!item.OrderId.IsNullOrEmpty() && !item.SkuId.IsNullOrEmpty())
{
var expressData = packTaskService.GetPurchaseExpressOrderList(item.OrderId, item.SkuId);
if (expressData != null && expressData.Success && expressData.Data != null)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
expressData.Data.ForEach(e =>
{
e.ExpressState = ExpressOrderHelper.GetExpressStateName(e.ExpressState);
});
item.ExpressOrderList = expressData.Data;
}));
}
}
}
});
}
else
{
@ -1451,7 +1486,8 @@ namespace BBWY.Client.ViewModels.PackTask
{
foreach (var item in sealboxTasks)
{
var datetime = item.SealBoxPackOverTime.Value.Subtract(DateTime.Now);
TimeSpan datetime = PackTaskTimerHelper.AccountEffectiveRemainDuration(DateTime.Now, item.SealBoxPackOverTime.Value);
//var datetime = item.SealBoxPackOverTime.Value.Subtract(DateTime.Now);
if (datetime.TotalMilliseconds > 0)
{
item.IsSealBoxOverTime = false;
@ -1538,7 +1574,8 @@ namespace BBWY.Client.ViewModels.PackTask
{
foreach (var item in fallWareTasks)
{
var datetime = item.SetPurchaseOrderOverTime.Value.Subtract(DateTime.Now);
//var datetime = item.SetPurchaseOrderOverTime.Value.Subtract(DateTime.Now);
TimeSpan datetime = PackTaskTimerHelper.AccountEffectiveRemainDuration(DateTime.Now, item.SetPurchaseOrderOverTime.Value);
if (datetime.TotalMilliseconds > 0)
{
item.IsFallWareOverTime = false;

76
BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs
View File

@ -247,7 +247,7 @@ namespace BBWY.Client.ViewModels.PackTask
public ObservableCollection<OverTimeTaskResponse> OverTimeTaskList { get => overTimeTaskList; set { Set(ref overTimeTaskList, value); } }
private ObservableCollection<OverTimeTaskType> overTimeTaskTypeList = new ObservableCollection<OverTimeTaskType> {
OverTimeTaskType.全部, OverTimeTaskType.待验收, OverTimeTaskType.待排单, OverTimeTaskType.待打包, OverTimeTaskType.待封箱, OverTimeTaskType.待落仓, OverTimeTaskType.待转运
OverTimeTaskType.全部, OverTimeTaskType.待验收, OverTimeTaskType.待排单, OverTimeTaskType.待打包, OverTimeTaskType.待封箱, OverTimeTaskType.待同步采购单, OverTimeTaskType.待转运, OverTimeTaskType.待贴单
};
/// <summary>
///超时任务类型
@ -812,7 +812,7 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public ICommand PrintShelvesCommand { get; set; }
public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService, MarkMessageService markMessageService, QualityTaskService qualityTaskService, PackagingTaskService packagingTaskService, PackTaskAbortService packTaskAbortService)
public WareHouseListViewModel(PackTaskService packTaskService, GlobalContext globalContext, SealBoxService sealBoxService, PackUserService packUserService, MarkMessageService markMessageService, QualityTaskService qualityTaskService, PackagingTaskService packagingTaskService, PackTaskAbortService packTaskAbortService, PackTaskOverTimeDetailService packTaskOverTimeDetailService)
{
@ -957,6 +957,7 @@ namespace BBWY.Client.ViewModels.PackTask
PrintShelvesCommand = new RelayCommand<PackTaskModel>(PrintShelves);
LoadSplitDatas();
this.packTaskOverTimeDetailService = packTaskOverTimeDetailService;
}
private void LoadSplitDatas()
@ -1430,6 +1431,7 @@ namespace BBWY.Client.ViewModels.PackTask
}
}
PackTaskOverTimeDetailService packTaskOverTimeDetailService;
private void SubmitOverTimeMarkMsg(object param)
{
@ -1438,30 +1440,30 @@ namespace BBWY.Client.ViewModels.PackTask
var markMsg = paramList[1]?.ToString();
OverTimeTaskType overTimeTaskType = OverTimeTaskType.待验收;
OverTimeType overTimeType = OverTimeType.待验收;
TaskMessageType taskMessageType = TaskMessageType.任务ID;
switch (TaskState.Value)
{
case Models.TaskState.待验收:
overTimeTaskType = Models.OverTimeTaskType.待验收;
overTimeType = Models.OverTimeType.待验收; taskMessageType = TaskMessageType.任务ID;
break;
case Models.TaskState.待排单:
overTimeTaskType = Models.OverTimeTaskType.待排单;
overTimeType = Models.OverTimeType.待排单; taskMessageType = TaskMessageType.任务ID;
break;
case Models.TaskState.待包装:
overTimeTaskType = Models.OverTimeTaskType.待打包;
overTimeType = Models.OverTimeType.待包装; taskMessageType = TaskMessageType.任务ID;
break;
case Models.TaskState.待封箱:
overTimeTaskType = Models.OverTimeTaskType.待封箱;
overTimeType = Models.OverTimeType.待封箱; taskMessageType = TaskMessageType.封箱ID;
break;
case Models.TaskState.待落仓:
overTimeTaskType = Models.OverTimeTaskType.待落仓;
overTimeType = Models.OverTimeType.待贴单; taskMessageType = TaskMessageType.封箱ID;
break;
case Models.TaskState.待转运:
overTimeTaskType = Models.OverTimeTaskType.待转运;
overTimeType = Models.OverTimeType.待转运; taskMessageType = TaskMessageType.封箱ID;
break;
}
SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(overTimeTaskType, id, markMsg, packTaskService, ReflashTask);
SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow =new SubmitOverTimeMarkMsgWindow(packTaskOverTimeDetailService, id, markMsg, taskMessageType, overTimeType, ReflashTask);
submitOverTimeMarkMsgWindow.ShowDialog();
}
@ -2042,7 +2044,7 @@ namespace BBWY.Client.ViewModels.PackTask
{
PageSize = 20;
OverTimeTaskList = new ObservableCollection<OverTimeTaskResponse>();
var datas = packTaskService.SearchOverTimeTaskList(null, StartTime, EndTime, OverTimeTaskState, OverTimeTaskType, PageIndex, PageSize);
var datas = packTaskOverTimeDetailService.SearchOverTimeTaskList(null, StartTime, EndTime, OverTimeTaskState, OverTimeTaskType, PageIndex, PageSize);
if (datas != null && datas.Data != null && datas.Success)
{
var dataModel = datas.Data;
@ -2163,11 +2165,57 @@ namespace BBWY.Client.ViewModels.PackTask
BoxConfigureData = item.BoxConfigureData,
ProductCount = item.ProductCount,
WareType = item.WareType,
SetPurchaseOrderOverTime = item.SetPurchaseOrderOverTime
SetPurchaseOrderOverTime = item.SetPurchaseOrderOverTime,
SetWaybillNoOverTime=item.SetWaybillNoOverTime,
SetWaybillNoOverTimeMsg=item.SetWaybillNoOverTimeMsg,
});
}));
}
if (PositionState== PositionState.已配置待落仓)
{
var sealboxTasks = WaitFallWareList.Where(p => p.SetWaybillNoOverTime != null).ToList();
if (sealboxTasks.Count() > 0 && TaskState == Models.TaskState.待落仓)
{
fallwareOverTimeThread = new Thread(() =>
{
IsStartThread = true;
Thread.Sleep(1000);
while (IsStartThread)
{
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
foreach (var item in sealboxTasks)
{
// var datetime = item.TransportOverTime.Value.Subtract(DateTime.Now);
TimeSpan datetime = PackTaskTimerHelper.AccountEffectiveRemainDuration(DateTime.Now, item.SetWaybillNoOverTime.Value);
if (datetime.TotalMilliseconds > 0)
{
item.IsSetWaybillNoOverTime = false;
item.SetWaybillNoRemainTime = OverTimeHelper.GetTimeString(datetime);
}
else
{
item.IsSetWaybillNoOverTime = true;
item.SetWaybillNoRemainTime = OverTimeHelper.GetTimeString(datetime);
}
}
}));
Thread.Sleep(1000);
}
});
//任务倒计时数据
fallwareOverTimeThread.IsBackground = true;
fallwareOverTimeThread.Start();
}
}
}
else
{
@ -2514,8 +2562,6 @@ namespace BBWY.Client.ViewModels.PackTask
{
var data = JsonConvert.DeserializeObject<PackTaskModel>(JsonConvert.SerializeObject(item));
data.ItemList = new List<SkuMessage>() { new SkuMessage
{ BrandName = item.BrandName,
Logo= item.Logo,

14
BBWY.Client/ViewModels/PackerTask/PackerTaskViewModel.cs
View File

@ -408,7 +408,7 @@ namespace BBWY.Client.ViewModels.PackerTask
/// <summary>
/// 构造函数
/// </summary>
public PackerTaskViewModel(PackUserService packUserService, PackTaskService packTaskService, MarkMessageService markMessageService, GlobalContext globalContext, QualityTaskService qualityTaskService)
public PackerTaskViewModel(PackUserService packUserService, PackTaskService packTaskService, MarkMessageService markMessageService, GlobalContext globalContext, QualityTaskService qualityTaskService, PackTaskOverTimeDetailService packTaskOverTimeDetailService)
{
this.packUserService = packUserService;
@ -460,9 +460,7 @@ namespace BBWY.Client.ViewModels.PackerTask
PackagingTaskExceptionCommand = new RelayCommand<long>(PackagingTaskException);
this.qualityTaskService = qualityTaskService;
this.packTaskOverTimeDetailService = packTaskOverTimeDetailService;
}
QualityTaskService qualityTaskService;
private void PackagingTaskException(long taskId)
@ -791,7 +789,7 @@ namespace BBWY.Client.ViewModels.PackerTask
}
}
PackTaskOverTimeDetailService packTaskOverTimeDetailService;
private void SubmitOverTimeMarkMsg(object param)
{
@ -799,10 +797,10 @@ namespace BBWY.Client.ViewModels.PackerTask
var id = (long)paramList[0];
var markMsg = paramList[1]?.ToString();
var overTimeTaskType = Models.OverTimeTaskType.待打包;
var overTimeTaskType = Models.OverTimeType.待包装;
var taskMessageType = TaskMessageType.任务ID;
SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(overTimeTaskType, id, markMsg, packTaskService, ReflashTask);
SubmitOverTimeMarkMsgWindow submitOverTimeMarkMsgWindow = new SubmitOverTimeMarkMsgWindow(packTaskOverTimeDetailService, id, markMsg, taskMessageType, overTimeTaskType, ReflashTask);
submitOverTimeMarkMsgWindow.ShowDialog();
}
public void ReflashTask()//刷新界面

73
BBWY.Client/Views/FallWare/WaitFallWareControl.xaml
View File

@ -36,7 +36,7 @@
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="0"/>
<ColumnDefinition Width="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:150:0}"/>
<!--<ColumnDefinition Width="{Binding DataContext.SealBoxConfigureType,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待配置:150:0}"/>-->
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/>
@ -118,6 +118,42 @@
<TextBlock VerticalAlignment="Center" Text="对接人:" Margin="16,0,0,0" />
<TextBlock VerticalAlignment="Center" Text="{Binding AcceptUserNames}" Margin="5,0,0,0" />
<Grid Grid.Column="3" Margin="50 0 0 0" Visibility="{Binding DataContext.SealBoxConfigureType,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=已配置:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal"
Visibility="{Binding SetWaybillNoRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsSetWaybillNoOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding SetWaybillNoRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsSetWaybillNoOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding SetWaybillNoRemainTime}"/>
</StackPanel>
<c:BButton Margin="0 0 0 0" Content="{Binding SetWaybillNoOverTimeMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SealBoxId"/>
<Binding Path="SetWaybillNoOverTimeMsg"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</StackPanel>
</Grid>
</StackPanel>
<c:BButton Grid.Column="0" Grid.ColumnSpan="5" Background="Transparent" HorizontalAlignment="Stretch" BorderThickness="0" Panel.ZIndex="-1"
Command="{Binding DataContext.LoadFallWareSkuDataCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}"
@ -138,8 +174,8 @@
<ColumnDefinition Width="400"/>
<ColumnDefinition Width="80"/>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="0"/>
<!--<ColumnDefinition Width="{Binding DataContext.SealBoxConfigureType,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=待配置:150:0}"/>-->
<!--<ColumnDefinition Width="{Binding SealBoxConfigureType,Converter={StaticResource objConverter},ConverterParameter=已配置:120:0}"/>-->
<ColumnDefinition Width="{Binding DataContext.SealBoxConfigureType,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=已配置:150:0}"/>
<ColumnDefinition MinWidth="80"/>
<ColumnDefinition Width="100"/>
</Grid.ColumnDefinitions>
@ -315,25 +351,42 @@
</StackPanel>
</StackPanel>
</Grid>
<!--<Grid Grid.Column="3" >
<Grid Grid.Column="3" Visibility="{Binding DataContext.SealBoxConfigureType,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}},Converter={StaticResource objConverter},ConverterParameter=已配置:Visible:Collapsed}">
<StackPanel VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding FallWareRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
Visibility="{Binding SetWaybillNoRemainTime,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
Visibility="{Binding IsSetWaybillNoOverTime,Converter={StaticResource objConverter},ConverterParameter=false:Visible:Collapsed}"
>
<TextBlock Text="剩余: " />
<TextBlock Text="{Binding FallWareRemainTime}"/>
<TextBlock Text="{Binding SetWaybillNoRemainTime}"/>
</StackPanel>
<StackPanel Margin="10,5" Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center"
Visibility="{Binding IsFallWareOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
Visibility="{Binding IsSetWaybillNoOverTime,Converter={StaticResource objConverter},ConverterParameter=true:Visible:Collapsed}"
>
<TextBlock Foreground="Red" Text="超时: "/>
<TextBlock Foreground="Red" Text="{Binding FallWareRemainTime}"/>
<TextBlock Foreground="Red" Text="{Binding SetWaybillNoRemainTime}"/>
</StackPanel>
<c:BButton Margin="0 5 0 0" Content="{Binding SetWaybillNoOverTimeMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
<b:InvokeCommandAction Command="{Binding DataContext.SubmitOverTimeMarkMsgCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type UserControl}}}">
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="SealBoxId"/>
<Binding Path="SetWaybillNoOverTimeMsg"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</StackPanel>
</Grid>-->
</Grid>
<Grid Grid.Column="4" >

4
BBWY.Client/Views/PackagingTask/ShopWaitPackingTaskControl.xaml
View File

@ -267,7 +267,7 @@
</StackPanel>
</StackPanel>
<c:BButton Margin="0 10 0 0" Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
<!--<c:BButton Margin="0 10 0 0" Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
@ -281,7 +281,7 @@
</b:InvokeCommandAction>
</b:EventTrigger>
</b:Interaction.Triggers>
</c:BButton>
</c:BButton>-->
</StackPanel>
</StackPanel>

10
BBWY.Client/Views/PackagingTask/WaitPackingTaskControl.xaml
View File

@ -273,7 +273,7 @@
</StackPanel>
</StackPanel>
<c:BButton Margin="0 10 0 0" Content="{Binding QualityOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
<c:BButton Margin="0 10 0 0" Content="{Binding PackOverTimeMarkMsg ,Converter={StaticResource objConverter},ConverterParameter=#null:提交备注:修改备注}" Style="{StaticResource LinkButton}"
>
<b:Interaction.Triggers>
<b:EventTrigger EventName="PreviewMouseLeftButtonDown">
@ -281,7 +281,7 @@
<b:InvokeCommandAction.CommandParameter>
<MultiBinding Converter="{StaticResource mptConverter}">
<Binding Path="TaskId"/>
<Binding Path="QualityOverTimeMarkMsg"/>
<Binding Path="PackOverTimeMarkMsg"/>
</MultiBinding>
</b:InvokeCommandAction.CommandParameter>
</b:InvokeCommandAction>
@ -557,15 +557,15 @@ Foreground="{StaticResource Text.Color}">
<TextBlock Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="6"
Visibility="{Binding QualityOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
Visibility="{Binding PackOverTimeMarkMsg,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
HorizontalAlignment="Stretch" VerticalAlignment="Top" Margin="5 5 0 5" ScrollViewer.VerticalScrollBarVisibility="Visible" TextWrapping="Wrap" >
<TextBlock.ToolTip>
<ToolTip Style="{StaticResource OrderCouponToolipStyle}">
<TextBlock Text="{Binding QualityOverTimeMarkMsg}"/>
<TextBlock Text="{Binding PackOverTimeMarkMsg}"/>
</ToolTip>
</TextBlock.ToolTip>
<Run Text="超时原因:"/>
<Run Text="{Binding QualityOverTimeMarkMsg}" Foreground="Red" />
<Run Text="{Binding PackOverTimeMarkMsg}" Foreground="Red" />
</TextBlock>

28
BBWY.Client/Views/TaskOverTime/SubmitOverTimeMarkMsgWindow.xaml.cs
View File

@ -1,4 +1,5 @@
using BBWY.Client.APIServices;
using BBWY.Client.APIServices.QiKu;
using BBWY.Client.Models;
using BBWY.Controls;
using System;
@ -22,27 +23,32 @@ namespace BBWY.Client.Views.TaskOverTime
/// </summary>
public partial class SubmitOverTimeMarkMsgWindow : BWindow
{
public SubmitOverTimeMarkMsgWindow(OverTimeTaskType overTimeTaskType, long id, string msg, PackTaskService packTaskService, Action reflashWindow)
public SubmitOverTimeMarkMsgWindow(PackTaskOverTimeDetailService packTaskOverTimeDetailService, long id, string msg, TaskMessageType taskMessageType, OverTimeType overTimeType, Action reflashWindow)
{
InitializeComponent();
this.OverTimeTaskType = overTimeTaskType;
this.Id = id;
MarkMsg = msg;
this.reflashWindow = reflashWindow;
this.packTaskService = packTaskService;
this.DataContext = this;
this.packTaskOverTimeDetailService = packTaskOverTimeDetailService;
TaskMessageType = taskMessageType;
OverTimeType = overTimeType;
}
Action reflashWindow;
PackTaskService packTaskService { get; set; }
/// <summary>
/// 超时任务类型(待验收 = 2,待打包 = 3,待封箱 = 4, 待落仓 = 8,待转运 = 11,)
/// </summary>
public OverTimeTaskType OverTimeTaskType { get; set; }
PackTaskOverTimeDetailService packTaskOverTimeDetailService { get; set; }
/// <summary>
/// 任务id 或者 封箱id
/// 超时任务类型
/// </summary>
public long Id { get; set; }
public TaskMessageType TaskMessageType { get; set; }
public OverTimeType OverTimeType{ get; set; }
/// <summary>
/// 任务id 或者 封箱id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 备注信息
/// </summary>
@ -56,7 +62,7 @@ namespace BBWY.Client.Views.TaskOverTime
return;
}
var res = packTaskService.SubmitOverTimeMarkMsg(OverTimeTaskType, Id, MarkMsg);
var res = packTaskOverTimeDetailService.SubmitOverTimeMarkMsg(TaskMessageType, Id, OverTimeType, MarkMsg);
if (res == null)
{
MessageBox.Show("网络异常");

Write Preview
Loading…
Cancel
Save