Browse Source

Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwy

AddValidOverTime
shanji 2 years ago
parent
commit
be4e38b498
  1. 3
      BBWY.Client/App.xaml.cs
  2. 4
      BBWY.Client/BBWYAppSettings.json
  3. 2
      BBWY.Client/GlobalContext.cs
  4. 69
      BBWY.Client/Helpers/HttpClientHelper.cs
  5. 47
      BBWY.Client/Models/PackTask/ShopTotal.cs
  6. 316
      BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
  7. 2
      BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
  8. 36
      BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
  9. 2
      BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs
  10. 85
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml
  11. 26
      BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs
  12. 1
      BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml

3
BBWY.Client/App.xaml.cs

@ -38,7 +38,6 @@ namespace BBWY.Client
WindowsPrincipal windowsPrincipal = new WindowsPrincipal(current); WindowsPrincipal windowsPrincipal = new WindowsPrincipal(current);
return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator); return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
} }
protected override void OnStartup(StartupEventArgs e) protected override void OnStartup(StartupEventArgs e)
{ {
var isAdmin = IsAdministrator(); var isAdmin = IsAdministrator();
@ -48,8 +47,6 @@ namespace BBWY.Client
var gl = new GlobalContext(); var gl = new GlobalContext();
string userToken = string.Empty; string userToken = string.Empty;
#if DEBUG #if DEBUG
//仓库组测试 //仓库组测试
// userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek"; // userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNjM1OTMyMDAyMjcwMDU2NDQ4IiwidGVhbUlkIjoiMTU0MDg4NTU3MDYyNzA0NzQyNCIsInNvblRlYW1JZHMiOiIxNTQwODg1NTcwNjI3MDQ3NDI0IiwiZXhwIjoxNzEwNDk2NTQ1fQ.Sx2vGJcYGf98x99slQLU3vt7yWdjspptSpbUCcZgWek";

4
BBWY.Client/BBWYAppSettings.json

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

2
BBWY.Client/GlobalContext.cs

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

69
BBWY.Client/Helpers/HttpClientHelper.cs

@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Net.Http; using System.Net.Http;
using System.Text; using System.Text;
using System.Windows;
namespace BBWY.Client.Helpers namespace BBWY.Client.Helpers
{ {
@ -17,19 +18,28 @@ namespace BBWY.Client.Helpers
public string Get(string Url) public string Get(string Url)
{ {
HttpClient client = new HttpClient(); try
//设置 API的 基地址
client.BaseAddress = new Uri(BaseAddr);
//设置 默认请求头ACCEPT
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
//发送GET请求
HttpResponseMessage msg = client.GetAsync(Url).Result;
//判断结果是否成功
if (msg.IsSuccessStatusCode)
{ {
//返回响应结果 HttpClient client = new HttpClient();
return msg.Content.ReadAsStringAsync().Result; //设置 API的 基地址
client.BaseAddress = new Uri(BaseAddr);
//设置 默认请求头ACCEPT
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
//发送GET请求
HttpResponseMessage msg = client.GetAsync(Url).Result;
//判断结果是否成功
if (msg.IsSuccessStatusCode)
{
//返回响应结果
return msg.Content.ReadAsStringAsync().Result;
}
} }
catch (Exception)
{
MessageBox.Show("网络异常,无法连接到服务器");
}
//返回空字符串,表示响应错误 //返回空字符串,表示响应错误
return ""; return "";
} }
@ -54,22 +64,31 @@ namespace BBWY.Client.Helpers
} }
public string Post(string Url, string JsonData) public string Post(string Url, string JsonData)
{ {
HttpClient client = new HttpClient(); try
//设置 API的 基地址
client.BaseAddress = new Uri(BaseAddr);
//设置 默认请求头ACCEPT
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
//设置消息体
HttpContent content = new StringContent(JsonData);
content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
//发送Post请求
HttpResponseMessage msg = client.PostAsync(Url, content).Result;
//判断结果是否成功
if (msg.IsSuccessStatusCode)
{ {
//返回响应结果 HttpClient client = new HttpClient();
return msg.Content.ReadAsStringAsync().Result; //设置 API的 基地址
client.BaseAddress = new Uri(BaseAddr);
//设置 默认请求头ACCEPT
client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
//设置消息体
HttpContent content = new StringContent(JsonData);
content.Headers.ContentType = new MediaTypeHeaderValue("application/json");
//发送Post请求
HttpResponseMessage msg = client.PostAsync(Url, content).Result;
//判断结果是否成功
if (msg.IsSuccessStatusCode)
{
//返回响应结果
return msg.Content.ReadAsStringAsync().Result;
}
}
catch (Exception)
{
MessageBox.Show("网络异常,无法连接到服务器");
} }
//返回空字符串,表示响应错误 //返回空字符串,表示响应错误
return ""; return "";
} }

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

@ -52,9 +52,9 @@ namespace BBWY.Client.Models.PackTask
public decimal ConsumableFees { get; set; } public decimal ConsumableFees { get; set; }
public decimal Price { get; set; } // public decimal Price { get; set; }
public decimal Discount { get; set; } //public decimal Discount { get; set; }
public decimal DiscountPrice { get; set; } public decimal DiscountPrice { get; set; }
/// <summary> /// <summary>
@ -70,7 +70,7 @@ namespace BBWY.Client.Models.PackTask
/// <summary> /// <summary>
/// 打包费用 /// 打包费用
/// </summary> /// </summary>
public decimal? PackAllFees { get; set; } //public decimal? PackAllFees { get; set; }
/// <summary> /// <summary>
/// 箱子费用 /// 箱子费用
@ -89,11 +89,50 @@ namespace BBWY.Client.Models.PackTask
/// </summary> /// </summary>
public decimal? OtherConsumableFees { get; set; } public decimal? OtherConsumableFees { get; set; }
/// <summary>
/// 折扣系数
/// </summary>
public decimal? DiscountFactor { get; set; }
/// <summary>
/// 到货数量
/// </summary>
public int? ArrivalQuantity { get; set; }
/// <summary>
/// 基础价格(基础包装费、仅贴码)
/// </summary>
public decimal? BasicPrice { get; set; }
/// <summary>
/// 增量价格
/// </summary>
public decimal? IncrementPartPrice { get; set; }
/// <summary>
/// 增量工序价
/// </summary>
public decimal? IncrementProcessPrice { get; set; }
/// <summary>
/// 折扣类型
/// </summary>
public FeesMode? FeesMode { get; set; }
/// <summary>
/// 总费用
/// </summary>
public decimal? AllFees { get; set; }
/// <summary>
/// 打包费用折扣价
/// </summary>
public decimal? PackDisCountFees { get; set; }
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},{BoxConsumableFees},{AirConsumableFees},{TapeConsumableFees},{OtherConsumableFees},{ConsumableFees},{PackSingleFees},{PackAllFees},{Price},{Discount},{DiscountPrice}"; $",{SkuCount},{BoxConsumableFees},{AirConsumableFees},{TapeConsumableFees},{OtherConsumableFees},{ConsumableFees},{ArrivalQuantity},{BasicPrice},{IncrementPartPrice},{IncrementProcessPrice},{PackSingleFees},{PackFees},{FeesMode},{DiscountFactor},{PackDisCountFees},{IncreaseFees},{AllFees}";
} }
} }

