diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs index 6e76b533..74ef1f7d 100644 --- a/BBWY.Client/App.xaml.cs +++ b/BBWY.Client/App.xaml.cs @@ -39,6 +39,16 @@ namespace BBWY.Client return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator); } + static string GenerateRandom9Digit() + { + long timestamp = DateTime.UtcNow.ToUniversalTime().Ticks; // 64位时间戳 + string ts_str = timestamp.ToString(); // 转为字符串 + string nine_digit = ts_str.Substring(0, 9); // 取前9位 + return nine_digit; + } + + + protected override void OnStartup(StartupEventArgs e) { var isAdmin = IsAdministrator(); @@ -48,7 +58,8 @@ namespace BBWY.Client var gl = new GlobalContext(); string userToken = string.Empty; - + System.Diagnostics.Debug.WriteLine(GenerateRandom9Digit()); + System.Diagnostics.Debug.WriteLine(GenerateRandom9Digit()); #if DEBUG //仓库组测试 diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index ef760e08..34888905 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - // "QKApiHost": "http://localhost:8080" - "QKApiHost": "http://qiku.qiyue666.com" + "QKApiHost": "http://localhost:8080" + // "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/Helpers/HttpClientHelper.cs b/BBWY.Client/Helpers/HttpClientHelper.cs index e0e023d5..3c185e21 100644 --- a/BBWY.Client/Helpers/HttpClientHelper.cs +++ b/BBWY.Client/Helpers/HttpClientHelper.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Net.Http.Headers; using System.Net.Http; using System.Text; +using System.Windows; namespace BBWY.Client.Helpers { @@ -17,19 +18,28 @@ namespace BBWY.Client.Helpers public string Get(string Url) { - HttpClient client = new HttpClient(); - //设置 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) + try { - //返回响应结果 - return msg.Content.ReadAsStringAsync().Result; + HttpClient client = new HttpClient(); + //设置 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 ""; } @@ -54,22 +64,31 @@ namespace BBWY.Client.Helpers } public string Post(string Url, string JsonData) { - HttpClient client = new HttpClient(); - //设置 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) + try { - //返回响应结果 - return msg.Content.ReadAsStringAsync().Result; + HttpClient client = new HttpClient(); + //设置 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 ""; } diff --git a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs index 2064135c..0248f8d8 100644 --- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs @@ -284,10 +284,10 @@ namespace BBWY.Client.ViewModels.PackTask var res = this.packDetailService.GetPackTaskDetail(TaskId); - + 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) { @@ -310,10 +310,13 @@ namespace BBWY.Client.ViewModels.PackTask foreach (var packService in res.Data.ProcessItemList) { if (packService.ServiceType == ServiceType.打包服务) + App.Current.Dispatcher.Invoke(() => { - PackServiceList.Add(packService);//加载工序服务列表 BasicPackServiceList.Add(packService); + if (packService.Name != "贴条码") + PackServiceList.Add(packService);//加载工序服务列表 + }); } } @@ -420,7 +423,7 @@ namespace BBWY.Client.ViewModels.PackTask BasicPackProcessList.Add(new PackItemModel() { MemberList = MemberList, - PackServiceList = PackServiceList.Copy(), + PackServiceList = BasicPackServiceList.Copy(), ItemCount = item.ItemCount, ItemName = item.ItemName, SelectId = item.SelectId, @@ -577,11 +580,23 @@ namespace BBWY.Client.ViewModels.PackTask { System.Windows.MessageBox.Show("基础包装工序不能超过两道"); return; - } + } var disIncrementProcessList = IsOverCount(IncrementProcessList); 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); if (disConsumableServiceList == null) return; @@ -600,295 +615,6 @@ namespace BBWY.Client.ViewModels.PackTask 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 packServiceList = new List(); - - - - // uploadService.TaskId = TaskId; - // List uploadServices = new List(); - - // // List consumableTasks = new List(); - // ///上传 删除的数据 //上传保存数据 //上传总数据 - // List addDatas = new List(); - // List delDatas = new List(); - - // List PersonTaskModels = new List(); - - - // List allPackServiceTasks = new List(); - // List allConsumableTasks = new List(); - // FeesItemResponse feesItem = new FeesItemResponse(); ; - // List PackServiceMembers = new List(); - // //获取打包人员 - // List packUsers = new List(); - - // 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(); - // } - //} - - /// /// 更新 打包员 和费用数据 /// @@ -917,7 +643,7 @@ namespace BBWY.Client.ViewModels.PackTask { ItemCount = TaskCount, MemberList = MemberList, - PackServiceList = PackServiceList + PackServiceList = BasicPackServiceList, }); })); diff --git a/BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs b/BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs index 857b3648..5d6705ed 100644 --- a/BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs +++ b/BBWY.Client/Views/PackTask/FeesExcelControl.xaml.cs @@ -463,7 +463,7 @@ namespace BBWY.Client.Views.PackTask for (int i = 0; i < basicProcessList.Count; 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}")); basiccolumns.AppendLine(columnStr); }