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

10172

AddValidOverTime
506583276@qq.com 2 years ago
parent
a7d1f80e25
commit
04fb4bd105
6 changed files with 102 additions and 62 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. 7
      BBWY.Client/App.xaml.cs
  2. 2
      BBWY.Client/BBWYAppSettings.json
  3. 2
      BBWY.Client/GlobalContext.cs
  4. 7
      BBWY.Client/Models/PackTask/PackTaskModel.cs
  5. 6
      BBWY.Client/ViewModels/MainViewModel.cs
  6. 140
      BBWY.Client/ViewModels/PackTask/WareHouseListViewModel.cs

7
BBWY.Client/App.xaml.cs
View File

@ -50,10 +50,13 @@ namespace BBWY.Client
#if DEBUG
//仓库组测试
// userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";
//齐越梧桐
userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjY1ODk1OTgzMzc4MDc1NjQ4IiwidGVhbUlkIjoiMTUxNjcxNTM3MjQ0NTcwMDA5NiIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0LDE1MTY3MTUzNzI0NDU3MDAwOTYiLCJleHAiOjE3MjQyOTE2MDZ9.NG6wDqHJ5ozmEDcAt2duJ50IcGarygrQ2bmiP4TGNRE";
//齐越山鸡
userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
//userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTM1MzMwMzI4ODkyMTQ5NzYwIiwidGVhbUlkIjoiMTUxNjk3NDI1MDU0MjUwMTg4OCIsInNvblRlYW1JZHMiOiIxNDM2Mjg4NTAwMjM1MjQzNTIwIiwiZXhwIjoxNjk0NjY5NjkxfQ.cSwro-7bGwOu92YejH9JhMenTai7Mvf99i2paQCmxIw";
//刷单组测试
//userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTcxODUyODE0OTAzMTUyNjQwIiwidGVhbUlkIjoiMTU3MTg1MjQ1MDI5NjUwMDIyNCIsInNvblRlYW1JZHMiOiIiLCJleHAiOjE2OTUxNDc2ODh9.hVupdHnhgHHGo3QrMSDqhINqtq6Q5_RovWyXjiMkkEs";

2
BBWY.Client/BBWYAppSettings.json
View File

@ -5,5 +5,5 @@
"JOSApiHost": "",
"1688ApiHost": "",
"QKApiHost": "http://localhost:8080"
// "QKApiHost": "http://qiku.qiyue666.com"
//"QKApiHost": "http://qiku.qiyue666.com"
}

2
BBWY.Client/GlobalContext.cs
View File

@ -13,7 +13,7 @@ namespace BBWY.Client
{
ShopServiceGroupList = new List<string>();
ShopServiceGroupLowerList = new List<string>();
ClientVersion = "10171";
ClientVersion = "10172";
}
private User user;

7
BBWY.Client/Models/PackTask/PackTaskModel.cs
View File

@ -428,11 +428,14 @@ namespace BBWY.Client.Models
/// </summary>
public string ScheduleOverTimeMarkMsg { get; set; }
/// <summary>
/// 物流信息
/// </summary>
public List<ExpressOrderResponse> ExpressOrderList { get; set; }
private List<ExpressOrderResponse> expressOrderList;
/// <summary>
/// 物流信息
/// </summary>
public List<ExpressOrderResponse> ExpressOrderList { get => expressOrderList; set { Set(ref expressOrderList, value); } }
/// <summary>
/// 需求方店铺id

6
BBWY.Client/ViewModels/MainViewModel.cs
View File