316
BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs

@ -284,10 +284,10 @@ namespace BBWY.Client.ViewModels.PackTask
var res = this.packDetailService.GetPackTaskDetail(TaskId); var res = this.packDetailService.GetPackTaskDetail(TaskId);
if (res.Success) if (res.Success)
{ {
IncrementPartCount = res.Data.IncrementPartCount==null? 0 : res.Data.IncrementPartCount.Value; IncrementPartCount = res.Data.IncrementPartCount == null ? 0 : res.Data.IncrementPartCount.Value;
if (res.Data != null && res.Data.IncrementItemList.Count() > 0) if (res.Data != null && res.Data.IncrementItemList.Count() > 0)
{ {
@ -310,10 +310,13 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var packService in res.Data.ProcessItemList) foreach (var packService in res.Data.ProcessItemList)
{ {
if (packService.ServiceType == ServiceType.) if (packService.ServiceType == ServiceType.)
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>
{ {
PackServiceList.Add(packService);//加载工序服务列表
BasicPackServiceList.Add(packService); BasicPackServiceList.Add(packService);
if (packService.Name != "贴条码")
PackServiceList.Add(packService);//加载工序服务列表
}); });
} }
} }
@ -420,7 +423,7 @@ namespace BBWY.Client.ViewModels.PackTask
BasicPackProcessList.Add(new PackItemModel() BasicPackProcessList.Add(new PackItemModel()
{ {
MemberList = MemberList, MemberList = MemberList,
PackServiceList = PackServiceList.Copy(), PackServiceList = BasicPackServiceList.Copy(),
ItemCount = item.ItemCount, ItemCount = item.ItemCount,
ItemName = item.ItemName, ItemName = item.ItemName,
SelectId = item.SelectId, SelectId = item.SelectId,
@ -577,11 +580,23 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
System.Windows.MessageBox.Show("基础包装工序不能超过两道"); System.Windows.MessageBox.Show("基础包装工序不能超过两道");
return; return;
} }
var disIncrementProcessList = IsOverCount(IncrementProcessList); var disIncrementProcessList = IsOverCount(IncrementProcessList);
if (disIncrementProcessList == null) return; if (disIncrementProcessList == null) return;
if (disBasicPackProcessList.Select(d=>d.ItemName).Distinct().Count()==1&& disBasicPackProcessList.Select(d => d.ItemName).Contains("贴条码")
&& disIncrementProcessList.Count>0)
{
System.Windows.MessageBox.Show("只有一道贴码工序,无法添加增值包装工序");
return;
}
var disConsumableServiceList = IsOverCount(ConsumableServiceList, false); var disConsumableServiceList = IsOverCount(ConsumableServiceList, false);
if (disConsumableServiceList == null) return; if (disConsumableServiceList == null) return;
@ -600,295 +615,6 @@ namespace BBWY.Client.ViewModels.PackTask
win.Close(); win.Close();
} }
} }
//private void UpLoadPack1(object obj)
//{
// decimal upDisCount = 1;
// if (string.IsNullOrEmpty(Discount)) upDisCount = 1;
// decimal.TryParse(Discount, out upDisCount);
// if (upDisCount == 0)
// {
// new TipsWindow("折扣输入有误");
// return;
// }
// UploadServiceRequest uploadService = new UploadServiceRequest();
// uploadService.Discount = upDisCount;
// List<PackItemModel> packServiceList = new List<PackItemModel>();
// uploadService.TaskId = TaskId;
// List<PackServiceDTO> uploadServices = new List<PackServiceDTO>();
// // List<ConsumableTaskModel> consumableTasks = new List<ConsumableTaskModel>();
// ///上传 删除的数据 //上传保存数据 //上传总数据
// List<PersonTaskModel> addDatas = new List<PersonTaskModel>();
// List<PersonTaskModel> delDatas = new List<PersonTaskModel>();
// List<PersonTaskModel> PersonTaskModels = new List<PersonTaskModel>();
// List<PackServiceMemberModel> allPackServiceTasks = new List<PackServiceMemberModel>();
// List<ConsumableTaskModel> allConsumableTasks = new List<ConsumableTaskModel>();
// FeesItemResponse feesItem = new FeesItemResponse(); ;
// List<PackServiceMemberModel> PackServiceMembers = new List<PackServiceMemberModel>();
// //获取打包人员
// List<string> packUsers = new List<string>();
// decimal singleFees = 0;
// decimal AllFees = 0;
// decimal price = 0;
// decimal IncreateFees = 0, PackFees = 0, ConsumableFees = 0, DiscountPrice = 0;
// foreach (var item in IncreateList)//增值服务上传
// {
// if (item.SelectId <= 0 || string.IsNullOrEmpty(item.SelectUserId) || item.ItemCount <= 0)
// {
// new TipsWindow($"数据输入有误").Show();
// return;
// }
// var member = MemberList.SingleOrDefault(m => m.Id == item.SelectUserId);
// if (member != null && !packUsers.Contains(member.UserName))
// {
// packUsers.Add(member.UserName);
// }
// if (item.ItemCount > TaskCount)
// {
// new TipsWindow($"{item.ItemName}:{item.ItemCount}超出任务量{TaskCount}").Show();
// return;
// }
// price = IncreateServiceList.First(i => i.Id == item.SelectId).Price;
// singleFees += price;
// AllFees += item.ItemCount * price;
// IncreateFees += item.ItemCount * price;
// if (PackServiceMembers.Select(a => a.PackServiceId).Contains(item.SelectId))//相同服务 存在累加
// {
// var inMembers = PackServiceMembers.SingleOrDefault(a => a.UserId == item.SelectUserId && a.PackServiceId == item.SelectId);
// if (inMembers != null)
// inMembers.PackServiceCount += item.ItemCount;
// var data = PackServiceMembers.SingleOrDefault(a => a.PackServiceId == item.SelectId);
// var feeItem = feesItem.ServiceList.SingleOrDefault(f => f.ItemName == item.ItemName);
// if (data != null) data.PackServiceCount += item.ItemCount;
// if (feeItem != null) feeItem.ItemCount += item.ItemCount;
// if (data.PackServiceCount > TaskCount)//累积超出任务量
// {
// new TipsWindow($"{item.ItemName}:{data.PackServiceCount}超出任务量{TaskCount}").Show();
// return;
// }
// continue;
// }
// PackServiceMembers.Add(new PackServiceMemberModel
// {
// UserId = item.SelectUserId,
// PackServiceCount = item.ItemCount,
// PackServiceId = item.SelectId,
// Price = price,
// ServiceType = ServiceType.增值服务
// });
// feesItem.ServiceList.Add(new ServiceItemResponse
// {
// ServiceType = ServiceType.增值服务,
// ItemCount = item.ItemCount,
// ItemName = item.ItemName,
// ItemPrice = price
// });
// }
// foreach (var item in IncrementProcessList)//打包服务
// {
// if (item.SelectId <= 0 || string.IsNullOrEmpty(item.SelectUserId) || item.ItemCount <= 0)
// {
// new TipsWindow($"数据输入有误").Show();
// return;
// }
// if (item.ItemCount > TaskCount)
// {
// new TipsWindow($"{item.ItemName}:{item.ItemCount}超出任务量{TaskCount}").Show();
// return;
// }
// var member = MemberList.SingleOrDefault(m => m.Id == item.SelectUserId);
// if (member != null && !packUsers.Contains(member.UserName))
// {
// packUsers.Add(member.UserName);
// }
// price = PackServiceList.First(i => i.Id == item.SelectId).Price;
// singleFees += price;
// AllFees += item.ItemCount * price;
// PackFees += item.ItemCount * price;
// if (PackServiceMembers.Select(a => a.PackServiceId).Contains(item.SelectId))//存在累加
// {
// var inMembers = PackServiceMembers.SingleOrDefault(a => a.UserId == item.SelectUserId && a.PackServiceId == item.SelectId);
// if (inMembers != null)
// inMembers.PackServiceCount += item.ItemCount;
// var data = PackServiceMembers.SingleOrDefault(a => a.PackServiceId == item.SelectId);
// var feeItem = feesItem.ServiceList.SingleOrDefault(f => f.ItemName == item.ItemName);
// feeItem.ItemCount += item.ItemCount;
// data.PackServiceCount += item.ItemCount;
// if (data.PackServiceCount > TaskCount)//累积超出任务量
// {
// new TipsWindow($"{item.ItemName}:{data.PackServiceCount}超出任务量{TaskCount}").Show();
// return;
// }
// continue;
// }
// PackServiceMembers.Add(new PackServiceMemberModel
// {
// UserId = item.SelectUserId,
// PackServiceCount = item.ItemCount,
// PackServiceId = item.SelectId,
// Price = price,
// ServiceType = ServiceType.打包服务
// });
// feesItem.ServiceList.Add(new ServiceItemResponse
// {
// ServiceType = ServiceType.打包服务,
// ItemCount = item.ItemCount,
// ItemName = item.ItemName,
// ItemPrice = price
// });
// }
// foreach (var item in ConsumableServiceList)
// {
// if (item.SelectId <= 0 || item.ItemCount <= 0)
// {
// new TipsWindow($"数据输入有误").Show();
// return;
// }
// if (item.ItemCount > TaskCount)
// {
// new TipsWindow($"{item.ItemName}:{item.ItemCount}超出任务量{TaskCount}").Show();
// return;
// }
// price = ConsumableList.First(i => i.Id == item.SelectId).Price.Value;
// singleFees += price;
// AllFees += item.ItemCount * price;
// ConsumableFees += item.ItemCount * price;
// if (allConsumableTasks.Select(a => a.ConsumableId).Contains(item.SelectId))//存在累加
// {
// var data = allConsumableTasks.SingleOrDefault(a => a.ConsumableId == item.SelectId);
// var feeItem = feesItem.ServiceList.SingleOrDefault(f => f.ItemName == item.ItemName);
// feeItem.ItemCount += item.ItemCount;
// data.ConsumableCount += item.ItemCount;
// if (data.ConsumableCount > TaskCount)//累积超出任务量
// {
// new TipsWindow($"{item.ItemName}:{data.ConsumableCount}超出任务量{TaskCount}").Show();
// return;
// }
// continue;
// }
// feesItem.ServiceList.Add(new ServiceItemResponse
// {
// ServiceType = ServiceType.耗材服务,
// ItemCount = item.ItemCount,
// ItemName = item.ItemName,
// ItemPrice = price
// });
// allConsumableTasks.Add(new ConsumableTaskModel
// {
// ConsumableCount = item.ItemCount,
// ConsumableId = item.SelectId
// });
// }
// uploadService.ConsumableIds = string.Join(",", allConsumableTasks.Select(a => a.ConsumableId));
// uploadService.ConsumableNos = string.Join(",", allConsumableTasks.Select(a => a.ConsumableCount));
// uploadService.WorkProcessIds = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.打包服务).Select(a => a.PackServiceId));
// uploadService.WorkProcessNos = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.打包服务).Select(a => a.PackServiceCount));
// uploadService.IncreateServiceIds = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.增值服务).Select(a => a.PackServiceId));
// uploadService.IncreateServiceNos = string.Join(",", PackServiceMembers.Where(p => p.ServiceType == ServiceType.增值服务).Select(a => a.PackServiceCount));
// uploadService.PackServiceIds = string.Join(",", PackServiceMembers.Select(a => a.PackServiceId));
// uploadService.PackServiceNos = string.Join(",", PackServiceMembers.Select(a => a.PackServiceCount));
// //var orgIds = LoadList.Select(p => p.SelectId).ToList();
// //var nowIds = PackServiceMembers.Select(p => p.PackServiceId).ToList();
// //var add = nowIds.Except(orgIds);
// foreach (var item in LoadList)
// {
// if (!PackServiceMembers.Any(p => p.UserId == item.SelectUserId && p.PackServiceId == item.SelectId))
// {
// delDatas.Add(new PersonTaskModel
// {
// TaskId = taskId,
// PackUserId = item.SelectUserId,
// ServiceId = item.SelectId
// });
// }
// }
// //var del = orgIds.Except(nowIds).ToList();
// foreach (var PackServiceMember in PackServiceMembers)
// {
// addDatas.Add(new PersonTaskModel
// {
// TaskId = taskId,
// CreateTime = DateTime.Now,
// IsDeleted = false,
// ServiceCount = PackServiceMember.PackServiceCount,
// PackUserId = PackServiceMember.UserId,
// ServiceId = PackServiceMember.PackServiceId,
// ServiceType = PackServiceMember.ServiceType
// });
// }
// uploadService.AddPackServices = addDatas;
// uploadService.DelPackServices = delDatas;
// //uploadService.DeletedPackServices = del;
// //uploadService.DeletedPackServices
// uploadService.SkuId = SkuId;
// uploadService.OrderId = OrderId;
// uploadService.AllFees = Convert.ToDecimal(AllFees.ToString("0.00"));
// uploadService.SingleFees = singleFees;
// uploadService.IncreaseFees = Convert.ToDecimal((IncreateFees).ToString("0.00"));
// uploadService.PackFees = Convert.ToDecimal((PackFees).ToString("0.00"));
// uploadService.ConsumableFees = Convert.ToDecimal((ConsumableFees).ToString("0.00"));
// uploadService.DiscountPrice = Convert.ToDecimal((AllFees * upDisCount).ToString("0.00"));
// var res = packDetailService.SetPackTaskDetail(uploadService);
// if (res != null && res.Success)
// {
// // new TipsWindow("上传成功!").Show();
// var win = obj as System.Windows.Window;
// feesItem.AllFees = AllFees;
// feesItem.SingleFees = singleFees;
// feesItem.TaskId = TaskId;
// feesItem.DisCount = upDisCount;
// feesItem.DiscountAllFees = upDisCount * AllFees;
// feesItem.DiscountSingleFees = singleFees * upDisCount;
// if (SetAllFees != null)
// SetAllFees(feesItem, packUsers);
// win.Close();
// }
//}
/// <summary> /// <summary>
/// 更新 打包员 和费用数据 /// 更新 打包员 和费用数据
/// </summary> /// </summary>
@ -917,7 +643,7 @@ namespace BBWY.Client.ViewModels.PackTask
{ {
ItemCount = TaskCount, ItemCount = TaskCount,
MemberList = MemberList, MemberList = MemberList,
PackServiceList = PackServiceList PackServiceList = BasicPackServiceList,
}); });
})); }));

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

