From 58e989d761323fb0fab6552db1d42414e3a677cc Mon Sep 17 00:00:00 2001 From: wenjy Date: Mon, 9 Oct 2023 15:17:30 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=BB=84=E8=A3=85=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=B8=8B=E8=BE=BE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v16/.suo | Bin 491520 -> 489984 bytes Aucma.Scada.Business/AssemblyPlanBusiness.cs | 52 +- .../Aucma.Scada.Business.csproj | 1 + Aucma.Scada.Business/TaskInfoBusiness.cs | 46 + .../bin/Debug/Aucma.Scada.Business.dll | Bin 17920 -> 18944 bytes .../bin/Debug/Aucma.Scada.Business.pdb | Bin 50688 -> 56832 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 26112 -> 28160 bytes .../bin/Debug/HighWayIot.Repository.dll | Bin 33792 -> 33792 bytes .../bin/Debug/HighWayIot.Repository.pdb | Bin 130560 -> 130560 bytes ...da.Business.csproj.AssemblyReference.cache | Bin 6819 -> 7675 bytes ...da.Business.csproj.CoreCompileInputs.cache | 2 +- .../obj/Debug/Aucma.Scada.Business.dll | Bin 17920 -> 18944 bytes .../obj/Debug/Aucma.Scada.Business.pdb | Bin 50688 -> 56832 bytes Aucma.Scada.UI/Aucma.Scada.UI.csproj | 2 + .../AssemblyPlan/PlanStatusConverter.cs | 46 + .../Converter/TaskInfo/TaskStatusConverter.cs | 46 + .../AssemblyPlan/AssemblyPlanControl.xaml | 21 +- .../Page/AssemblyPlan/PlanInfoEditWindow.xaml | 9 +- .../Page/InStoreInfo/InStoreInfoControl.xaml | 10 +- .../OutStoreInfo/OutStoreInfoControl.xaml | 14 +- .../Page/TaskInfo/TaskInfoControl.xaml | 18 +- .../bin/Debug/Aucma.Scada.Business.dll | Bin 17920 -> 18944 bytes .../bin/Debug/Aucma.Scada.Business.pdb | Bin 50688 -> 56832 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe | Bin 137216 -> 140288 bytes Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb | Bin 265728 -> 275968 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 26112 -> 28160 bytes .../bin/Debug/HighWayIot.Repository.dll | Bin 33792 -> 33792 bytes .../bin/Debug/HighWayIot.Repository.pdb | Bin 130560 -> 130560 bytes .../bin/Debug/Log/2023-10-09/LogError.html | 41 + .../bin/Debug/Log/2023-10-09/LogInfo.txt | 1945 ++++++++++++ .../bin/Debug/Log/2023-10-09/PlcLog.txt | 0 .../bin/Debug/Log/2023-10-09/RfidLog.txt | 0 .../bin/Debug/Log/2023-10-09/SemaphoreLog.txt | 0 .../bin/Debug/Log/2023-10-09/SqlLog.txt | 2797 +++++++++++++++++ .../bin/Debug/Log/2023-10-09/ViewLog.txt | 0 Aucma.Scada.UI/bin/Debug/config/App.Ini | 15 +- ...ma.Scada.UI.csproj.AssemblyReference.cache | Bin 24612 -> 24612 bytes ...ma.Scada.UI.csproj.CoreCompileInputs.cache | 2 +- Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe | Bin 137216 -> 140288 bytes .../obj/Debug/Aucma.Scada.UI.g.resources | Bin 91200 -> 92468 bytes Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb | Bin 265728 -> 275968 bytes .../Debug/Aucma.Scada.UI_MarkupCompile.cache | 2 +- .../Aucma.Scada.UI_MarkupCompile.i.cache | 2 +- .../Debug/Aucma.Scada.UI_MarkupCompile.i.lref | 15 +- .../AssemblyPlan/AssemblyPlanControl.baml | Bin 12554 -> 12934 bytes .../AssemblyPlan/AssemblyPlanControl.g.cs | 3 +- .../AssemblyPlan/AssemblyPlanControl.g.i.cs | 3 +- .../Page/AssemblyPlan/PlanInfoEditWindow.baml | Bin 5346 -> 5630 bytes .../Page/AssemblyPlan/PlanInfoEditWindow.g.cs | 13 +- .../AssemblyPlan/PlanInfoEditWindow.g.i.cs | 13 +- .../Page/InStoreInfo/InStoreInfoControl.baml | Bin 8594 -> 8974 bytes .../Page/InStoreInfo/InStoreInfoControl.g.cs | 7 +- .../InStoreInfo/InStoreInfoControl.g.i.cs | 7 +- .../OutStoreInfo/OutStoreInfoControl.baml | Bin 8481 -> 8865 bytes .../OutStoreInfo/OutStoreInfoControl.g.cs | 7 +- .../OutStoreInfo/OutStoreInfoControl.g.i.cs | 7 +- .../Debug/Page/TaskInfo/TaskInfoControl.baml | Bin 4917 -> 4757 bytes .../Debug/Page/TaskInfo/TaskInfoControl.g.cs | 2 +- .../Page/TaskInfo/TaskInfoControl.g.i.cs | 2 +- .../Debug/templates/style/resourceStyle.baml | Bin 13473 -> 13473 bytes .../templates/style/resourceStyle.xaml | 1 - .../AssemblyPlan/AssemblyPlanViewModel.cs | 60 +- .../AssemblyPlan/PlanInfoEditViewModel.cs | 13 + .../OutStoreInfo/OutStoreInfoViewModel.cs | 14 +- .../viewModel/TaskInfo/TaskInfoViewModel.cs | 30 +- ...yIot.Common.csproj.AssemblyReference.cache | Bin 4860 -> 1835 bytes HighWayIot.Config/AppConfig.cs | 12 +- .../bin/Debug/HighWayIot.Config.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 26112 -> 28160 bytes ...yIot.Config.csproj.AssemblyReference.cache | Bin 4119 -> 2421 bytes .../obj/Debug/HighWayIot.Config.dll | Bin 6656 -> 6656 bytes .../obj/Debug/HighWayIot.Config.pdb | Bin 26112 -> 28160 bytes ...WayIot.Mqtt.csproj.AssemblyReference.cache | Bin 779 -> 3310 bytes ...hWayIot.Plc.csproj.AssemblyReference.cache | Bin 4622 -> 3207 bytes .../bin/Debug/HighWayIot.Config.dll | Bin 6656 -> 6656 bytes .../bin/Debug/HighWayIot.Config.pdb | Bin 26112 -> 28160 bytes .../bin/Debug/HighWayIot.Repository.dll | Bin 33792 -> 33792 bytes .../bin/Debug/HighWayIot.Repository.pdb | Bin 130560 -> 130560 bytes .../domain/ExecutePlanInfo.cs | 6 + ....Repository.csproj.AssemblyReference.cache | Bin 11108 -> 13692 bytes .../obj/Debug/HighWayIot.Repository.dll | Bin 33792 -> 33792 bytes .../obj/Debug/HighWayIot.Repository.pdb | Bin 130560 -> 130560 bytes ...WayIot.Rfid.csproj.AssemblyReference.cache | Bin 1473 -> 6149 bytes ...TouchSocket.csproj.AssemblyReference.cache | Bin 2603 -> 1160 bytes HighWayIot/bin/Debug/HighWayIot.Config.dll | Bin 6656 -> 6656 bytes HighWayIot/bin/Debug/HighWayIot.Config.pdb | Bin 26112 -> 28160 bytes .../bin/Debug/HighWayIot.Repository.dll | Bin 33792 -> 33792 bytes .../bin/Debug/HighWayIot.Repository.pdb | Bin 130560 -> 130560 bytes .../HighWayIot.csproj.AssemblyReference.cache | Bin 9214 -> 2875 bytes 91 files changed, 5184 insertions(+), 102 deletions(-) create mode 100644 Aucma.Scada.Business/TaskInfoBusiness.cs create mode 100644 Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs create mode 100644 Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-10-09/LogError.html create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-10-09/LogInfo.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-10-09/PlcLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-10-09/RfidLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-10-09/SemaphoreLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-10-09/SqlLog.txt create mode 100644 Aucma.Scada.UI/bin/Debug/Log/2023-10-09/ViewLog.txt diff --git a/.vs/HighWayIot/v16/.suo b/.vs/HighWayIot/v16/.suo index 09289e5bcb5eb56dcf9efa3dc646d515ea6be32e..4e4a8898574c627508d6715da7f5aeaad2f4f4c3 100644 GIT binary patch delta 14519 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 E5732?s{jB1 delta 21923 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 diff --git a/Aucma.Scada.Business/AssemblyPlanBusiness.cs b/Aucma.Scada.Business/AssemblyPlanBusiness.cs index ec6ac4e8..b43e15db 100644 --- a/Aucma.Scada.Business/AssemblyPlanBusiness.cs +++ b/Aucma.Scada.Business/AssemblyPlanBusiness.cs @@ -122,7 +122,7 @@ namespace Aucma.Scada.Business executePlanInfo.executeOrder = _executePlanInfoService.GetExecuteOrderByProductLineCode(appConfig.stationCode); executePlanInfo.executeStatus = 1; executePlanInfo.planAmount = transmitAmount; - executePlanInfo.beginTime = DateTime.Now; + executePlanInfo.createdTime = DateTime.Now; result = _executePlanInfoService.InsertExecutePlanInfo(executePlanInfo); if (result) @@ -213,15 +213,53 @@ namespace Aucma.Scada.Business /// 下传计划 /// /// - public void ExecutePlanInfo_NextPass(string planCode) + public ExecutePlanInfo ExecutePlanInfo_NextPass(string planCode,string nowPlanCode) { - //获取执行计划 - ExecutePlanInfo planInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(planCode); - if (planInfo != null) + ExecutePlanInfo planInfo = null; + try + { + List planInfos = new List(); + if (!string.IsNullOrEmpty(nowPlanCode)) + { + ExecutePlanInfo nowPlanInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(nowPlanCode); + if(nowPlanInfo != null) + { + nowPlanInfo.executeStatus = 1; + planInfos.Add(nowPlanInfo); + } + } + + //获取执行计划 + planInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(planCode); + if (planInfo != null) + { + //传给出库 + NextPassExecutePlanInfoEvent?.Invoke(planInfo); + + planInfo.executeStatus = 2; + planInfo.beginTime = DateTime.Now; + planInfos.Add(planInfo); + } + else + { + logHelper.Info($"执行计划下传失败,执行计划编号：{planCode}未获取到执行计划"); + return planInfo; + } + + if (planInfos.Count > 0) + { + var result = _executePlanInfoService.UpdateRangeExecutePlanInfo(planInfos); + if (result) + { + GetEexecutePlanInfosByProductLineCode(); + } + } + + }catch(Exception ex) { - //传给出库 - NextPassExecutePlanInfoEvent?.Invoke(planInfo); + logHelper.Error("计划下传异常", ex); } + return planInfo; } } } diff --git a/Aucma.Scada.Business/Aucma.Scada.Business.csproj b/Aucma.Scada.Business/Aucma.Scada.Business.csproj index 77b3285e..7dfc7eae 100644 --- a/Aucma.Scada.Business/Aucma.Scada.Business.csproj +++ b/Aucma.Scada.Business/Aucma.Scada.Business.csproj @@ -46,6 +46,7 @@ + diff --git a/Aucma.Scada.Business/TaskInfoBusiness.cs b/Aucma.Scada.Business/TaskInfoBusiness.cs new file mode 100644 index 00000000..a8ee33ab --- /dev/null +++ b/Aucma.Scada.Business/TaskInfoBusiness.cs @@ -0,0 +1,46 @@ +using HighWayIot.Config; +using HighWayIot.Log4net; +using HighWayIot.Repository.domain; +using HighWayIot.Repository.service; +using HighWayIot.Repository.service.Impl; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Scada.Business +{ + public sealed class TaskInfoBusiness + { + private static readonly Lazy lazy = new Lazy(() => new TaskInfoBusiness()); + public static TaskInfoBusiness Instance + { + get + { + return lazy.Value; + } + } + + private LogHelper logHelper = LogHelper.Instance; + + private AppConfig appConfig = AppConfig.Instance; + + private IRealTaskInfoService taskInfoService = new RealTaskInfoServiceImpl(); + + public TaskInfoBusiness() + { + + } + + /// + /// 获取计划列表 + /// + /// + /// + public List GetTaskInfos(int taskType) + { + return taskInfoService.GetTaskInfosByStoreCode(new string[] { appConfig.shellStoreCode, appConfig.linerStoreCode }, taskType); + } + } +} diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index b25b20dfcd0ccb53020b4b31c8769850434bd0d0..33d04e8602d3acd6904bbe820d95791536348d00 100644 GIT binary patch delta 8176 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 BqrLzD diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index f83b67b098123709e22d56eef682088126687c5b..17eb86f506f42df31144526b3d0acf4140a1d960 100644 GIT binary patch delta 8388 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 delta 6080 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 diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll index ccfce66c8cfe6946420d14682b8ff2bd85ad40df..d547e9f168beb0fc1e9f96c8e55b9f19f5f2e98f 100644 GIT binary patch delta 1560 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 delta 9186 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 diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache index a99dc61a..d12d0cfa 100644 --- a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache +++ b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -5688e2e412368ec46789c0d63f0ae7f9b6a08427 +e8387b0c5844bceebdf1708a1ad31b3a6f43c6e9 diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index b25b20dfcd0ccb53020b4b31c8769850434bd0d0..33d04e8602d3acd6904bbe820d95791536348d00 100644 GIT binary patch delta 8176 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 BqrLzD diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index f83b67b098123709e22d56eef682088126687c5b..17eb86f506f42df31144526b3d0acf4140a1d960 100644 GIT binary patch delta 8388 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 delta 6080 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 diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 56eef5fa..7fa163da 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -91,8 +91,10 @@ MSBuild:Compile Designer + + AssemblyPlanControl.xaml diff --git a/Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs b/Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs new file mode 100644 index 00000000..b2c3393e --- /dev/null +++ b/Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace Aucma.Scada.UI.Converter.AssemblyPlan +{ + public class PlanStatusConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value == null) + { + return false; + } + else + { + int info = (int)value; + string result = ""; + switch (info) + { + case 1: + result = "待执行"; + break; + case 2: + result = "执行中"; + break; + case 3: + result = "完成"; + break; + default: + break; + } + return result; + } + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs b/Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs new file mode 100644 index 00000000..d42134ff --- /dev/null +++ b/Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; + +namespace Aucma.Scada.UI.Converter.TaskInfo +{ + public class TaskStatusConverter : IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (value == null) + { + return false; + } + else + { + int info = (int)value; + string result = ""; + switch (info) + { + case 1: + result = "待执行"; + break; + case 2: + result = "执行中"; + break; + case 3: + result = "完成"; + break; + default: + break; + } + return result; + } + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml index 416abac8..196f13cd 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml @@ -5,8 +5,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" + xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan" mc:Ignorable="d" d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent"> + + + @@ -208,21 +212,23 @@ Foreground="Gray" > - - + + + + -