@ -123,7 +123,7 @@ namespace BBWY.Client.ViewModels
/// </summary>
private void CreateMenu()
{
if (this.packDepartment.Contains(GlobalContext.User.TeamName))
if (this.packDepartment.Contains(GlobalContext.User.TeamName) || packDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)))
{
App.Current.Dispatcher.Invoke(() =>
@ -277,10 +277,8 @@ namespace BBWY.Client.ViewModels
CreateMenu();
IList<Department> departmentList = null;
if (GlobalContext.User.TeamName == "刷单组" || this.packDepartment.Contains(GlobalContext.User.TeamName) ||
if (GlobalContext.User.TeamName == "刷单组" || this.packDepartment.Contains(GlobalContext.User.TeamName) || packDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)) ||
managerDepartment.Contains(GlobalContext.User.TeamName) ||
managerDepartment.Any(m => GlobalContext.User.SonDepartmentNames.Contains(m)))
{

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

@ -23,6 +23,8 @@ using BBWY.Client.Views.TaskOverTime;
using BBWY.Client.Views.StorePickSelf;
using System.Diagnostics.Eventing.Reader;
using BBWY.Client.Models.SealBox;
using Newtonsoft.Json;
using System.Diagnostics;
namespace BBWY.Client.ViewModels.PackTask
{
@ -675,11 +677,11 @@ namespace BBWY.Client.ViewModels.PackTask
}
}
private void LoadSealBoxSkuData( SealBoxModel model)
private void LoadSealBoxSkuData(SealBoxModel model)
{
if (model.SealBoxSkus == null || model.SealBoxSkus.Count <= 0)
{
var skuDatas =SealBoxModelList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId);
var skuDatas = SealBoxModelList.SingleOrDefault(w => w.SealBoxId == model.SealBoxId);
WaitSealBoxModels.SingleOrDefault(w => w.SealBoxId == model.SealBoxId).SealBoxSkus = skuDatas.SealBoxSkus;
}
else
@ -692,10 +694,10 @@ namespace BBWY.Client.ViewModels.PackTask
private void LoadSkuData(WareNoSealBoxModel model)
{
if (model.SealBoxSkus==null|| model.SealBoxSkus.Count<=0)
if (model.SealBoxSkus == null || model.SealBoxSkus.Count <= 0)
{
var skuDatas =WaitSealBoxModelList.SingleOrDefault(w => w.ShopId == model.ShopId);
WareNoSealBoxModels.SingleOrDefault(w => w.ShopId == model.ShopId).SealBoxSkus = skuDatas.SealBoxSkus;
var skuDatas = WaitSealBoxModelList.SingleOrDefault(w => w.ShopId == model.ShopId);
WareNoSealBoxModels.SingleOrDefault(w => w.ShopId == model.ShopId).SealBoxSkus = skuDatas.SealBoxSkus;
}
else
{
@ -947,9 +949,10 @@ namespace BBWY.Client.ViewModels.PackTask
return;
}
StorePickProductWindow sorePickProductWindow = new StorePickProductWindow(data.Data, (count, UserName) => {
StorePickProductWindow sorePickProductWindow = new StorePickProductWindow(data.Data, (count, UserName) =>
{
var res = packTaskService.StoreGetBySelfV2(taskId,count,UserName);
var res = packTaskService.StoreGetBySelfV2(taskId, count, UserName);
if (res == null)
{
return false;
@ -959,7 +962,7 @@ namespace BBWY.Client.ViewModels.PackTask
System.Windows.MessageBox.Show(res.Msg, "错误信息");
return false;
}
Task.Factory.StartNew(() => SearchTaskList());
@ -968,7 +971,7 @@ namespace BBWY.Client.ViewModels.PackTask
sorePickProductWindow.ShowDialog();
}
private void DeletedTask(object obj)
@ -992,7 +995,7 @@ namespace BBWY.Client.ViewModels.PackTask
JDWareBoxModel model = new JDWareBoxModel
{
ShopName = globalContext.User.Shop.ShopName,
ShopName = fallware.ShopName,
WareName = fallware.WareName,
SealBoxId = fallware.SealBoxId,
ProductCount = fallware.ProductCount,
@ -1013,7 +1016,14 @@ namespace BBWY.Client.ViewModels.PackTask
private void LookBoxConfigure(object obj)
{
var fallware = obj as WaitFallWareModel;
var fallware = obj as WaitFallWareModel;//WaitFallWareModel
if (fallware == null)
{
MessageBox.Show($"数据异常, {JsonConvert.SerializeObject(obj)}");
return;
}
JDWareBoxModel model = new JDWareBoxModel
{
ShopName = globalContext.User.Shop.ShopName,
@ -1210,11 +1220,11 @@ namespace BBWY.Client.ViewModels.PackTask
/// </summary>
public ICommand LoadFallWareSkuDataCommand { get; set; }
/// <summary>
/// 完成封箱
/// </summary>
/// <param name="obj"></param>
private void CompeteSealBox(object obj)
/// <summary>
/// 完成封箱
/// </summary>
/// <param name="obj"></param>
private void CompeteSealBox(object obj)
{
var model = (SealBoxModel)obj;
@ -1374,6 +1384,10 @@ namespace BBWY.Client.ViewModels.PackTask
}
Task.Factory.StartNew(() =>
{
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
if (TaskState == Models.TaskState.待出库)
{
WaitCompletedList = new ObservableCollection<WareWaitCompleted>();
@ -1510,7 +1524,7 @@ namespace BBWY.Client.ViewModels.PackTask
{
AcceptUserNames = string.Join("|", item.AcceptUserNames),
DepartmentName = item.DepartmentName,
SealBoxSkus =null,
SealBoxSkus = null,
ShopId = item.ShopId,
ShopName = item.ShopName,
WareId = item.WareId,
@ -1631,17 +1645,18 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var item in WaitSealBoxModelList)
{
App.Current.Dispatcher.Invoke(new Action(() => {
WareNoSealBoxModels.Add(new WareNoSealBoxModel
App.Current.Dispatcher.Invoke(new Action(() =>
{
AcceptUserName = string.Join("|", item.AcceptUserNames),
DepartmentName = item.DepartmentName,
SealBoxSkus = new List<WareNoSealBoxSku>(),
// SealBoxSkus = item.SealBoxSkus,
ShopId = item.ShopId,
ShopName = item.ShopName,
WareNoSealBoxModels.Add(new WareNoSealBoxModel
{
AcceptUserName = string.Join("|", item.AcceptUserNames),
DepartmentName = item.DepartmentName,
SealBoxSkus = new List<WareNoSealBoxSku>(),
// SealBoxSkus = item.SealBoxSkus,
ShopId = item.ShopId,
ShopName = item.ShopName,
});
});
}));
}
}
@ -1685,8 +1700,17 @@ namespace BBWY.Client.ViewModels.PackTask
{
PackTaskList = new ObservableCollection<PackTaskModel>();//初始化数据
var datas = packTaskService.SearchTaskList(SearchWayBillNo, SearchExpressName, SearchDepartment, SearchSkuId, SearchTaskId, SearchSpuId, SearchOrderSn, this.TaskState, SearchShopName,
PageIndex, PageSize, SearchSkuTitle, SearchSpuTitle);
stopwatch.Stop();
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
Debug.WriteLine($"查询接口耗时:{stopwatch.ElapsedMilliseconds}毫秒");
}));
stopwatch.Restart();
if (datas != null && datas.Data != null && datas.Success)
{
var dataModel = datas.Data;
@ -1733,26 +1757,6 @@ namespace BBWY.Client.ViewModels.PackTask
SendToSetSkuConfigureTime = item.SendToSetSkuConfigureTime,
};
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)
{
@ -1795,12 +1799,10 @@ namespace BBWY.Client.ViewModels.PackTask
}
if (TaskState == Models.TaskState.待验收)
{
qualityOverTimeThread = new Thread(() =>
{
var packtasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待验收 && p.QualityCompletionOverTime != null).ToList();
if (packtasks.Count() > 0)
{
@ -1885,8 +1887,6 @@ namespace BBWY.Client.ViewModels.PackTask
}
}
if (TaskState == Models.TaskState.待排单)
{
var packCompletedTasks = PackTaskList.Where(p => p.TaskState == Models.TaskState.待排单 && p.ScheduleOverTime != null).ToList();
@ -1926,10 +1926,41 @@ 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
{
@ -1944,9 +1975,14 @@ namespace BBWY.Client.ViewModels.PackTask
});
IsLoading = false;
stopwatch.Stop();
App.Current.Dispatcher.BeginInvoke(new Action(() =>
{
Debug.WriteLine($"查询耗时:{stopwatch.ElapsedMilliseconds}毫秒");
}));
});
}

Write Preview
Loading…
Cancel
Save