@ -130,7 +130,7 @@ namespace BBWY.Client.ViewModels.PackTask
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);

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

@ -95,9 +95,10 @@ namespace BBWY.Client.ViewModels
public ObservableCollection<string> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } } public ObservableCollection<string> AvailabilityList { get => availabilityList; set { Set(ref availabilityList, value); } }
private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string> { private ObservableCollection<string> preCompeteTimeDayList = new ObservableCollection<string>
{
};
};
public ObservableCollection<string> PreCompeteTimeDayList { get => preCompeteTimeDayList; set { Set(ref preCompeteTimeDayList, value); } } public ObservableCollection<string> PreCompeteTimeDayList { get => preCompeteTimeDayList; set { Set(ref preCompeteTimeDayList, value); } }
@ -479,12 +480,23 @@ namespace BBWY.Client.ViewModels
, BarCodeModel); , BarCodeModel);
batchPrint.ShowDialog(); batchPrint.ShowDialog();
try
{
}
catch
{
}
if (ReflashWindow != null) ReflashWindow(); if (ReflashWindow != null) ReflashWindow();
var window = obj as BWindow; var window = obj as BWindow;
window.Close(); window.Close();
} }
@ -498,8 +510,8 @@ namespace BBWY.Client.ViewModels
} }
if (BarCodeModel == null) if (BarCodeModel == null)
{ {
var resCode = packPurchaseTaskService.SearchBarCode(SkuId); var resCode = packPurchaseTaskService.SearchBarCode(SkuId);
if (resCode==null) if (resCode == null)
{ {
BarCodeModel = new BarCodeModel(); BarCodeModel = new BarCodeModel();
BarCodeModel.ProductNo = ProductNo; BarCodeModel.ProductNo = ProductNo;
@ -511,7 +523,7 @@ namespace BBWY.Client.ViewModels
{ {
BarCodeModel = resCode.Data; BarCodeModel = resCode.Data;
} }
} }
if (!string.IsNullOrEmpty(BrandName)) if (!string.IsNullOrEmpty(BrandName))
BarCodeModel.BrandName = BrandName; BarCodeModel.BrandName = BrandName;
@ -575,8 +587,8 @@ namespace BBWY.Client.ViewModels
/// </summary> /// </summary>
private void LookCer(CertificateModel certificate) private void LookCer(CertificateModel certificate)
{ {
QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(certificate); QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(certificate);
lookCerWindow.Show(); lookCerWindow.Show();
} }
/// <summary> /// <summary>
@ -596,7 +608,7 @@ namespace BBWY.Client.ViewModels
{ {
InitData(); InitData();
TaskId = model.TaskId; TaskId = model.TaskId;
OrderId =model.OrderId; OrderId = model.OrderId;
SkuId = model.SkuId; SkuId = model.SkuId;
SkuName = model.ItemList[0].SkuName; SkuName = model.ItemList[0].SkuName;
Logo = model.ItemList[0].Logo.Replace("80x80", "200x200"); Logo = model.ItemList[0].Logo.Replace("80x80", "200x200");
@ -617,7 +629,7 @@ namespace BBWY.Client.ViewModels
IncreateList = new ObservableCollection<IncreateModel>(); IncreateList = new ObservableCollection<IncreateModel>();
string[] increateDatas = model.Increment1?.Split(','); string[] increateDatas = model.Increment1?.Split(',');
bool isSelected = false; bool isSelected = false;
foreach (var item in increates) foreach (var item in increates)
{ {
isSelected = false; isSelected = false;
@ -661,7 +673,7 @@ namespace BBWY.Client.ViewModels
} }
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null&&!list.Success) if (list == null && !list.Success)
{ {
PurchaseSkuList.Add(item); continue; PurchaseSkuList.Add(item); continue;
} }

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

@ -463,7 +463,7 @@ namespace BBWY.Client.Views.PackTask
for (int i = 0; i < basicProcessList.Count; i++) for (int i = 0; i < basicProcessList.Count; i++)
{ {
basicSB.AppendLine(basicProcessdata.Replace("[:index:]", $"{i}") basicSB.AppendLine(basicProcessdata.Replace("[:index:]", $"{i}")
.Replace("[:ServiceName:]", $"{basicProcessList[i].ItemName}") .Replace("[:ServiceName:]", $" {basicProcessList[i].ItemName} ")
.Replace("[:ServiceCount:]", $"{basicProcessList[i].ItemPrice}*{basicProcessList[i].ItemCount}")); .Replace("[:ServiceCount:]", $"{basicProcessList[i].ItemPrice}*{basicProcessList[i].ItemCount}"));
basiccolumns.AppendLine(columnStr); basiccolumns.AppendLine(columnStr);
} }

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

@ -131,7 +131,13 @@
<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="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="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
@ -148,12 +154,18 @@
<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="12" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="收货数量" Grid.Column="12" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="打包总价" Grid.Column="13" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="基础价格" Grid.Column="13" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="原价" Grid.Column="14" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="增量配件价" Grid.Column="14" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="促销折扣" Grid.Column="15" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="增量工序价" Grid.Column="15" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="总价" Grid.Column="16" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="打包单价" Grid.Column="16" Style="{StaticResource middleTextBlock}"/>
<TextBlock Text="操作" Grid.Column="17" 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}"/>
@ -174,10 +186,16 @@
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="15"/> <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="16"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="17"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="17"/>
<Border Height="1" VerticalAlignment="Top" Grid.ColumnSpan="18" Background="{StaticResource Border.Brush}" Grid.Row="0"/> <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" <ListBox x:Name="listbox_order"
Grid.Row="1" Grid.ColumnSpan="18" Grid.Row="1" Grid.ColumnSpan="24"
ItemsSource="{Binding PackTaskTotalList}" ItemsSource="{Binding PackTaskTotalList}"
ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}" ItemContainerStyle="{StaticResource NoBgListBoxItemStyle}"
BorderBrush="{StaticResource Border.Brush}" BorderBrush="{StaticResource Border.Brush}"
@ -203,7 +221,13 @@
<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="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="60"/>
<ColumnDefinition Width="60"/> <ColumnDefinition Width="60"/>
@ -279,29 +303,56 @@
<TextBlock Text="{Binding ConsumableFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding ConsumableFees,StringFormat=0.00}" 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="12" Margin="0 0 1 0" > <Grid Grid.Column="12" Margin="0 0 1 0" >
<TextBlock Text="{Binding PackSingleFees,StringFormat=0.00}" 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="13" Margin="0 0 1 0" >
<TextBlock Text="{Binding PackAllFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <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}"/> <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>
<Grid Grid.Column="14" Margin="0 0 1 0"> <Grid Grid.Column="17" Margin="0 0 1 0">
<TextBlock Text="{Binding Price,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding PackFees,StringFormat=0.00}" 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="15" Margin="0 0 1 0"> <Grid Grid.Column="18" Margin="0 0 1 0">
<TextBlock Text="{Binding Discount,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding FeesMode}" 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="16" Margin="0 0 1 0"> <Grid Grid.Column="19" Margin="0 0 1 0">
<TextBlock Text="{Binding DiscountPrice,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/> <TextBlock Text="{Binding DiscountFactor,StringFormat=0.00}" 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="17" Margin="0 0 1 0"> <Grid Grid.Column="20" Margin="0 0 1 0">
<TextBlock Text="{Binding PackDisCountFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="21" Margin="0 0 1 0">
<TextBlock Text="{Binding IncreaseFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
</Grid>
<Grid Grid.Column="22" Margin="0 0 1 0">
<TextBlock Text="{Binding AllFees,StringFormat=0.00}" Style="{StaticResource middleTextBlock}"/>
<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="结清" <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}}}"
CommandParameter="{Binding TaskId}" CommandParameter="{Binding TaskId}"

26
BBWY.Client/Views/PackTask/PackTaskTotal.xaml.cs

@ -49,24 +49,34 @@ namespace BBWY.Client.Views.PackTask
var data = helper.Get(url); var data = helper.Get(url);
var res = JsonConvert.DeserializeObject<ApiResponse<UserDepartment[]>>(data); var res = JsonConvert.DeserializeObject<ApiResponse<UserDepartment[]>>(data);
if (res == null)
{
System.Windows.MessageBox.Show("网络异常");
return;
}
if (!res.Success)
{
System.Windows.MessageBox.Show(res.Msg);
return;
}
//创建一个ListBoxIem //创建一个ListBoxIem
if (res.Success) if (res.Data != null && res.Data.Length > 0)
{ {
if (res.Data != null && res.Data.Length > 0) foreach (var department in res.Data)
{ {
foreach (var department in res.Data) if (!departments.Contains(department.DePartmentName))
{ {
if (!departments.Contains(department.DePartmentName)) departments.Add(department.DePartmentName);
{ }
departments.Add(department.DePartmentName);
}
}
} }
} }
} }
public string QKApiHost { get; set; } public string QKApiHost { get; set; }
public void SelectionChangeCommand(object sender, SelectionChangedEventArgs e) public void SelectionChangeCommand(object sender, SelectionChangedEventArgs e)

1
BBWY.Client/Views/TotalPackTask/PackUserSalaryList.xaml

@ -78,7 +78,6 @@
<c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0" <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
Command="{Binding SetSearchDateCommand}" Command="{Binding SetSearchDateCommand}"
CommandParameter="{StaticResource d30}"/> CommandParameter="{StaticResource d30}"/>
</StackPanel> </StackPanel>
<Grid Grid.Column="1" Grid.RowSpan="3" Margin="300 0 0 0"> <Grid Grid.Column="1" Grid.RowSpan="3" Margin="300 0 0 0">

Loading…
Cancel
Save