diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index 530ad1f9..dce7da05 100644 Binary files a/.vs/HighWayIot/v17/.suo and b/.vs/HighWayIot/v17/.suo differ diff --git a/Aucma.Scada.Business/AssemblyPlanBusiness.cs b/Aucma.Scada.Business/AssemblyPlanBusiness.cs index b43e15db..d4f1df1e 100644 --- a/Aucma.Scada.Business/AssemblyPlanBusiness.cs +++ b/Aucma.Scada.Business/AssemblyPlanBusiness.cs @@ -1,13 +1,11 @@ -using HighWayIot.Config; +using Aucma.Scada.Model.domain; +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 { @@ -48,7 +46,7 @@ namespace Aucma.Scada.Business public AssemblyPlanBusiness() { - + } @@ -80,8 +78,8 @@ namespace Aucma.Scada.Business List planInfos = null; try { - planInfos = _executePlanInfoService.GetExecutePlanInfosByProductLineCode(appConfig.stationCode).OrderBy(x=>x.executeOrder).ToList(); - if(planInfos != null) + planInfos = _executePlanInfoService.GetExecutePlanInfosByProductLineCode(appConfig.stationCode).OrderBy(x => x.executeOrder).ToList(); + if (planInfos != null) { //for(int i = 0; i < planInfos.Count; i++) //{ @@ -104,7 +102,7 @@ namespace Aucma.Scada.Business /// /// /// - public bool PlanTransmitByProductPlan(string productPlanCode,int transmitAmount) + public bool PlanTransmitByProductPlan(string productPlanCode, int transmitAmount) { bool result = false; try @@ -142,10 +140,10 @@ namespace Aucma.Scada.Business /// 执行计划上移 /// /// - public void ExecutePlanInfo_MoveUp(List executePlanInfos,string executePlanCode) + public void ExecutePlanInfo_MoveUp(List executePlanInfos, string executePlanCode) { List executePlans = new List(); - if(executePlanInfos != null) + if (executePlanInfos != null) { ExecutePlanInfo planInfo = executePlanInfos.Where(x => x.executePlanCode == executePlanCode).First(); int executeOrder = planInfo.executeOrder; @@ -213,7 +211,7 @@ namespace Aucma.Scada.Business /// 下传计划 /// /// - public ExecutePlanInfo ExecutePlanInfo_NextPass(string planCode,string nowPlanCode) + public ExecutePlanInfo ExecutePlanInfo_NextPass(string planCode, string nowPlanCode) { ExecutePlanInfo planInfo = null; try @@ -222,7 +220,7 @@ namespace Aucma.Scada.Business if (!string.IsNullOrEmpty(nowPlanCode)) { ExecutePlanInfo nowPlanInfo = _executePlanInfoService.GetExecutePlanInfoByPlanCode(nowPlanCode); - if(nowPlanInfo != null) + if (nowPlanInfo != null) { nowPlanInfo.executeStatus = 1; planInfos.Add(nowPlanInfo); @@ -254,8 +252,9 @@ namespace Aucma.Scada.Business GetEexecutePlanInfosByProductLineCode(); } } - - }catch(Exception ex) + + } + catch (Exception ex) { logHelper.Error("计划下传异常", ex); } diff --git a/Aucma.Scada.Business/Aucma.Scada.Business.csproj b/Aucma.Scada.Business/Aucma.Scada.Business.csproj index 90ad8142..8794c1d4 100644 --- a/Aucma.Scada.Business/Aucma.Scada.Business.csproj +++ b/Aucma.Scada.Business/Aucma.Scada.Business.csproj @@ -51,6 +51,10 @@ + + {320B716A-2373-4342-B0AA-3C4CB041E8AD} + Aucma.Scada.Model + {89a1edd9-d79e-468d-b6d3-7d07b8843562} HighWayIot.Common diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs index 6b5e3f1b..995cab29 100644 --- a/Aucma.Scada.Business/InStoreBusiness.cs +++ b/Aucma.Scada.Business/InStoreBusiness.cs @@ -1,12 +1,9 @@ -using HighWayIot.Config; +using Aucma.Scada.Model.domain; +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; using System.Threading.Tasks; @@ -45,7 +42,7 @@ namespace Aucma.Scada.Business /// /// /// - public delegate void RefreshScanMateriaCode(string materialCode,string materialName,string spaceName,string materialType); + public delegate void RefreshScanMateriaCode(string materialCode, string materialName, string spaceName, string materialType); public event RefreshScanMateriaCode RefreshScanMateriaCodeEvent; /// @@ -103,7 +100,7 @@ namespace Aucma.Scada.Business //生成入库任务依次下发至PLC RealTaskInfo realTaskInfo = new RealTaskInfo(); realTaskInfo.taskType = 1; - realTaskInfo.taskCode = System.Guid.NewGuid().ToString("N").Substring(0,6); + realTaskInfo.taskCode = System.Guid.NewGuid().ToString("N").Substring(0, 6); realTaskInfo.storeCode = spaceInfo.storeCode; realTaskInfo.spaceCode = spaceInfo.spaceCode; realTaskInfo.materialType = spaceInfo.materialType; @@ -161,7 +158,7 @@ namespace Aucma.Scada.Business private void PassDownShellTask() { RealTaskInfo taskInfo = GetAwaitSendTask(appConfig.shellStoreCode); - if(taskInfo != null) + if (taskInfo != null) { PrintLogInfoMessage($"下发箱壳入库任务：{taskInfo.taskCode}；仓库{taskInfo.storeCode}；货道：{taskInfo.spaceCode}"); @@ -192,7 +189,7 @@ namespace Aucma.Scada.Business private void PassDownLinerTask() { RealTaskInfo taskInfo = GetAwaitSendTask(appConfig.linerStoreCode); - if(taskInfo != null) + if (taskInfo != null) { PrintLogInfoMessage($"下发内胆入库任务：{taskInfo.taskCode}；仓库{taskInfo.storeCode}；货道：{taskInfo.spaceCode}"); @@ -228,7 +225,7 @@ namespace Aucma.Scada.Business { taskInfo = _taskInfoService.GetTaskInfoByStoreCode(storeCode, 1); - if(taskInfo != null) + if (taskInfo != null) { taskInfo.taskStatus = 2; _taskInfoService.UpdateTaskInfo(taskInfo); @@ -275,7 +272,7 @@ namespace Aucma.Scada.Business /// /// /// - private void InStoreFinish(string taskCode,string storeCode) + private void InStoreFinish(string taskCode, string storeCode) { try { diff --git a/Aucma.Scada.Business/InventoryInfoBusiness.cs b/Aucma.Scada.Business/InventoryInfoBusiness.cs index 3c9ca84f..3fd3a60d 100644 --- a/Aucma.Scada.Business/InventoryInfoBusiness.cs +++ b/Aucma.Scada.Business/InventoryInfoBusiness.cs @@ -1,13 +1,10 @@ -using HighWayIot.Config; +using Aucma.Scada.Model.domain; +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 { @@ -52,8 +49,9 @@ namespace Aucma.Scada.Business List spaceInfos = null; try { - spaceInfos =_spaceInfoService.GetSpaceInfosByStoreCode(storeCode); - }catch(Exception ex) + spaceInfos = _spaceInfoService.GetSpaceInfosByStoreCode(storeCode); + } + catch (Exception ex) { logHelper.Error("获取货道信息异常", ex); } @@ -65,12 +63,12 @@ namespace Aucma.Scada.Business /// /// /// - public bool UpdateInStoreFlag(string storeCode,string spaceCode) + public bool UpdateInStoreFlag(string storeCode, string spaceCode) { bool result = false; try { - + BaseSpaceInfo spaceInfo = _spaceInfoService.GetSpaceInfoBySpaceCode(storeCode, spaceCode); if (spaceInfo != null) { @@ -78,7 +76,8 @@ namespace Aucma.Scada.Business result = _spaceInfoService.UpdateSpaceInfo(spaceInfo); logHelper.Info($"修改仓库：{storeCode}；货道：{spaceCode}；入库标识：{spaceInfo.inStoreFlag};修改{(result == true ? "成功" : "失败")}"); } - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("修改货道入库标识异常", ex); } @@ -91,7 +90,7 @@ namespace Aucma.Scada.Business /// /// /// - public bool UpdateOutStoreFlag(string storeCode,string spaceCode) + public bool UpdateOutStoreFlag(string storeCode, string spaceCode) { bool result = false; try @@ -145,7 +144,7 @@ namespace Aucma.Scada.Business /// /// /// - public bool UpdateSpaceStatus(string storeCode,string spaceCode) + public bool UpdateSpaceStatus(string storeCode, string spaceCode) { bool result = false; try @@ -172,10 +171,10 @@ namespace Aucma.Scada.Business /// /// /// - public void RefreshBaseSpaceDetails(string storeCode,string spaceCode) + public void RefreshBaseSpaceDetails(string storeCode, string spaceCode) { List spaceDetails = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, spaceCode); - if(spaceDetails != null) + if (spaceDetails != null) { RefreshSpaceDetailsEvent?.Invoke(spaceDetails); } diff --git a/Aucma.Scada.Business/MainBusiness.cs b/Aucma.Scada.Business/MainBusiness.cs index 0b8aea71..8312135f 100644 --- a/Aucma.Scada.Business/MainBusiness.cs +++ b/Aucma.Scada.Business/MainBusiness.cs @@ -1,15 +1,6 @@ using HighWayIot.Config; -using HighWayIot.Log4net; using HighWayIot.Plc; -using HighWayIot.Plc.Impl; -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 { diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 6c0920c2..b28682a5 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -1,12 +1,11 @@ -using HighWayIot.Config; +using Aucma.Scada.Model.domain; +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; using System.Threading.Tasks; @@ -85,7 +84,7 @@ namespace Aucma.Scada.Business string taskCode = DateTime.Now.ToString("HH:mm:ss"); var shellBomInfo = _bomInfoService.GetChildenBomInfoByMaterialCode(planInfo.materialCode, appConfig.shellMaterialType); var linerBomInfo = _bomInfoService.GetChildenBomInfoByMaterialCode(planInfo.materialCode, appConfig.linerMaterialType); - for (int i = 0; i < planInfo.planAmount-planInfo.completeAmount; i++) + for (int i = 0; i < planInfo.planAmount - planInfo.completeAmount; i++) { OutStore(appConfig.shellStoreCode, shellBomInfo, planInfo.executePlanCode, taskCode); Thread.Sleep(500); @@ -104,7 +103,7 @@ namespace Aucma.Scada.Business /// /// /// - private void OutStore(string storeCode, BaseBomInfo bomInfo,string planCode,string taskCode) + private void OutStore(string storeCode, BaseBomInfo bomInfo, string planCode, string taskCode) { try { @@ -113,7 +112,7 @@ namespace Aucma.Scada.Business if (spaceInfo != null) { PrintLogInfoMessage($"匹配货道：{spaceInfo.spaceName}"); - // RefreshScanMateriaCodeEvent?.Invoke(materiaclCode, materialType, spaceInfo.spaceName, storeCode); //刷新界面扫码信息 + // RefreshScanMateriaCodeEvent?.Invoke(materiaclCode, materialType, spaceInfo.spaceName, storeCode); //刷新界面扫码信息 CreateOutStoreTask(spaceInfo, planCode, taskCode); //创建出库任务 } else @@ -132,7 +131,7 @@ namespace Aucma.Scada.Business /// 创建出库任务 /// /// - private bool CreateOutStoreTask(BaseSpaceInfo spaceInfo, string planCode,string taksCode,int taskModel=0) + private bool CreateOutStoreTask(BaseSpaceInfo spaceInfo, string planCode, string taksCode, int taskModel = 0) { bool result = false; try @@ -172,7 +171,8 @@ namespace Aucma.Scada.Business PrintLogInfoMessage("出库任务创建失败"); } } - }catch(Exception ex) + } + catch (Exception ex) { PrintLogErrorMessage("出库任务创建异常", ex); } @@ -198,7 +198,8 @@ namespace Aucma.Scada.Business spaceDetail = spaceDetails.OrderBy(x => x.createTime).First(); } } - }catch(Exception ex) + } + catch (Exception ex) { PrintLogErrorMessage("获取货道明细信息异常", ex); } @@ -210,7 +211,7 @@ namespace Aucma.Scada.Business /// /// /// - private void UpdateSpaceAndDetial(BaseSpaceInfo spaceInfo,BaseSpaceDetail spaceDetail,int detailIsFlag = 1,bool stockFlag = true) + private void UpdateSpaceAndDetial(BaseSpaceInfo spaceInfo, BaseSpaceDetail spaceDetail, int detailIsFlag = 1, bool stockFlag = true) { //任务创建完成后修改货道库存、货道明细修改物料标识物料不可用 spaceDetail.isFlag = detailIsFlag; @@ -224,7 +225,7 @@ namespace Aucma.Scada.Business { spaceInfo.spaceStock = spaceInfo.spaceStock + 1; } - + _spaceInfoService.UpdateSpaceInfo(spaceInfo); } @@ -258,7 +259,7 @@ namespace Aucma.Scada.Business string shellCode = string.Empty; string linerCode = string.Empty; string taskCode = string.Empty; - int iFlag= 0; + int iFlag = 0; completedTasks = 0; //获取待执行的出库任务下发至PLC,并将任务状态改为执行中 @@ -286,7 +287,7 @@ namespace Aucma.Scada.Business } shellCode = item.materialCode; } - else if(item.storeCode == appConfig.linerStoreCode) + else if (item.storeCode == appConfig.linerStoreCode) { if (taskHandleBusiness.SendLinerTask_OutStore(item)) { @@ -301,12 +302,12 @@ namespace Aucma.Scada.Business } linerCode = item.materialCode; } - + RefreshScanMateriaCodeEvent?.Invoke(item.materialCode, item.materialType, item.spaceName, item.storeCode); } - - if(iFlag == taskInfoList.Count) + + if (iFlag == taskInfoList.Count) { _taskInfoService.UpdateRangeTaskInfo(taskInfoList); @@ -344,9 +345,9 @@ namespace Aucma.Scada.Business List taskInfos = new List(); try { - RealTaskInfo shellTaskInfo = _taskInfoService.GetTaskInfoByStoreCode(appConfig.shellStoreCode,2); + RealTaskInfo shellTaskInfo = _taskInfoService.GetTaskInfoByStoreCode(appConfig.shellStoreCode, 2); - if(shellTaskInfo != null) + if (shellTaskInfo != null) { taskInfos.Add(shellTaskInfo); //获取与箱壳任务匹配的内胆任务 @@ -365,7 +366,7 @@ namespace Aucma.Scada.Business // _taskInfoService.UpdateRangeTaskInfo(taskInfos); //} } - catch(Exception ex) + catch (Exception ex) { PrintLogErrorMessage("获取待执行的出库任务异常", ex); } @@ -379,7 +380,7 @@ namespace Aucma.Scada.Business /// private void TaskFeedback(string storeCode, string taskCode) { - if(storeCode == appConfig.shellStoreCode) + if (storeCode == appConfig.shellStoreCode) { ShellTaskFeedback(taskCode); } @@ -498,13 +499,13 @@ namespace Aucma.Scada.Business /// /// /// - public bool OutOnlyOneBySpaceCode(string storeCode,string spaceCode) + public bool OutOnlyOneBySpaceCode(string storeCode, string spaceCode) { bool result = false; try { BaseSpaceInfo spaceInfo = _spaceInfoService.GetSpaceInfoBySpaceCode(storeCode, spaceCode); - if(spaceInfo.spaceStock > 0) + if (spaceInfo.spaceStock > 0) { result = this.CreateOutStoreTask(spaceInfo, System.Guid.NewGuid().ToString("N"), DateTime.Now.ToString("HH:mm:ss"), 1); } @@ -512,7 +513,8 @@ namespace Aucma.Scada.Business { PrintLogInfoMessage($"仓库：{storeCode}；货道：{spaceCode}；出一个失败：库存不足"); } - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("根据货道出一个异常", ex); } diff --git a/Aucma.Scada.Business/Properties/AssemblyInfo.cs b/Aucma.Scada.Business/Properties/AssemblyInfo.cs index f341fa84..3450bffb 100644 --- a/Aucma.Scada.Business/Properties/AssemblyInfo.cs +++ b/Aucma.Scada.Business/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/Aucma.Scada.Business/TaskHandleBusiness.cs b/Aucma.Scada.Business/TaskHandleBusiness.cs index 80560663..9ef6e478 100644 --- a/Aucma.Scada.Business/TaskHandleBusiness.cs +++ b/Aucma.Scada.Business/TaskHandleBusiness.cs @@ -1,15 +1,9 @@ -using HighWayIot.Common; +using Aucma.Scada.Model.domain; using HighWayIot.Config; using HighWayIot.Log4net; using HighWayIot.Plc; -using HighWayIot.Plc.Impl; -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; using System.Threading.Tasks; @@ -267,7 +261,7 @@ namespace Aucma.Scada.Business { Task.Run(() => { - + if (_plc != null) { if (_plc.IsConnected) diff --git a/Aucma.Scada.Business/TaskInfoBusiness.cs b/Aucma.Scada.Business/TaskInfoBusiness.cs index b8197a7e..ce72e77f 100644 --- a/Aucma.Scada.Business/TaskInfoBusiness.cs +++ b/Aucma.Scada.Business/TaskInfoBusiness.cs @@ -1,13 +1,10 @@ -using HighWayIot.Config; +using Aucma.Scada.Model.domain; +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 { @@ -40,7 +37,7 @@ namespace Aucma.Scada.Business /// public List GetTaskInfos(int taskType) { - return taskInfoService.GetTaskInfosByTaskStatus(new string[] { appConfig.shellStoreCode, appConfig.linerStoreCode }, taskType,0); + return taskInfoService.GetTaskInfosByTaskStatus(new string[] { appConfig.shellStoreCode, appConfig.linerStoreCode }, taskType, 0); } } } diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll index e44ff1a0..e48db699 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb index 2e8a4031..8d8cc736 100644 Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll new file mode 100644 index 00000000..ac2c9356 Binary files /dev/null and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb new file mode 100644 index 00000000..965e7e48 Binary files /dev/null and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll index a430d27c..0aef53b1 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb index 5500b11f..05fb1cc8 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll index 8d8d66d6..304d70f2 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb index 5bc8efae..c1fba409 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll index a7cf79c5..46fc0b5d 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb index b0e1943e..fa9f6fe9 100644 Binary files a/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache index bdf610b6..1630b5fb 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache differ 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 c065fb37..b9d5652b 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 @@ -e95491ca2dbbb0933e831785e126e790f729e224 +185c60829673f2e3cfd6d120f59a44345aa66057 diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt index f8830683..45506fb7 100644 --- a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt +++ b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt @@ -67,3 +67,5 @@ E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Sc E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.csproj.CopyComplete E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.dll E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.Business\obj\Debug\Aucma.Scada.Business.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Business\bin\Debug\Aucma.Scada.Model.pdb diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll index e44ff1a0..e48db699 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb index 2e8a4031..8d8cc736 100644 Binary files a/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5f759a64..221ec88e 100644 Binary files a/Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Aucma.Scada.Model/Aucma.Scada.Model.csproj b/Aucma.Scada.Model/Aucma.Scada.Model.csproj new file mode 100644 index 00000000..7a76b95a --- /dev/null +++ b/Aucma.Scada.Model/Aucma.Scada.Model.csproj @@ -0,0 +1,61 @@ + + + + + Debug + AnyCPU + {320B716A-2373-4342-B0AA-3C4CB041E8AD} + Library + Properties + Aucma.Scada.Model + Aucma.Scada.Model + v4.8 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\HighWayIot.Repository\bin\Debug\SqlSugar.dll + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Aucma.Scada.Model/Properties/AssemblyInfo.cs b/Aucma.Scada.Model/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..c2b310f6 --- /dev/null +++ b/Aucma.Scada.Model/Properties/AssemblyInfo.cs @@ -0,0 +1,35 @@ +using System.Reflection; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("Aucma.Scada.Model")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Aucma.Scada.Model")] +[assembly: AssemblyCopyright("Copyright © 2023")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("320b716a-2373-4342-b0aa-3c4cb041e8ad")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll new file mode 100644 index 00000000..ac2c9356 Binary files /dev/null and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb new file mode 100644 index 00000000..965e7e48 Binary files /dev/null and b/Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.Model/bin/Debug/SqlSugar.dll b/Aucma.Scada.Model/bin/Debug/SqlSugar.dll new file mode 100644 index 00000000..fcb0e212 Binary files /dev/null and b/Aucma.Scada.Model/bin/Debug/SqlSugar.dll differ diff --git a/HighWayIot.Repository/domain/BaseBomInfo.cs b/Aucma.Scada.Model/domain/BaseBomInfo.cs similarity index 92% rename from HighWayIot.Repository/domain/BaseBomInfo.cs rename to Aucma.Scada.Model/domain/BaseBomInfo.cs index 9d6397fd..cc71307c 100644 --- a/HighWayIot.Repository/domain/BaseBomInfo.cs +++ b/Aucma.Scada.Model/domain/BaseBomInfo.cs @@ -1,11 +1,6 @@ using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace HighWayIot.Repository.domain +namespace Aucma.Scada.Model.domain { [SugarTable("BASE_BOMINFO")] public class BaseBomInfo diff --git a/HighWayIot.Repository/domain/BaseSpaceDetail.cs b/Aucma.Scada.Model/domain/BaseSpaceDetail.cs similarity index 92% rename from HighWayIot.Repository/domain/BaseSpaceDetail.cs rename to Aucma.Scada.Model/domain/BaseSpaceDetail.cs index 0a2e65c5..c12978fa 100644 --- a/HighWayIot.Repository/domain/BaseSpaceDetail.cs +++ b/Aucma.Scada.Model/domain/BaseSpaceDetail.cs @@ -1,11 +1,7 @@ using SqlSugar; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace HighWayIot.Repository.domain +namespace Aucma.Scada.Model.domain { /// /// 货道明细 diff --git a/HighWayIot.Repository/domain/BaseSpaceInfo.cs b/Aucma.Scada.Model/domain/BaseSpaceInfo.cs similarity index 94% rename from HighWayIot.Repository/domain/BaseSpaceInfo.cs rename to Aucma.Scada.Model/domain/BaseSpaceInfo.cs index 9e77a430..d43b011f 100644 --- a/HighWayIot.Repository/domain/BaseSpaceInfo.cs +++ b/Aucma.Scada.Model/domain/BaseSpaceInfo.cs @@ -1,11 +1,6 @@ using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace HighWayIot.Repository.domain +namespace Aucma.Scada.Model.domain { /// /// 货道信息 diff --git a/HighWayIot.Repository/domain/ExecutePlanInfo.cs b/Aucma.Scada.Model/domain/ExecutePlanInfo.cs similarity index 95% rename from HighWayIot.Repository/domain/ExecutePlanInfo.cs rename to Aucma.Scada.Model/domain/ExecutePlanInfo.cs index a9d56544..f1741a5b 100644 --- a/HighWayIot.Repository/domain/ExecutePlanInfo.cs +++ b/Aucma.Scada.Model/domain/ExecutePlanInfo.cs @@ -1,11 +1,7 @@ using SqlSugar; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace HighWayIot.Repository.domain +namespace Aucma.Scada.Model.domain { [SugarTable("EXECUTE_PLANINFO")] public class ExecutePlanInfo diff --git a/HighWayIot.Repository/domain/ProductPlanInfo.cs b/Aucma.Scada.Model/domain/ProductPlanInfo.cs similarity index 94% rename from HighWayIot.Repository/domain/ProductPlanInfo.cs rename to Aucma.Scada.Model/domain/ProductPlanInfo.cs index 8367b925..db1338ad 100644 --- a/HighWayIot.Repository/domain/ProductPlanInfo.cs +++ b/Aucma.Scada.Model/domain/ProductPlanInfo.cs @@ -1,11 +1,7 @@ using SqlSugar; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace HighWayIot.Repository.domain +namespace Aucma.Scada.Model.domain { [SugarTable("PRODUCT_PLANINFO")] public class ProductPlanInfo diff --git a/HighWayIot.Repository/domain/RealTaskInfo.cs b/Aucma.Scada.Model/domain/RealTaskInfo.cs similarity index 93% rename from HighWayIot.Repository/domain/RealTaskInfo.cs rename to Aucma.Scada.Model/domain/RealTaskInfo.cs index 2053e9e4..28502c1d 100644 --- a/HighWayIot.Repository/domain/RealTaskInfo.cs +++ b/Aucma.Scada.Model/domain/RealTaskInfo.cs @@ -1,11 +1,7 @@ using SqlSugar; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace HighWayIot.Repository.domain +namespace Aucma.Scada.Model.domain { [SugarTable("REAL_TASKINFO")] public class RealTaskInfo @@ -13,7 +9,7 @@ namespace HighWayIot.Repository.domain /// /// 主键标识 /// - [SugarColumn(ColumnName = "OBJID", IsPrimaryKey = true, IsIdentity = true,OracleSequenceName = "SEQ_REAL_TASK_INFO")] + [SugarColumn(ColumnName = "OBJID", IsPrimaryKey = true, IsIdentity = true, OracleSequenceName = "SEQ_REAL_TASK_INFO")] public int objId { get; set; } /// diff --git a/HighWayIot.Repository/domain/SysUserInfo.cs b/Aucma.Scada.Model/domain/SysUserInfo.cs similarity index 77% rename from HighWayIot.Repository/domain/SysUserInfo.cs rename to Aucma.Scada.Model/domain/SysUserInfo.cs index 4fd79ac7..8b5e980a 100644 --- a/HighWayIot.Repository/domain/SysUserInfo.cs +++ b/Aucma.Scada.Model/domain/SysUserInfo.cs @@ -1,12 +1,6 @@ using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Principal; -using System.Text; -using System.Threading.Tasks; -namespace HighWayIot.Repository.domain +namespace Aucma.Scada.Model.domain { /// /// 用户信息 @@ -31,7 +25,7 @@ namespace HighWayIot.Repository.domain /// [SugarColumn(ColumnName = "PASSWORD")] public string password { get; set; } - + } } diff --git a/HighWayIot.Repository/enums/OperationType.cs b/Aucma.Scada.Model/dto/OperationType.cs similarity index 56% rename from HighWayIot.Repository/enums/OperationType.cs rename to Aucma.Scada.Model/dto/OperationType.cs index fd6593f4..0d2d5e8f 100644 --- a/HighWayIot.Repository/enums/OperationType.cs +++ b/Aucma.Scada.Model/dto/OperationType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HighWayIot.Repository.enums +namespace Aucma.Scada.Model.enums { public enum OperationType { diff --git a/Aucma.Scada.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/Aucma.Scada.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs new file mode 100644 index 00000000..15efebfc --- /dev/null +++ b/Aucma.Scada.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache new file mode 100644 index 00000000..fa9ca245 Binary files /dev/null and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CopyComplete b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CopyComplete new file mode 100644 index 00000000..e69de29b diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache new file mode 100644 index 00000000..06657274 --- /dev/null +++ b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +f21fa175ee2704029739090502d89e171b1728e9 diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt new file mode 100644 index 00000000..6e7ab92e --- /dev/null +++ b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt @@ -0,0 +1,8 @@ +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\bin\Debug\Aucma.Scada.Model.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\bin\Debug\SqlSugar.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.AssemblyReference.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CoreCompileInputs.cache +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.csproj.CopyComplete +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.Model\obj\Debug\Aucma.Scada.Model.pdb diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll new file mode 100644 index 00000000..ac2c9356 Binary files /dev/null and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb new file mode 100644 index 00000000..965e7e48 Binary files /dev/null and b/Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 00000000..a4fda499 Binary files /dev/null and b/Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Aucma.Scada.UI/App.xaml.cs b/Aucma.Scada.UI/App.xaml.cs index 8372e7f7..e0a13b3b 100644 --- a/Aucma.Scada.UI/App.xaml.cs +++ b/Aucma.Scada.UI/App.xaml.cs @@ -2,10 +2,6 @@ using HighWayIot.Log4net; using Lierda.WPFHelper; using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; using System.Threading.Tasks; using System.Windows; using System.Windows.Threading; @@ -23,7 +19,7 @@ namespace Aucma.Scada.UI LierdaCracker cracker = new LierdaCracker(); - private MainBusiness mainBusiness = MainBusiness.Instance; + private MainBusiness mainBusiness = MainBusiness.Instance; public App() { diff --git a/Aucma.Scada.UI/Aucma.Scada.UI.csproj b/Aucma.Scada.UI/Aucma.Scada.UI.csproj index 64a4ce6d..febf3050 100644 --- a/Aucma.Scada.UI/Aucma.Scada.UI.csproj +++ b/Aucma.Scada.UI/Aucma.Scada.UI.csproj @@ -244,6 +244,10 @@ {004383BC-659A-41A5-9176-D60831B08438} Aucma.Scada.Business + + {320b716a-2373-4342-b0aa-3c4cb041e8ad} + Aucma.Scada.Model + {89a1edd9-d79e-468d-b6d3-7d07b8843562} HighWayIot.Common diff --git a/Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs b/Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs index b2c3393e..266918d7 100644 --- a/Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs +++ b/Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs @@ -1,9 +1,5 @@ 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 diff --git a/Aucma.Scada.UI/Converter/LinerInventory/StatusLabelConverter.cs b/Aucma.Scada.UI/Converter/LinerInventory/StatusLabelConverter.cs index 966246d9..99ff2a01 100644 --- a/Aucma.Scada.UI/Converter/LinerInventory/StatusLabelConverter.cs +++ b/Aucma.Scada.UI/Converter/LinerInventory/StatusLabelConverter.cs @@ -1,10 +1,6 @@ using HighWayIot.Common; 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.LinerInventory @@ -14,7 +10,7 @@ namespace Aucma.Scada.UI.Converter.LinerInventory private StringChange stringChange = StringChange.Instance; public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - if(value == null) + if (value == null) { return false; } @@ -31,7 +27,7 @@ namespace Aucma.Scada.UI.Converter.LinerInventory return "red"; } } - + } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/Aucma.Scada.UI/Converter/ShellInventory/StatusLabelConverter.cs b/Aucma.Scada.UI/Converter/ShellInventory/StatusLabelConverter.cs index bf439e81..8805d356 100644 --- a/Aucma.Scada.UI/Converter/ShellInventory/StatusLabelConverter.cs +++ b/Aucma.Scada.UI/Converter/ShellInventory/StatusLabelConverter.cs @@ -1,10 +1,6 @@ using HighWayIot.Common; 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.ShellInventory @@ -14,7 +10,7 @@ namespace Aucma.Scada.UI.Converter.ShellInventory private StringChange stringChange = StringChange.Instance; public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - if(value == null) + if (value == null) { return false; } @@ -31,7 +27,7 @@ namespace Aucma.Scada.UI.Converter.ShellInventory return "red"; } } - + } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs b/Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs index d42134ff..5eafa8c1 100644 --- a/Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs +++ b/Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs @@ -1,9 +1,5 @@ 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 diff --git a/Aucma.Scada.UI/Converter/TaskInfo/TaskTypeConverter.cs b/Aucma.Scada.UI/Converter/TaskInfo/TaskTypeConverter.cs index a082fb76..5f80ac79 100644 --- a/Aucma.Scada.UI/Converter/TaskInfo/TaskTypeConverter.cs +++ b/Aucma.Scada.UI/Converter/TaskInfo/TaskTypeConverter.cs @@ -1,9 +1,5 @@ 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 diff --git a/Aucma.Scada.UI/LogInfoControl.xaml.cs b/Aucma.Scada.UI/LogInfoControl.xaml.cs index e33b5662..f809cce3 100644 --- a/Aucma.Scada.UI/LogInfoControl.xaml.cs +++ b/Aucma.Scada.UI/LogInfoControl.xaml.cs @@ -1,18 +1,5 @@ using Aucma.Scada.UI.viewModel; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI { diff --git a/Aucma.Scada.UI/MainWindow.xaml.cs b/Aucma.Scada.UI/MainWindow.xaml.cs index 7a0dbf40..5171fef6 100644 --- a/Aucma.Scada.UI/MainWindow.xaml.cs +++ b/Aucma.Scada.UI/MainWindow.xaml.cs @@ -1,19 +1,5 @@ using Aucma.Scada.UI.viewModel; -using HighWayIot.Config; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI { diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml.cs b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml.cs index 045101f1..0e239bad 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml.cs +++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml.cs @@ -1,18 +1,5 @@ using Aucma.Scada.UI.viewModel.AssemblyPlan; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.AssemblyPlan { diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml.cs b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml.cs index aeb817f6..791f4e27 100644 --- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml.cs +++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml.cs @@ -1,18 +1,6 @@ using Aucma.Scada.UI.viewModel.AssemblyPlan; -using HighWayIot.Repository.domain; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.AssemblyPlan { @@ -26,7 +14,7 @@ namespace Aucma.Scada.UI.Page.AssemblyPlan { InitializeComponent(); - + this.DataContext = planInfoEditViewModel; } diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml.cs b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml.cs index c9354306..9fa314ad 100644 --- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml.cs +++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml.cs @@ -1,19 +1,5 @@ -using Aucma.Scada.UI.viewModel; -using Aucma.Scada.UI.viewModel.InStoreInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using Aucma.Scada.UI.viewModel.InStoreInfo; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.InStoreInfo { diff --git a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml.cs b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml.cs index 97a966b5..1fd66eee 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml.cs +++ b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml.cs @@ -1,19 +1,5 @@ -using Aucma.Scada.UI.viewModel; -using Aucma.Scada.UI.viewModel.InventoryInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using Aucma.Scada.UI.viewModel.InventoryInfo; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.InventoryInfo { diff --git a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml.cs b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml.cs index f45267e8..55cfd57a 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml.cs +++ b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml.cs @@ -1,19 +1,5 @@ -using Aucma.Scada.UI.viewModel; -using Aucma.Scada.UI.viewModel.InventoryInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using Aucma.Scada.UI.viewModel.InventoryInfo; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.InventoryInfo { diff --git a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml.cs b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml.cs index dc853f05..acaa01ab 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml.cs +++ b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml.cs @@ -1,19 +1,5 @@ -using Aucma.Scada.UI.viewModel; -using Aucma.Scada.UI.viewModel.InventoryInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using Aucma.Scada.UI.viewModel.InventoryInfo; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.InventoryInfo { diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml.cs b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml.cs index cd861d9a..b0208434 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml.cs +++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml.cs @@ -1,17 +1,5 @@ using Aucma.Scada.UI.viewModel.InventoryInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.InventoryInfo { @@ -23,7 +11,7 @@ namespace Aucma.Scada.UI.Page.InventoryInfo public SpaceDetailWindow(string storeCode, string spaceCode) { InitializeComponent(); - SpaceDetailViewModel spaceDetailViewModel = new SpaceDetailViewModel(storeCode,spaceCode); + SpaceDetailViewModel spaceDetailViewModel = new SpaceDetailViewModel(storeCode, spaceCode); this.DataContext = spaceDetailViewModel; } } diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml.cs b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml.cs index b879af30..b7099573 100644 --- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml.cs +++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml.cs @@ -1,17 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; +using System.Windows.Controls; namespace Aucma.Scada.UI.Page.InventoryInfo { diff --git a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml.cs b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml.cs index c6b6840b..172971c5 100644 --- a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml.cs +++ b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml.cs @@ -1,18 +1,5 @@ using Aucma.Scada.UI.viewModel.OutStoreInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.OutStoreInfo { diff --git a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml.cs b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml.cs index 61e73e3a..4b6ecbc8 100644 --- a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml.cs +++ b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml.cs @@ -1,18 +1,5 @@ using Aucma.Scada.UI.viewModel.TaskInfo; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI.Page.TaskInfo { diff --git a/Aucma.Scada.UI/Properties/AssemblyInfo.cs b/Aucma.Scada.UI/Properties/AssemblyInfo.cs index a6172883..c89cbc62 100644 --- a/Aucma.Scada.UI/Properties/AssemblyInfo.cs +++ b/Aucma.Scada.UI/Properties/AssemblyInfo.cs @@ -1,6 +1,4 @@ using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; diff --git a/Aucma.Scada.UI/RecordControl.xaml.cs b/Aucma.Scada.UI/RecordControl.xaml.cs index af7d1265..d6442944 100644 --- a/Aucma.Scada.UI/RecordControl.xaml.cs +++ b/Aucma.Scada.UI/RecordControl.xaml.cs @@ -1,18 +1,5 @@ using Aucma.Scada.UI.viewModel; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace Aucma.Scada.UI { diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll index e44ff1a0..e48db699 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb index 2e8a4031..8d8cc736 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll new file mode 100644 index 00000000..ac2c9356 Binary files /dev/null and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb new file mode 100644 index 00000000..965e7e48 Binary files /dev/null and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe index 116ed1fb..0b8f0a02 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb index b6506730..408e8c45 100644 Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll index a430d27c..0aef53b1 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb index 5500b11f..05fb1cc8 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll index 8d8d66d6..304d70f2 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb index 5bc8efae..c1fba409 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll index a7cf79c5..46fc0b5d 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll differ diff --git a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb index b0e1943e..fa9f6fe9 100644 Binary files a/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb and b/Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index aef5dc62..94707c86 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache index a35f1347..c1d2eb7f 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -972145d32fb577cf15f13c2f976113859b9cacdd +d532180f0e1d6503c905235ff720a1761f0f3c80 diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt index bcccdd8d..2bb5eeac 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt @@ -329,3 +329,5 @@ E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.csproj.CopyComplete E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.exe E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\Aucma.Scada.UI.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\bin\Debug\Aucma.Scada.Model.pdb diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe index 116ed1fb..0b8f0a02 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb index b6506730..408e8c45 100644 Binary files a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb differ diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache index f34fc509..d3c9a609 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache @@ -4,16 +4,16 @@ winexe C# .cs -E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\ +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\ Aucma.Scada.UI none false DEBUG;TRACE -E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml 14-1433675110 34-1467425882 -134-180737408 +1351216602503 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml; False diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache index 0deddea8..02b3c1e7 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache @@ -4,16 +4,16 @@ winexe C# .cs -E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\ +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\ Aucma.Scada.UI none false DEBUG;TRACE -E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml 14-1433675110 35454352239 -134-180737408 +1351216602503 Page\AssemblyPlan\AssemblyPlanControl.xaml;Page\AssemblyPlan\PlanInfoEditWindow.xaml;Page\InStoreInfo\InStoreInfoControl.xaml;LogInfoControl.xaml;MainWindow.xaml;Page\InventoryInfo\InventoryInfoControl.xaml;Page\InventoryInfo\LinerInventory.xaml;Page\InventoryInfo\ShellInventory.xaml;Page\InventoryInfo\SpaceDetailWindow.xaml;Page\InventoryInfo\SpaceInfoControl.xaml;Page\OutStoreInfo\OutStoreInfoControl.xaml;Page\TaskInfo\TaskInfoControl.xaml;RecordControl.xaml;templates\style\resourceStyle.xaml; True diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref index b8215ce9..a32343b2 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref @@ -1,17 +1,17 @@ -E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.i.cs +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref index b6211b8c..7eb971a8 100644 --- a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref +++ b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref @@ -1,17 +1,17 @@ -E:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\App.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;; -FE:\桌面\澳柯玛MES项目\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\obj\Debug\GeneratedInternalTypeHelper.g.cs +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\App.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\AssemblyPlanControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\AssemblyPlan\PlanInfoEditWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InStoreInfo\InStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\LogInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\MainWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\InventoryInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\LinerInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\ShellInventory.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceDetailWindow.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\InventoryInfo\SpaceInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\OutStoreInfo\OutStoreInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\Page\TaskInfo\TaskInfoControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\RecordControl.xaml;; +FE:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\Aucma.Scada.UI\templates\style\resourceStyle.xaml;; diff --git a/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7353384e..9b5af6c9 100644 Binary files a/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs index 700f2503..b50d9907 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs @@ -1,19 +1,15 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using Aucma.Scada.UI.Page.AssemblyPlan; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Config; -using HighWayIot.Repository.domain; -using HighWayIot.Repository.service; -using HighWayIot.Repository.service.Impl; using LiveCharts; using LiveCharts.Wpf; using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; namespace Aucma.Scada.UI.viewModel.AssemblyPlan @@ -236,14 +232,14 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan public void NextPass(object obj) { string info = obj as string; - if(info == planCode) + if (info == planCode) { MessageBox.Show("该计划正在执行中，请勿重复下传"); } else { var result = assemblyPlanBusiness.ExecutePlanInfo_NextPass(info, planCode); - if(result != null) + if (result != null) { RefreshPlanExecute(result); MessageBox.Show("执行计划已下达"); @@ -252,10 +248,10 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan { MessageBox.Show("执行计划下达失败"); } - + } - + } /// @@ -268,9 +264,9 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan //加载正在执行的计划 planInfos = planInfos.Where(x => x.executeStatus == 2).ToList(); - if(planInfos.Count > 0) + if (planInfos.Count > 0) { - ExecutePlanInfo planInfo = planInfos.OrderBy(x=>x.executeOrder).First(); + ExecutePlanInfo planInfo = planInfos.OrderBy(x => x.executeOrder).First(); RefreshPlanExecute(planInfo); } @@ -293,7 +289,7 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan column.Title = "型号"; column.Values = achievement; - + ModelStatistics.Add(column); ProductionHourList = new List() @@ -344,5 +340,5 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan } } - + } diff --git a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs index 5c0fa9b0..37c8fa5d 100644 --- a/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs +++ b/Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs @@ -1,18 +1,9 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; -using HighWayIot.Repository.domain; -using HighWayIot.Repository.service; -using HighWayIot.Repository.service.Impl; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; -using System.Windows.Input; namespace Aucma.Scada.UI.viewModel.AssemblyPlan { diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs index a36066d3..ab7476f9 100644 --- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs @@ -1,11 +1,9 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Config; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; -using HighWayIot.Repository.service; -using HighWayIot.Repository.service.Impl; using LiveCharts; using LiveCharts.Wpf; using System; @@ -13,12 +11,10 @@ using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Aucma.Scada.UI.viewModel.InStoreInfo { - public class InStoreInfoViewModel:ViewModelBase + public class InStoreInfoViewModel : ViewModelBase { private LogHelper logHelper = LogHelper.Instance; private ObservableCollection listItems = new ObservableCollection(); @@ -123,7 +119,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo public IEnumerable InstoreTask { get { return instoreTask; } - set { instoreTask = value; RaisePropertyChanged(()=> InstoreTask); } + set { instoreTask = value; RaisePropertyChanged(() => InstoreTask); } } @@ -147,7 +143,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo public String Search { get { return search; } - set { search = value; RaisePropertyChanged(()=> Search); } + set { search = value; RaisePropertyChanged(() => Search); } } /// @@ -226,10 +222,11 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo /// public void Query() { - if(materialTypeCombox == "箱壳") + if (materialTypeCombox == "箱壳") { materialTypeCombox = "X-001"; - }else if (materialTypeCombox == "内胆") + } + else if (materialTypeCombox == "内胆") { materialTypeCombox = "X-002"; } @@ -237,7 +234,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo { materialTypeCombox = string.Empty; } - InstoreTask = taskItems.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1==1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1==1); + InstoreTask = taskItems.Where(x => !string.IsNullOrEmpty(search) ? x.materialCode == search : 1 == 1 && !string.IsNullOrEmpty(materialTypeCombox) ? x.storeCode == materialTypeCombox : 1 == 1); } /// @@ -250,7 +247,7 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo this.Query(); } - + /// /// 柱状体加载 @@ -304,7 +301,8 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo taskItems.Add(taskInfo); InstoreTask = taskItems; })); - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("入库任务列表刷新异常", ex); } @@ -317,13 +315,15 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo /// /// /// - private void RefreshScanInfo(string materialCode, string materialName, string spaceName, string materialType){ - if(materialType == appConfig.shellStoreCode) + private void RefreshScanInfo(string materialCode, string materialName, string spaceName, string materialType) + { + if (materialType == appConfig.shellStoreCode) { ShellMaterialCode = materialCode; ShellMaterialName = materialName; ShellSpaceName = spaceName; - }else if(materialType == appConfig.linerStoreCode) + } + else if (materialType == appConfig.linerStoreCode) { LinerMaterialCode = materialCode; LinerMaterialName = materialName; diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/InventoryInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/InventoryInfoViewModel.cs index bcef6ece..30e7b958 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/InventoryInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/InventoryInfoViewModel.cs @@ -3,14 +3,10 @@ using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Log4net; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Aucma.Scada.UI.viewModel.InventoryInfo { - public class InventoryInfoViewModel:ViewModelBase + public class InventoryInfoViewModel : ViewModelBase { private LogHelper logHelper = LogHelper.Instance; diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs index d8cad165..513634d1 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/LinerInventoryViewModel.cs @@ -1,21 +1,17 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using Aucma.Scada.UI.Page.InventoryInfo; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Config; -using HighWayIot.Repository.domain; using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; using System.Windows; namespace Aucma.Scada.UI.viewModel.InventoryInfo { - public class LinerInventoryViewModel :ViewModelBase + public class LinerInventoryViewModel : ViewModelBase { [DllImport("user32.dll")] public static extern int MessageBoxTimeoutA(IntPtr hWnd, string msg, string Caps, int type, int Id, int time); @@ -192,7 +188,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo private void SpaceDetail(object obj) { string info = obj as string; - SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.linerStoreCode,info); + SpaceDetailWindow spaceDetailWindow = new SpaceDetailWindow(appConfig.linerStoreCode, info); spaceDetailWindow.Show(); inventoryInfoBusiness.RefreshBaseSpaceDetails(appConfig.linerStoreCode, info); diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs index 728da3ee..ce9287ba 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/ShellInventoryViewModel.cs @@ -1,11 +1,10 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using Aucma.Scada.UI.Page.InventoryInfo; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Config; -using HighWayIot.Repository.domain; using System; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.Runtime.InteropServices; using System.Windows; @@ -93,11 +92,11 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo var info = inventoryInfoBusiness.GetSpaceInfos(appConfig.shellStoreCode); if (info != null) { - if(spaceItems.Count > 0) + if (spaceItems.Count > 0) { spaceItems.Clear(); } - + foreach (var item in info) { spaceItems.Add(item); diff --git a/Aucma.Scada.UI/viewModel/InventoryInfo/SpaceDetailViewModel.cs b/Aucma.Scada.UI/viewModel/InventoryInfo/SpaceDetailViewModel.cs index 65b1a04a..613246e5 100644 --- a/Aucma.Scada.UI/viewModel/InventoryInfo/SpaceDetailViewModel.cs +++ b/Aucma.Scada.UI/viewModel/InventoryInfo/SpaceDetailViewModel.cs @@ -1,13 +1,10 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; -using HighWayIot.Repository.domain; -using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; namespace Aucma.Scada.UI.viewModel.InventoryInfo @@ -140,7 +137,7 @@ namespace Aucma.Scada.UI.viewModel.InventoryInfo /// 刷新货道明细列表 /// /// - private void RefreshSpaceDetails(List spaceDetails) + private void RefreshSpaceDetails(List spaceDetails) { SpaceDetailDataGrid = new ObservableCollection(); if (spaceDetails != null) diff --git a/Aucma.Scada.UI/viewModel/LogInfoViewModel.cs b/Aucma.Scada.UI/viewModel/LogInfoViewModel.cs index beea1f6b..1a9e860b 100644 --- a/Aucma.Scada.UI/viewModel/LogInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/LogInfoViewModel.cs @@ -2,18 +2,15 @@ using HighWayIot.Log4net; using System; using System.Collections; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Aucma.Scada.UI.viewModel { public class LogInfoViewModel : ViewModelBase { private LogHelper logHelper = LogHelper.Instance; - + private ObservableCollection listItems = new ObservableCollection(); public LogInfoViewModel() @@ -46,7 +43,8 @@ namespace Aucma.Scada.UI.viewModel listItems.Add($"{DateTime.Now.ToString("HH:mm:ss")}==>{message}"); ListBoxData = listItems.OrderByDescending(x => x); - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("日志数据绑定异常", ex); } diff --git a/Aucma.Scada.UI/viewModel/MainViewModel.cs b/Aucma.Scada.UI/viewModel/MainViewModel.cs index de8b80ed..16b783f8 100644 --- a/Aucma.Scada.UI/viewModel/MainViewModel.cs +++ b/Aucma.Scada.UI/viewModel/MainViewModel.cs @@ -1,5 +1,4 @@ -using Aucma.Scada.Business; -using Aucma.Scada.UI.Page.AssemblyPlan; +using Aucma.Scada.UI.Page.AssemblyPlan; using Aucma.Scada.UI.Page.InStoreInfo; using Aucma.Scada.UI.Page.InventoryInfo; using Aucma.Scada.UI.Page.OutStoreInfo; @@ -8,11 +7,6 @@ using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Log4net; using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; namespace Aucma.Scada.UI.viewModel diff --git a/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs index 61784ff3..749f7f26 100644 --- a/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/OutStoreInfo/OutStoreInfoViewModel.cs @@ -1,16 +1,13 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Config; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; using System; using System.Collections; -using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; namespace Aucma.Scada.UI.viewModel.OutStoreInfo @@ -249,9 +246,9 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo { var info = outStoreBusiness.GetOutStoreTask(); - - if(info != null) + + if (info != null) { if (!string.IsNullOrEmpty(taskCodeSearch)) { @@ -272,7 +269,7 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo { taskItems.Add(item); } - OutstoreTask = taskItems.OrderBy(x=>x.createTime); + OutstoreTask = taskItems.OrderBy(x => x.createTime); })); } } @@ -312,6 +309,6 @@ namespace Aucma.Scada.UI.viewModel.OutStoreInfo } } - + } } diff --git a/Aucma.Scada.UI/viewModel/RecordViewModel.cs b/Aucma.Scada.UI/viewModel/RecordViewModel.cs index b0a2a1d8..30e4216a 100644 --- a/Aucma.Scada.UI/viewModel/RecordViewModel.cs +++ b/Aucma.Scada.UI/viewModel/RecordViewModel.cs @@ -1,22 +1,15 @@ -using GalaSoft.MvvmLight; +using Aucma.Scada.Model.domain; +using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; -using HighWayIot.Repository.service; -using HighWayIot.Repository.service.Impl; using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Aucma.Scada.UI.viewModel { - public class RecordViewModel: ViewModelBase + public class RecordViewModel : ViewModelBase { private LogHelper logHelper = LogHelper.Instance; - private ISysUserInfoService sysUserInfoService = new SysUserInfoServiceImpl(); public RecordViewModel() { @@ -62,21 +55,6 @@ namespace Aucma.Scada.UI.viewModel public void Query() { - var models = sysUserInfoService.GetUserInfos(); - if (!string.IsNullOrEmpty(Search)) - { - models = models.Where(x => x.userName.Contains(Search)).ToList(); - } - GridModelList = new ObservableCollection(); - if (models != null) - { - models.ForEach( - arg => - { - GridModelList.Add(arg); - } - ); - } } diff --git a/Aucma.Scada.UI/viewModel/TaskInfo/TaskInfoViewModel.cs b/Aucma.Scada.UI/viewModel/TaskInfo/TaskInfoViewModel.cs index d0e87033..66ca8a11 100644 --- a/Aucma.Scada.UI/viewModel/TaskInfo/TaskInfoViewModel.cs +++ b/Aucma.Scada.UI/viewModel/TaskInfo/TaskInfoViewModel.cs @@ -1,15 +1,8 @@ using Aucma.Scada.Business; +using Aucma.Scada.Model.domain; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; -using HighWayIot.Repository.domain; -using HighWayIot.Repository.service; -using HighWayIot.Repository.service.Impl; -using System; -using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Aucma.Scada.UI.viewModel.TaskInfo { @@ -89,8 +82,8 @@ namespace Aucma.Scada.UI.viewModel.TaskInfo models.ForEach( arg => { - - if(arg.taskStatus == 3) + + if (arg.taskStatus == 3) { RecordInfoDataGrid.Add(arg); } diff --git a/HighWayIot.Common/ExpressionExtensions.cs b/HighWayIot.Common/ExpressionExtensions.cs index c1415700..48bcaf89 100644 --- a/HighWayIot.Common/ExpressionExtensions.cs +++ b/HighWayIot.Common/ExpressionExtensions.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Common { diff --git a/HighWayIot.Common/IniHelper.cs b/HighWayIot.Common/IniHelper.cs index 18ea855e..0e0f8e42 100644 --- a/HighWayIot.Common/IniHelper.cs +++ b/HighWayIot.Common/IniHelper.cs @@ -1,9 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Common { diff --git a/HighWayIot.Common/JsonChange.cs b/HighWayIot.Common/JsonChange.cs index 0f9b7c3a..cd5a63ad 100644 --- a/HighWayIot.Common/JsonChange.cs +++ b/HighWayIot.Common/JsonChange.cs @@ -3,12 +3,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Web.Script.Serialization; -using System.Xml.Linq; namespace HighWayIot.Common { @@ -43,7 +38,7 @@ namespace HighWayIot.Common } catch (Exception ex) { - log.Error("Model转Json异常",ex); + log.Error("Model转Json异常", ex); } return str; } @@ -64,7 +59,7 @@ namespace HighWayIot.Common } catch (Exception ex) { - log.Error("Json转Model异常" ,ex); + log.Error("Json转Model异常", ex); } return info; } diff --git a/HighWayIot.Common/MsgUtil.cs b/HighWayIot.Common/MsgUtil.cs index 0acaef0c..c3465a75 100644 --- a/HighWayIot.Common/MsgUtil.cs +++ b/HighWayIot.Common/MsgUtil.cs @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Common { diff --git a/HighWayIot.Common/Properties/AssemblyInfo.cs b/HighWayIot.Common/Properties/AssemblyInfo.cs index 1390e7f9..b7e1f31f 100644 --- a/HighWayIot.Common/Properties/AssemblyInfo.cs +++ b/HighWayIot.Common/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.Common/StringChange.cs b/HighWayIot.Common/StringChange.cs index 3bc168ce..835dbfbe 100644 --- a/HighWayIot.Common/StringChange.cs +++ b/HighWayIot.Common/StringChange.cs @@ -1,11 +1,8 @@ -using HighWayIot.Log4net; -using System; -using System.Collections.Generic; +using System; using System.Drawing; using System.IO; using System.Linq; using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Common { @@ -138,7 +135,7 @@ namespace HighWayIot.Common { Directory.CreateDirectory(path); } - bmp.Save((path + "\\" + filename + ".png"),System.Drawing.Imaging.ImageFormat.Png);//将图片以JPEG格式保存在指定目录(可以选择其他图片格式) + bmp.Save((path + "\\" + filename + ".png"), System.Drawing.Imaging.ImageFormat.Png);//将图片以JPEG格式保存在指定目录(可以选择其他图片格式) ms.Close();//关闭流并释放 if (File.Exists(path + "\\" + filename + ".png"))//判断是否存在 { @@ -168,7 +165,7 @@ namespace HighWayIot.Common byte[] intBytes = new byte[floatBytes.Length / 2]; for (int i = 0; i < intBytes.Length; i++) { - intBytes[i] = floatBytes[i * 2 ]; + intBytes[i] = floatBytes[i * 2]; } return intBytes; } diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Common/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7d920d8f..4a772f3d 100644 Binary files a/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Common/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache index 9de75a86..99f8eb16 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache index 05e656dd..51bece39 100644 --- a/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Common/obj/Debug/HighWayIot.Common.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -97b22d61f5b9f8ac62a0d2434158bb8b0652a556 +5946610343a3730e363647ba2151707ce22f641a diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb and b/HighWayIot.Common/obj/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Config/AppConfig.cs b/HighWayIot.Config/AppConfig.cs index bebd8a6c..ec195f87 100644 --- a/HighWayIot.Config/AppConfig.cs +++ b/HighWayIot.Config/AppConfig.cs @@ -1,9 +1,5 @@ using HighWayIot.Common; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Config { @@ -58,7 +54,7 @@ namespace HighWayIot.Config //get { return "箱壳内胆组装"; } set { iniHelper.IniWriteValue("system", "stationName", value); } } - + /// /// 箱壳库编号 /// diff --git a/HighWayIot.Config/PlcConfig.cs b/HighWayIot.Config/PlcConfig.cs index 6bf232b3..cc2616b5 100644 --- a/HighWayIot.Config/PlcConfig.cs +++ b/HighWayIot.Config/PlcConfig.cs @@ -1,9 +1,5 @@ using HighWayIot.Common; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Config { @@ -26,7 +22,7 @@ namespace HighWayIot.Config private PlcConfig() { - + } #region PLC基础参数 diff --git a/HighWayIot.Config/Properties/AssemblyInfo.cs b/HighWayIot.Config/Properties/AssemblyInfo.cs index c3de5d1a..173d1298 100644 --- a/HighWayIot.Config/Properties/AssemblyInfo.cs +++ b/HighWayIot.Config/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll index a430d27c..0aef53b1 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb index 5500b11f..05fb1cc8 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Config/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0311dc8c..bf9fb44d 100644 Binary files a/HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Config/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache index 7b7d0a07..75919f9c 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache index 667bf9bf..7ec6a2df 100644 --- a/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Config/obj/Debug/HighWayIot.Config.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a04e0be7d1e79646ce25b6b3a341ce2d83c7daee +498314701cc69a2bb9a908cd676c2b8fb46f08d1 diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll index a430d27c..0aef53b1 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb index 5500b11f..05fb1cc8 100644 Binary files a/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb and b/HighWayIot.Config/obj/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Log4net/LogHelper.cs b/HighWayIot.Log4net/LogHelper.cs index 88b1f4d4..aa36450e 100644 --- a/HighWayIot.Log4net/LogHelper.cs +++ b/HighWayIot.Log4net/LogHelper.cs @@ -1,10 +1,6 @@ using log4net.Config; using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Log4net { diff --git a/HighWayIot.Log4net/Properties/AssemblyInfo.cs b/HighWayIot.Log4net/Properties/AssemblyInfo.cs index 5d975c62..50bf92ed 100644 --- a/HighWayIot.Log4net/Properties/AssemblyInfo.cs +++ b/HighWayIot.Log4net/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ccf231db..58670266 100644 Binary files a/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Log4net/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache index a07cbf00..baa3e389 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache index 027bf0dd..8e573e7c 100644 --- a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ccc70b43df5202fccb93898c5d75ec44374c5a76 +43e80bf4253d29bfb56c975da1d9e6f2b7003ba1 diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Log4net/obj/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Mqtt/MqttClient.cs b/HighWayIot.Mqtt/MqttClient.cs index 406d58fd..0a34e9bf 100644 --- a/HighWayIot.Mqtt/MqttClient.cs +++ b/HighWayIot.Mqtt/MqttClient.cs @@ -1,12 +1,10 @@ -using MQTTnet.Client; -using MQTTnet; +using MQTTnet; +using MQTTnet.Client; using System; -using System.Collections.Generic; -using System.Linq; +using System.Security.Authentication; using System.Text; using System.Threading; using System.Threading.Tasks; -using System.Security.Authentication; namespace HighWayIot.Mqtt { diff --git a/HighWayIot.Mqtt/Properties/AssemblyInfo.cs b/HighWayIot.Mqtt/Properties/AssemblyInfo.cs index 6c021f33..b003b490 100644 --- a/HighWayIot.Mqtt/Properties/AssemblyInfo.cs +++ b/HighWayIot.Mqtt/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll index 5d114fe5..f7fd2316 100644 Binary files a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll and b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.dll differ diff --git a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb index 29c1e5f0..ee3cac38 100644 Binary files a/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb and b/HighWayIot.Mqtt/bin/Debug/HighWayIot.Mqtt.pdb differ diff --git a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 7409024a..6b06efbb 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Mqtt/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache index a8252483..accb56e3 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache index 54668b0b..d555018e 100644 --- a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -d44a9ac3646bf68d2fcb1acc7a52a223a88c9ff0 +63f35217a3bd32baa297f5f53a70ab9ca4787be9 diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll index 5d114fe5..f7fd2316 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.dll differ diff --git a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb index 29c1e5f0..ee3cac38 100644 Binary files a/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb and b/HighWayIot.Mqtt/obj/Debug/HighWayIot.Mqtt.pdb differ diff --git a/HighWayIot.Plc/IPlc.cs b/HighWayIot.Plc/IPlc.cs index 6002f0d4..3d1bf991 100644 --- a/HighWayIot.Plc/IPlc.cs +++ b/HighWayIot.Plc/IPlc.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HighWayIot.Plc +namespace HighWayIot.Plc { public interface IPlc { diff --git a/HighWayIot.Plc/Impl/InovancePlc.cs b/HighWayIot.Plc/Impl/InovancePlc.cs index b7644820..0a09f82b 100644 --- a/HighWayIot.Plc/Impl/InovancePlc.cs +++ b/HighWayIot.Plc/Impl/InovancePlc.cs @@ -1,8 +1,8 @@ -using HslCommunication; +using HighWayIot.Common; +using HighWayIot.Log4net; +using HslCommunication; using HslCommunication.Profinet.Inovance; -using HighWayIot.Common; using System; -using HighWayIot.Log4net; namespace HighWayIot.Plc.Impl { @@ -94,7 +94,7 @@ namespace HighWayIot.Plc.Impl if (read.IsSuccess) { byte[] result = stringChange.ConvertFloatToINt(read.Content); - log.PlcLog(String.Format("通过地址和长度读取PLC数据成功：{0}",stringChange.bytesToHexStr(result, result.Length))); + log.PlcLog(String.Format("通过地址和长度读取PLC数据成功：{0}", stringChange.bytesToHexStr(result, result.Length))); return result; } else @@ -134,9 +134,9 @@ namespace HighWayIot.Plc.Impl { int length = stringChange.ParseToInt(strArry[1]) + 1; string[] array = new string[length]; - for(int i=0;i< length;i++) + for (int i = 0; i < length; i++) { - if(i == stringChange.ParseToInt(strArry[1])) + if (i == stringChange.ParseToInt(strArry[1])) { array[i] = value.ToString(); } @@ -149,7 +149,7 @@ namespace HighWayIot.Plc.Impl Array.Reverse(array); byte[] buffer = new byte[array.Length]; string result = ""; - for(int i = 0; i < array.Length; i++) + for (int i = 0; i < array.Length; i++) { result += (byte)Convert.ToInt32(array[i], 16); } @@ -200,7 +200,7 @@ namespace HighWayIot.Plc.Impl /// public bool resetByAddress(string address, int len) { - // log.PlcLog(String.Format("开发通过PLC地址{0}清零数据", address)); + // log.PlcLog(String.Format("开发通过PLC地址{0}清零数据", address)); try { byte[] write = new byte[len * 2]; @@ -268,7 +268,7 @@ namespace HighWayIot.Plc.Impl /// public int readInteractiveSignal(string address) { - // log.PlcLog(String.Format("开始通过PLC地址{0}读取交互信号", address)); + // log.PlcLog(String.Format("开始通过PLC地址{0}读取交互信号", address)); try { OperateResult read = inovanceTcp.ReadInt16(address); @@ -436,10 +436,10 @@ namespace HighWayIot.Plc.Impl /// public bool writeBoolByAddress(string address, bool value) { - // log.PlcLog(String.Format("开始通过PLC地址{0}写入bool类型数据{1}", address, value)); + // log.PlcLog(String.Format("开始通过PLC地址{0}写入bool类型数据{1}", address, value)); try { - + OperateResult write = inovanceTcp.Write(address, value); if (write.IsSuccess) diff --git a/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs b/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs index 8ae3b798..0929cba1 100644 --- a/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs +++ b/HighWayIot.Plc/Impl/MelsecBinaryPlc.cs @@ -2,12 +2,7 @@ using HighWayIot.Log4net; using HslCommunication; using HslCommunication.Profinet.Melsec; -using HslCommunication.Profinet.Omron; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Plc.Impl { diff --git a/HighWayIot.Plc/Impl/OMRONNJPLC.CS b/HighWayIot.Plc/Impl/OMRONNJPLC.CS index 729b01ad..efe0e943 100644 --- a/HighWayIot.Plc/Impl/OMRONNJPLC.CS +++ b/HighWayIot.Plc/Impl/OMRONNJPLC.CS @@ -173,7 +173,7 @@ namespace HighWayIot.Plc.Impl } catch (Exception ex) { - log.Error(String.Format("通过PLC地址{0}清零数据异常",address), ex); + log.Error(String.Format("通过PLC地址{0}清零数据异常", address), ex); return false; } } @@ -190,11 +190,11 @@ namespace HighWayIot.Plc.Impl try { OperateResult read = omronFinsNet.Read(address, (ushort)(8)); - + if (read.IsSuccess && read.Content != null) { string result = Convert.ToString(read.Content); - log.PlcLog(String.Format("通过PLC地址{0}读取EA值成功：{1}", address,result)); + log.PlcLog(String.Format("通过PLC地址{0}读取EA值成功：{1}", address, result)); return result; } else @@ -277,22 +277,22 @@ namespace HighWayIot.Plc.Impl /// public bool writeInt32ByAddress(string address, int value) { - log.PlcLog(String.Format("开始通过PLC地址{0}写入int32类型数据{1}", address,value)); + log.PlcLog(String.Format("开始通过PLC地址{0}写入int32类型数据{1}", address, value)); try { OperateResult write = omronFinsNet.Write(address, short.Parse(Convert.ToString(value))); if (write.IsSuccess) { - log.PlcLog(String.Format("通过PLC地址{0}写入int32类型数据{1}成功", address,value)); + log.PlcLog(String.Format("通过PLC地址{0}写入int32类型数据{1}成功", address, value)); return true; } - log.PlcLog(String.Format("通过PLC地址{0}写入int32类型数据{1}失败！！！", address,value)); + log.PlcLog(String.Format("通过PLC地址{0}写入int32类型数据{1}失败！！！", address, value)); this.IsConnected = false; return false; } catch (Exception ex) { - log.Error(String.Format("通过PLC地址{0}写入int32类型数据异常", address),ex); + log.Error(String.Format("通过PLC地址{0}写入int32类型数据异常", address), ex); this.IsConnected = false; return false; } @@ -322,7 +322,7 @@ namespace HighWayIot.Plc.Impl } catch (Exception ex) { - log.Error(String.Format("通过PLC地址{0}写入String类型数据异常", address),ex); + log.Error(String.Format("通过PLC地址{0}写入String类型数据异常", address), ex); //this.IsConnected = false; return false; } @@ -334,7 +334,7 @@ namespace HighWayIot.Plc.Impl /// /// /// - public string readStringByAddress(string address,ushort length) + public string readStringByAddress(string address, ushort length) { //log.PlcLog(String.Format("开始通过PLC地址{0}读取string类型数据", address)); try diff --git a/HighWayIot.Plc/Impl/SiemensPlc.cs b/HighWayIot.Plc/Impl/SiemensPlc.cs index 162a480a..847ebfea 100644 --- a/HighWayIot.Plc/Impl/SiemensPlc.cs +++ b/HighWayIot.Plc/Impl/SiemensPlc.cs @@ -3,14 +3,10 @@ using HighWayIot.Log4net; using HslCommunication; using HslCommunication.Profinet.Siemens; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Plc.Impl { - public class SiemensPlc:IPlc + public class SiemensPlc : IPlc { private LogHelper logHelper = LogHelper.Instance; diff --git a/HighWayIot.Plc/PlcPool.cs b/HighWayIot.Plc/PlcPool.cs index cf70fdc3..a300f5c4 100644 --- a/HighWayIot.Plc/PlcPool.cs +++ b/HighWayIot.Plc/PlcPool.cs @@ -2,9 +2,6 @@ using HighWayIot.Plc.Impl; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Plc { @@ -32,10 +29,10 @@ namespace HighWayIot.Plc /// /// /// - public void InitPlc(string plcType,string ip,int port,string key) + public void InitPlc(string plcType, string ip, int port, string key) { IPlc _plc = null; - switch(plcType) + switch (plcType) { case "InovancePlc": _plc = new InovancePlc(); @@ -73,7 +70,7 @@ namespace HighWayIot.Plc /// 获取所有PLC信息 /// /// - public Dictionary GetAll() + public Dictionary GetAll() { return keyValuePairs; } @@ -96,7 +93,7 @@ namespace HighWayIot.Plc } result = true; } - catch(Exception ex) + catch (Exception ex) { logHelper.Error("关闭PLC连接异常", ex); } diff --git a/HighWayIot.Plc/Properties/AssemblyInfo.cs b/HighWayIot.Plc/Properties/AssemblyInfo.cs index 848ef8d5..6aada323 100644 --- a/HighWayIot.Plc/Properties/AssemblyInfo.cs +++ b/HighWayIot.Plc/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll index 8d8d66d6..304d70f2 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.dll differ diff --git a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb index 5bc8efae..c1fba409 100644 Binary files a/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/bin/Debug/HighWayIot.Plc.pdb differ diff --git a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 1d0ba641..f5c0fa65 100644 Binary files a/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Plc/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache index e7b6581b..89fcac23 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache index 7f375777..d9f1da1a 100644 --- a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -220bec985ab0e453942bcf4ed7bbc64b855bcf64 +f80abeff4f54f6d92641a5ca021a378fc773b991 diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll index 8d8d66d6..304d70f2 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.dll differ diff --git a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb index 5bc8efae..c1fba409 100644 Binary files a/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb and b/HighWayIot.Plc/obj/Debug/HighWayIot.Plc.pdb differ diff --git a/HighWayIot.Repository/HighWayIot.Repository.csproj b/HighWayIot.Repository/HighWayIot.Repository.csproj index 83eceedc..0a185fe1 100644 --- a/HighWayIot.Repository/HighWayIot.Repository.csproj +++ b/HighWayIot.Repository/HighWayIot.Repository.csproj @@ -59,14 +59,6 @@ - - - - - - - - @@ -86,6 +78,10 @@ + + {320b716a-2373-4342-b0aa-3c4cb041e8ad} + Aucma.Scada.Model + {89a1edd9-d79e-468d-b6d3-7d07b8843562} HighWayIot.Common diff --git a/HighWayIot.Repository/Properties/AssemblyInfo.cs b/HighWayIot.Repository/Properties/AssemblyInfo.cs index e021efb5..e90e4b96 100644 --- a/HighWayIot.Repository/Properties/AssemblyInfo.cs +++ b/HighWayIot.Repository/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.Repository/Repository.cs b/HighWayIot.Repository/Repository.cs index 4fd00c08..072b7fbc 100644 --- a/HighWayIot.Repository/Repository.cs +++ b/HighWayIot.Repository/Repository.cs @@ -1,9 +1,4 @@ using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository { diff --git a/HighWayIot.Repository/SqlSugarHelper.cs b/HighWayIot.Repository/SqlSugarHelper.cs index 85994173..5e79f3e6 100644 --- a/HighWayIot.Repository/SqlSugarHelper.cs +++ b/HighWayIot.Repository/SqlSugarHelper.cs @@ -2,12 +2,7 @@ using HighWayIot.Config; using HighWayIot.Log4net; using SqlSugar; -using System; using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository { diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll new file mode 100644 index 00000000..ac2c9356 Binary files /dev/null and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb new file mode 100644 index 00000000..965e7e48 Binary files /dev/null and b/HighWayIot.Repository/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll index a430d27c..0aef53b1 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb index 5500b11f..05fb1cc8 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll index a7cf79c5..46fc0b5d 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb index b0e1943e..fa9f6fe9 100644 Binary files a/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f6bc80cb..cc6357b9 100644 Binary files a/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Repository/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index fe7dcd7c..3ba1af89 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache index abb58838..f1d7c6b1 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a5a3426951649b4dc69f49167c2967c6a0e8b5cf +23cd80385b397fa6fe8fd3585bc10f301878a043 diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt index e0d75eff..11a0c2d1 100644 --- a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt +++ b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.FileListAbsolute.txt @@ -109,3 +109,5 @@ E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWay E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.csproj.CopyComplete E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.dll E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot.Repository\obj\Debug\HighWayIot.Repository.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Repository\bin\Debug\Aucma.Scada.Model.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot.Repository\bin\Debug\Aucma.Scada.Model.pdb diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll index a7cf79c5..46fc0b5d 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb index b0e1943e..fa9f6fe9 100644 Binary files a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb and b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot.Repository/service/IBaseBomInfoService.cs b/HighWayIot.Repository/service/IBaseBomInfoService.cs index c82ba0a4..71eaf860 100644 --- a/HighWayIot.Repository/service/IBaseBomInfoService.cs +++ b/HighWayIot.Repository/service/IBaseBomInfoService.cs @@ -1,9 +1,5 @@ -using HighWayIot.Repository.domain; -using System; +using Aucma.Scada.Model.domain; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service { diff --git a/HighWayIot.Repository/service/IBaseSpaceDetailService.cs b/HighWayIot.Repository/service/IBaseSpaceDetailService.cs index 0563a98f..16d14a92 100644 --- a/HighWayIot.Repository/service/IBaseSpaceDetailService.cs +++ b/HighWayIot.Repository/service/IBaseSpaceDetailService.cs @@ -1,9 +1,5 @@ -using HighWayIot.Repository.domain; -using System; +using Aucma.Scada.Model.domain; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service { diff --git a/HighWayIot.Repository/service/IBaseSpaceInfoService.cs b/HighWayIot.Repository/service/IBaseSpaceInfoService.cs index ef24917a..07e634dd 100644 --- a/HighWayIot.Repository/service/IBaseSpaceInfoService.cs +++ b/HighWayIot.Repository/service/IBaseSpaceInfoService.cs @@ -1,10 +1,5 @@ -using HighWayIot.Repository.domain; -using HighWayIot.Repository.enums; -using System; +using Aucma.Scada.Model.domain; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service { @@ -35,7 +30,7 @@ namespace HighWayIot.Repository.service /// /// /// - BaseSpaceInfo GetSpaceInfoBySpaceCode(string store,string spaceCode); + BaseSpaceInfo GetSpaceInfoBySpaceCode(string store, string spaceCode); /// /// 通过仓库编号获取货道信息 diff --git a/HighWayIot.Repository/service/IExecutePlanInfoService.cs b/HighWayIot.Repository/service/IExecutePlanInfoService.cs index 16c9516c..865348ac 100644 --- a/HighWayIot.Repository/service/IExecutePlanInfoService.cs +++ b/HighWayIot.Repository/service/IExecutePlanInfoService.cs @@ -1,9 +1,5 @@ -using HighWayIot.Repository.domain; -using System; +using Aucma.Scada.Model.domain; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service { diff --git a/HighWayIot.Repository/service/IProductPlanInfoService.cs b/HighWayIot.Repository/service/IProductPlanInfoService.cs index 5e024bf7..6c48a987 100644 --- a/HighWayIot.Repository/service/IProductPlanInfoService.cs +++ b/HighWayIot.Repository/service/IProductPlanInfoService.cs @@ -1,9 +1,5 @@ -using HighWayIot.Repository.domain; -using System; +using Aucma.Scada.Model.domain; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service { diff --git a/HighWayIot.Repository/service/IRealTaskInfoService.cs b/HighWayIot.Repository/service/IRealTaskInfoService.cs index 1af7a377..d0607791 100644 --- a/HighWayIot.Repository/service/IRealTaskInfoService.cs +++ b/HighWayIot.Repository/service/IRealTaskInfoService.cs @@ -1,9 +1,5 @@ -using HighWayIot.Repository.domain; -using System; +using Aucma.Scada.Model.domain; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service { @@ -56,7 +52,7 @@ namespace HighWayIot.Repository.service /// /// /// - RealTaskInfo GetTaskInfoByTaskCode(string taskCode,string storeCode); + RealTaskInfo GetTaskInfoByTaskCode(string taskCode, string storeCode); /// /// 通过仓库编号获取任务 @@ -64,7 +60,7 @@ namespace HighWayIot.Repository.service /// /// /// - List GetTaskInfosByStoreCode(string[] storeCode,int taskType); + List GetTaskInfosByStoreCode(string[] storeCode, int taskType); /// /// 获取指定状态的任务列表 @@ -74,6 +70,6 @@ namespace HighWayIot.Repository.service /// 0返回所有状态；1-待执行；2-执行中；3-已完成 /// List GetTaskInfosByTaskStatus(string[] storeCode, int taskType, int taskStatus); - + } } diff --git a/HighWayIot.Repository/service/ISysUserInfoService.cs b/HighWayIot.Repository/service/ISysUserInfoService.cs index 0540e053..13c2b61c 100644 --- a/HighWayIot.Repository/service/ISysUserInfoService.cs +++ b/HighWayIot.Repository/service/ISysUserInfoService.cs @@ -1,9 +1,5 @@ -using HighWayIot.Repository.domain; -using System; +using Aucma.Scada.Model.domain; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service { @@ -14,6 +10,6 @@ namespace HighWayIot.Repository.service /// 获取用户列表 /// /// - List GetUserInfos( ); + List GetUserInfos(); } } diff --git a/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs index c8ac607c..dc7c4b7c 100644 --- a/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseBomInfoServiceImpl.cs @@ -1,14 +1,12 @@ -using HighWayIot.Log4net; -using HighWayIot.Repository.domain; +using Aucma.Scada.Model.domain; +using HighWayIot.Log4net; using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service.Impl { - public class BaseBomInfoServiceImpl:IBaseBomInfoService + public class BaseBomInfoServiceImpl : IBaseBomInfoService { Repository _bomInfoRepository => new Repository("mes"); @@ -20,7 +18,8 @@ namespace HighWayIot.Repository.service.Impl { var info = _bomInfoRepository.GetList(); return info; - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("获取BOM集合异常", ex); return null; @@ -33,7 +32,7 @@ namespace HighWayIot.Repository.service.Impl try { var info = GetChildenByParentId(materialCode); - if(info.Count > 0) + if (info.Count > 0) { bomInfo = info.Where(x => x.materialType == materialType).First(); } @@ -47,7 +46,7 @@ namespace HighWayIot.Repository.service.Impl private List GetChildenByParentId(string parentId, List result = null) { - if(result == null) + if (result == null) { result = new List(); } @@ -60,7 +59,7 @@ namespace HighWayIot.Repository.service.Impl foreach (var item in info) { result.Add(item); - var childInfos = GetChildenByParentId(item.materialCode,result); + var childInfos = GetChildenByParentId(item.materialCode, result); } } } diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceDetailServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceDetailServiceImpl.cs index d949bb0a..e183b56d 100644 --- a/HighWayIot.Repository/service/Impl/BaseSpaceDetailServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseSpaceDetailServiceImpl.cs @@ -1,12 +1,9 @@ -using HighWayIot.Common; +using Aucma.Scada.Model.domain; +using HighWayIot.Common; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service.Impl { @@ -16,7 +13,7 @@ namespace HighWayIot.Repository.service.Impl private LogHelper logHelper = LogHelper.Instance; - private JsonChange jsonChange = JsonChange.Instance; + private JsonChange jsonChange = JsonChange.Instance; /// /// 根据物料编号删除货道明细 @@ -107,7 +104,7 @@ namespace HighWayIot.Repository.service.Impl } return result; } - + /// /// 更新货道明细 /// diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs index 4f17b0b7..da4f3082 100644 --- a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs @@ -1,13 +1,10 @@ -using HighWayIot.Common; +using Aucma.Scada.Model.domain; +using HighWayIot.Common; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; -using HighWayIot.Repository.enums; using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service.Impl { @@ -33,10 +30,10 @@ namespace HighWayIot.Repository.service.Impl { Expression> exp = s1 => true; exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceCapacity != (x.spaceStock + x.onRouteAmount)); //相同型号、启用状态、库存未满的货道信息 - + spaceInfos = _mesRepository.GetList(exp); - if(spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配 + if (spaceInfos.Count == 0) //没有指定该类型物料的货道信息，需获取空白货道信息进行分配 { spaceInfos = GetEmptySpaceInfo(); } @@ -46,9 +43,9 @@ namespace HighWayIot.Repository.service.Impl spaceInfo.materialType = materialType; } - catch(Exception ex) + catch (Exception ex) { - logHelper.Error("入库通过物料类型获取货道信息异常",ex); + logHelper.Error("入库通过物料类型获取货道信息异常", ex); } return spaceInfo; } @@ -60,7 +57,7 @@ namespace HighWayIot.Repository.service.Impl private BaseSpaceInfo inStoreFilter(List spaceInfos) { BaseSpaceInfo spaceInfo = null; - if(spaceInfos.Count > 0) + if (spaceInfos.Count > 0) { //获取库存未满库存最多的货道 spaceInfo = spaceInfos.Where(x => x.spaceCapacity != x.spaceStock).OrderByDescending(x => x.spaceStock).First(); @@ -85,7 +82,8 @@ namespace HighWayIot.Repository.service.Impl Expression> exp = s1 => true; exp = exp.And(x => x.materialType == null && x.spaceCapacity != x.spaceStock); spaceInfos = _mesRepository.GetList(exp); - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("获取空货道异常", ex); } @@ -108,7 +106,7 @@ namespace HighWayIot.Repository.service.Impl exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceStock > 0); //相同型号、启用状态、库存不为空的货道信息 spaceInfos = _mesRepository.GetList(exp); - + logHelper.Info($"根据仓库{store}；物料：{materialType}；获取到的货道信息：{jsonChange.ModeToJson(spaceInfos)}"); spaceInfo = outStoreFilter(spaceInfos); logHelper.Info($"仓库{store}；物料：{materialType}；匹配的入库货道信息：{jsonChange.ModeToJson(spaceInfo)}"); @@ -152,7 +150,8 @@ namespace HighWayIot.Repository.service.Impl try { spaceInfo = _mesRepository.GetFirst(x => x.storeCode == store && x.spaceCode == spaceCode); - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("通过货道编号获取货道信息异常", ex); } diff --git a/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs index a25bb830..b98e6e72 100644 --- a/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/ExecutePlanInfoServiceImpl.cs @@ -1,12 +1,10 @@ -using HighWayIot.Common; +using Aucma.Scada.Model.domain; +using HighWayIot.Common; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service.Impl { diff --git a/HighWayIot.Repository/service/Impl/ProductPlanInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/ProductPlanInfoServiceImpl.cs index 9aa2db9a..3d1e748c 100644 --- a/HighWayIot.Repository/service/Impl/ProductPlanInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/ProductPlanInfoServiceImpl.cs @@ -1,12 +1,9 @@ -using HighWayIot.Common; +using Aucma.Scada.Model.domain; +using HighWayIot.Common; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service.Impl { @@ -77,7 +74,8 @@ namespace HighWayIot.Repository.service.Impl try { result = _mesRepository.Insert(productPlanInfo); - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("添加生产计划异常", ex); } diff --git a/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs index 77de48c1..f0b7d1dd 100644 --- a/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/RealTaskInfoServiceImpl.cs @@ -1,12 +1,10 @@ -using HighWayIot.Common; +using Aucma.Scada.Model.domain; +using HighWayIot.Common; using HighWayIot.Log4net; -using HighWayIot.Repository.domain; using System; using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service.Impl { @@ -26,11 +24,11 @@ namespace HighWayIot.Repository.service.Impl bool result = false; try { - result = _mesRepository.Insert(taskInfo); + result = _mesRepository.Insert(taskInfo); } - catch(Exception ex) + catch (Exception ex) { - logHelper.Error("添加任务信息异常",ex); + logHelper.Error("添加任务信息异常", ex); } return result; } @@ -39,13 +37,13 @@ namespace HighWayIot.Repository.service.Impl /// 删除任务信息 /// /// - public bool DeleteTaskInfo(string taskCode,string storeCode=null) + public bool DeleteTaskInfo(string taskCode, string storeCode = null) { bool result = false; try { - RealTaskInfo taskInfo = GetTaskInfoByTaskCode(taskCode,storeCode); - if(taskInfo != null) + RealTaskInfo taskInfo = GetTaskInfoByTaskCode(taskCode, storeCode); + if (taskInfo != null) { result = _mesRepository.Delete(taskInfo); } @@ -114,7 +112,8 @@ namespace HighWayIot.Repository.service.Impl taskInfo.taskStatus = taskStatus; result = _mesRepository.Update(taskInfo); } - }catch(Exception ex) + } + catch (Exception ex) { logHelper.Error("通过任务编号更新任务状态异常", ex); } @@ -126,12 +125,12 @@ namespace HighWayIot.Repository.service.Impl /// /// /// - public RealTaskInfo GetTaskInfoByStoreCode(string storeCode,int taskType) + public RealTaskInfo GetTaskInfoByStoreCode(string storeCode, int taskType) { RealTaskInfo taskInfo = null; try { - taskInfo = _mesRepository.GetList(x => x.storeCode == storeCode && x.taskStatus == 1 && x.taskType == taskType).OrderBy(x=>x.createTime).FirstOrDefault(); + taskInfo = _mesRepository.GetList(x => x.storeCode == storeCode && x.taskStatus == 1 && x.taskType == taskType).OrderBy(x => x.createTime).FirstOrDefault(); } catch (Exception ex) { @@ -172,7 +171,7 @@ namespace HighWayIot.Repository.service.Impl { Expression> exp = s1 => true; exp = exp.And(x => x.taskType == taskType && x.taskStatus != 3 && storeCode.Contains(x.storeCode)); - + taskInfos = _mesRepository.GetList(exp); } catch (Exception ex) @@ -189,14 +188,14 @@ namespace HighWayIot.Repository.service.Impl /// /// /// - public List GetTaskInfosByTaskStatus(string[] storeCode,int taskType, int taskStatus) + public List GetTaskInfosByTaskStatus(string[] storeCode, int taskType, int taskStatus) { List taskInfos = null; try { Expression> exp = s1 => true; - exp = exp.And(x => x.taskType == taskType && storeCode.Contains(x.storeCode)) ; - if(taskStatus != 0) + exp = exp.And(x => x.taskType == taskType && storeCode.Contains(x.storeCode)); + if (taskStatus != 0) { exp = exp.And(x => x.taskStatus == taskStatus); } diff --git a/HighWayIot.Repository/service/Impl/SysUserInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/SysUserInfoServiceImpl.cs index 81f9166b..b2ce088b 100644 --- a/HighWayIot.Repository/service/Impl/SysUserInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/SysUserInfoServiceImpl.cs @@ -1,11 +1,7 @@ -using HighWayIot.Log4net; -using HighWayIot.Repository.domain; +using Aucma.Scada.Model.domain; +using HighWayIot.Log4net; using System; using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Repository.service.Impl { @@ -20,7 +16,8 @@ namespace HighWayIot.Repository.service.Impl { List deviceInfo = _repository.GetList(); return deviceInfo; - }catch (Exception ex) + } + catch (Exception ex) { log.Error("用户信息获取异常", ex); return null; diff --git a/HighWayIot.Rfid/Dto/MessagePack.cs b/HighWayIot.Rfid/Dto/MessagePack.cs index 63b34e13..9ef468f1 100644 --- a/HighWayIot.Rfid/Dto/MessagePack.cs +++ b/HighWayIot.Rfid/Dto/MessagePack.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HighWayIot.Rfid.Dto +namespace HighWayIot.Rfid.Dto { public class MessagePack { diff --git a/HighWayIot.Rfid/ICommunicateService.cs b/HighWayIot.Rfid/ICommunicateService.cs index 24c6a17f..a1b1ae92 100644 --- a/HighWayIot.Rfid/ICommunicateService.cs +++ b/HighWayIot.Rfid/ICommunicateService.cs @@ -1,9 +1,4 @@ using HighWayIot.Rfid.Dto; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Rfid { diff --git a/HighWayIot.Rfid/IDeviceAdapter.cs b/HighWayIot.Rfid/IDeviceAdapter.cs index 3e9945dd..bb13c7c2 100644 --- a/HighWayIot.Rfid/IDeviceAdapter.cs +++ b/HighWayIot.Rfid/IDeviceAdapter.cs @@ -1,9 +1,6 @@ using GRreader; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace HighWayIot.Rfid { @@ -211,6 +208,6 @@ namespace HighWayIot.Rfid /// /// /// - List Device_GetTagInfoList(DeviceType DeviceType,int time); + List Device_GetTagInfoList(DeviceType DeviceType, int time); } } \ No newline at end of file diff --git a/HighWayIot.Rfid/Impl/BgTcpClient.cs b/HighWayIot.Rfid/Impl/BgTcpClient.cs index d6458c51..eeb9b83e 100644 --- a/HighWayIot.Rfid/Impl/BgTcpClient.cs +++ b/HighWayIot.Rfid/Impl/BgTcpClient.cs @@ -1,12 +1,10 @@ using HighWayIot.Common; using HighWayIot.Log4net; using HighWayIot.Rfid.Dto; -using HighWayIot.Rfid.Impl; using MaterialTraceability.Rfid.Impl; using System; using System.Collections; using System.ComponentModel; -using System.Linq; using System.Net; using System.Net.Sockets; using System.Threading; @@ -111,8 +109,8 @@ namespace HighWayIot.Rfid.Impl m_ClientSock.Close(); m_ClientSock = null; } - log.Error("Socket接收数据线程退出",ex); - m_Fsem.Release(); + log.Error("Socket接收数据线程退出", ex); + m_Fsem.Release(); return; } if (this.m_bgwReceive.CancellationPending) @@ -162,7 +160,7 @@ namespace HighWayIot.Rfid.Impl catch (Exception ex) { e.Cancel = true; - log.Error("Socket处理数据异常",ex); + log.Error("Socket处理数据异常", ex); return; } if (this.m_bgwDeal.CancellationPending) @@ -253,7 +251,7 @@ namespace HighWayIot.Rfid.Impl } catch (Exception ex) { - log.Error("创建后台线程异常 ",ex); + log.Error("创建后台线程异常 ", ex); return true; } } @@ -264,7 +262,7 @@ namespace HighWayIot.Rfid.Impl } catch (Exception ex) { - log.Error("Socket连接异常 ",ex); + log.Error("Socket连接异常 ", ex); return false; } } @@ -287,7 +285,7 @@ namespace HighWayIot.Rfid.Impl } catch (Exception ex) { - log.Error("Socket连接异常 ",ex); + log.Error("Socket连接异常 ", ex); return false; } } diff --git a/HighWayIot.Rfid/Impl/RFLY_I160ADAPTER.CS b/HighWayIot.Rfid/Impl/RFLY_I160ADAPTER.CS index 095c13f6..9a36ecab 100644 --- a/HighWayIot.Rfid/Impl/RFLY_I160ADAPTER.CS +++ b/HighWayIot.Rfid/Impl/RFLY_I160ADAPTER.CS @@ -119,7 +119,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("连接读写器异常：",ex); + log.Error("连接读写器异常：", ex); return false; } return true; @@ -156,7 +156,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("Device_Connect异常：",ex); + log.Error("Device_Connect异常：", ex); return false; } } @@ -209,7 +209,7 @@ namespace MaterialTraceability.Rfid.Impl log.RfidLog("----函数调用:Device_DealValidPack：NoRead!"); m_BarcodeGroupCount = 0; m_GetReadNoDataSuccessful = true; - m_OneEpcDataLen = 0; + m_OneEpcDataLen = 0; } else { @@ -255,10 +255,10 @@ namespace MaterialTraceability.Rfid.Impl //log.SemaphoreLog("信号量m_GlobalSem，释放"); //m_GlobalSem.Release(); } - catch(Exception e) + catch (Exception e) { - log.Error("释放信号量错误!"+e.ToString()); - log.SemaphoreLog("释放信号量错误："+e.Message); + log.Error("释放信号量错误!" + e.ToString()); + log.SemaphoreLog("释放信号量错误：" + e.Message); } break; default: @@ -272,7 +272,7 @@ namespace MaterialTraceability.Rfid.Impl log.Error("空间名：" + ex.Source + "；" + '\n' + "方法名：" + ex.TargetSite + '\n' + "故障点：" + ex.StackTrace.Substring(ex.StackTrace.LastIndexOf("\\") + 1, ex.StackTrace.Length - ex.StackTrace.LastIndexOf("\\") - 1) + '\n' + - "错误提示：",ex); + "错误提示：", ex); return false; } return true; @@ -332,7 +332,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.RfidLog("Device_SendHeartPack："+ex.Message); + log.RfidLog("Device_SendHeartPack：" + ex.Message); iResult = 3; } finally @@ -447,7 +447,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("Device_GetOneIdentifyData识别单条EPC数据异常：",ex); + log.Error("Device_GetOneIdentifyData识别单条EPC数据异常：", ex); iResult = 0; m_ReadDataSuccessful = false; } @@ -518,7 +518,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("读取数据异常：",ex); + log.Error("读取数据异常：", ex); iResult = 0; } finally @@ -629,7 +629,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("写入数据异常：",ex); + log.Error("写入数据异常：", ex); iResult = 0; } finally @@ -1135,7 +1135,7 @@ namespace MaterialTraceability.Rfid.Impl tag.Count = tempDataCount; tag.RSSI = tempDataRSSI; tag.EPC = tempDataByte; - tag.EPCstring = System.Text.Encoding.ASCII.GetString(tempDataByte);; + tag.EPCstring = System.Text.Encoding.ASCII.GetString(tempDataByte); ; tag.Antana = tempDataANT; tagInfoList.Add(tag); int iBarcodeListLen = tagInfoList.Count; //特别注意，必须这样，要不然会多一条数据 @@ -1146,7 +1146,7 @@ namespace MaterialTraceability.Rfid.Impl iFirstLeftBarcketPos = iFirstLeftBarcketPos + 21; } - + } catch (Exception ex) { @@ -1196,7 +1196,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("Device_SetRf异常：",ex); + log.Error("Device_SetRf异常：", ex); bResult = false; } return bResult; @@ -1279,7 +1279,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("Device_GetOneIdentifyData识别单条EPC数据异常：",ex); + log.Error("Device_GetOneIdentifyData识别单条EPC数据异常：", ex); strResult = ""; } finally @@ -1361,7 +1361,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Error("发送停止连续识别命令异常：",ex); + log.Error("发送停止连续识别命令异常：", ex); bResult = false; } return bResult; @@ -1371,8 +1371,8 @@ namespace MaterialTraceability.Rfid.Impl { return 0; } - - public List Device_GetTagInfoList(DeviceType devicetype,int waitTime) + + public List Device_GetTagInfoList(DeviceType devicetype, int waitTime) { log.Info("进入Device_GetTagInfoList函数，参数deviceType：" + jsonChange.ModeToJson(devicetype) + "；waitTime：" + waitTime); byte[] u16byte = new byte[2]; @@ -1413,8 +1413,8 @@ namespace MaterialTraceability.Rfid.Impl if (m_ICommunicateService.SendMessage(pMessagePack)) //发送报文成功 { m_ReadDataSuccessful = true; - log.SemaphoreLog("信号量m_OneEpcSem，WaitOne("+ waitTime + ", false)"); - if (m_OneEpcSem.WaitOne(waitTime+2000, false)) //等待结果,并取结果返回。 + log.SemaphoreLog("信号量m_OneEpcSem，WaitOne(" + waitTime + ", false)"); + if (m_OneEpcSem.WaitOne(waitTime + 2000, false)) //等待结果,并取结果返回。 { if (m_OneEpcDataLen > 0) //有数据，正常 { @@ -1458,7 +1458,7 @@ namespace MaterialTraceability.Rfid.Impl } catch (Exception ex) { - log.Info("Device_GetTagInfoList识别单条EPC数据异常：" + ex.Message); + log.Info("Device_GetTagInfoList识别单条EPC数据异常：" + ex.Message); log.Error("Device_GetTagInfoList识别单条EPC数据异常：", ex); iResult = 0; m_TagInfoList.Clear(); @@ -1466,7 +1466,7 @@ namespace MaterialTraceability.Rfid.Impl } finally { - // m_GlobalSem.Release(); + // m_GlobalSem.Release(); } return m_TagInfoList; } diff --git a/HighWayIot.Rfid/Properties/AssemblyInfo.cs b/HighWayIot.Rfid/Properties/AssemblyInfo.cs index d8f0a907..817ce7e3 100644 --- a/HighWayIot.Rfid/Properties/AssemblyInfo.cs +++ b/HighWayIot.Rfid/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll index 0ee71f53..998f71e7 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.dll differ diff --git a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb index 95c11632..c33518a0 100644 Binary files a/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb and b/HighWayIot.Rfid/bin/Debug/HighWayIot.Rfid.pdb differ diff --git a/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ca74b682..5e9791b8 100644 Binary files a/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.Rfid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache index b2daedad..f288df9e 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache index f70ec1cd..aec1db39 100644 --- a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache +++ b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -04701df7fcd129f015dab2323aa9eb657f4e4ab1 +ffa55724955f43b8f222494cb4da959fe91c3b60 diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll index 0ee71f53..998f71e7 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.dll differ diff --git a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb index 95c11632..c33518a0 100644 Binary files a/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb and b/HighWayIot.Rfid/obj/Debug/HighWayIot.Rfid.pdb differ diff --git a/HighWayIot.TouchSocket/Class1.cs b/HighWayIot.TouchSocket/Class1.cs index 503c1894..1a92328b 100644 --- a/HighWayIot.TouchSocket/Class1.cs +++ b/HighWayIot.TouchSocket/Class1.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace HighWayIot.TouchSocket +namespace HighWayIot.TouchSocket { public class Class1 { diff --git a/HighWayIot.TouchSocket/Properties/AssemblyInfo.cs b/HighWayIot.TouchSocket/Properties/AssemblyInfo.cs index 1b611ba8..cf4fffd8 100644 --- a/HighWayIot.TouchSocket/Properties/AssemblyInfo.cs +++ b/HighWayIot.TouchSocket/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll index 8ee7bf0f..e16aedb5 100644 Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.dll differ diff --git a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb index af325d51..8aeba694 100644 Binary files a/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb and b/HighWayIot.TouchSocket/bin/Debug/HighWayIot.TouchSocket.pdb differ diff --git a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 06f5bd7b..bf226838 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot.TouchSocket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache index 40874a00..ebec61d8 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.AssemblyReference.cache differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache index c5fc9e75..92226393 100644 --- a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache +++ b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -cde3a84dcbad2f8a6d34ab3a96fe908026dc1963 +4123d2b52be64d7bd18b8b7566f54b9a453959a4 diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll index 8ee7bf0f..e16aedb5 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.dll differ diff --git a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb index af325d51..8aeba694 100644 Binary files a/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb and b/HighWayIot.TouchSocket/obj/Debug/HighWayIot.TouchSocket.pdb differ diff --git a/HighWayIot.sln b/HighWayIot.sln index b8a8136c..9c2c9352 100644 --- a/HighWayIot.sln +++ b/HighWayIot.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.34031.81 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33502.453 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot", "HighWayIot\HighWayIot.csproj", "{DFFFA7B9-62AF-4E3F-B802-A68B135490CA}" EndProject @@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HighWayIot.Config", "HighWa EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aucma.Scada.Business", "Aucma.Scada.Business\Aucma.Scada.Business.csproj", "{004383BC-659A-41A5-9176-D60831B08438}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aucma.Scada.Model", "Aucma.Scada.Model\Aucma.Scada.Model.csproj", "{320B716A-2373-4342-B0AA-3C4CB041E8AD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -75,6 +77,10 @@ Global {004383BC-659A-41A5-9176-D60831B08438}.Debug|Any CPU.Build.0 = Debug|Any CPU {004383BC-659A-41A5-9176-D60831B08438}.Release|Any CPU.ActiveCfg = Release|Any CPU {004383BC-659A-41A5-9176-D60831B08438}.Release|Any CPU.Build.0 = Release|Any CPU + {320B716A-2373-4342-B0AA-3C4CB041E8AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {320B716A-2373-4342-B0AA-3C4CB041E8AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {320B716A-2373-4342-B0AA-3C4CB041E8AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {320B716A-2373-4342-B0AA-3C4CB041E8AD}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/HighWayIot/Program.cs b/HighWayIot/Program.cs index c112eb49..01951b70 100644 --- a/HighWayIot/Program.cs +++ b/HighWayIot/Program.cs @@ -1,12 +1,6 @@ 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 HighWayIot { @@ -24,24 +18,7 @@ namespace HighWayIot static void Main(string[] args) { logger.Info("初始化启动"); - var info = spaceInfoService.InStoreGetSpaceInfoByMaterialType("X-001", "SC232"); - if (info != null) - { - //生成入库任务依次下发至PLC - RealTaskInfo realTaskInfo = new RealTaskInfo(); - realTaskInfo.taskType = 1; - realTaskInfo.taskCode = System.Guid.NewGuid().ToString("N"); - realTaskInfo.storeCode = info.storeCode; - realTaskInfo.spaceCode = info.spaceCode; - realTaskInfo.materialType = "SC232"; - realTaskInfo.planAmount = 1; - realTaskInfo.taskStatus = 1; - _taskInfoService.AddTaskInfo(realTaskInfo); - } - else - { - //报警停线 - } + } } } diff --git a/HighWayIot/Properties/AssemblyInfo.cs b/HighWayIot/Properties/AssemblyInfo.cs index c046c7dd..0d8dc7b4 100644 --- a/HighWayIot/Properties/AssemblyInfo.cs +++ b/HighWayIot/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 diff --git a/HighWayIot/bin/Debug/Aucma.Scada.Model.dll b/HighWayIot/bin/Debug/Aucma.Scada.Model.dll new file mode 100644 index 00000000..ac2c9356 Binary files /dev/null and b/HighWayIot/bin/Debug/Aucma.Scada.Model.dll differ diff --git a/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb b/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb new file mode 100644 index 00000000..965e7e48 Binary files /dev/null and b/HighWayIot/bin/Debug/Aucma.Scada.Model.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Common.dll b/HighWayIot/bin/Debug/HighWayIot.Common.dll index 4602709b..9b1e4f6b 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Common.dll and b/HighWayIot/bin/Debug/HighWayIot.Common.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Common.pdb b/HighWayIot/bin/Debug/HighWayIot.Common.pdb index 319713af..e2ddc9b3 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Common.pdb and b/HighWayIot/bin/Debug/HighWayIot.Common.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.dll b/HighWayIot/bin/Debug/HighWayIot.Config.dll index a430d27c..0aef53b1 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Config.dll and b/HighWayIot/bin/Debug/HighWayIot.Config.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Config.pdb b/HighWayIot/bin/Debug/HighWayIot.Config.pdb index 5500b11f..05fb1cc8 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Config.pdb and b/HighWayIot/bin/Debug/HighWayIot.Config.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll index 1e67a3b1..40e92abd 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.dll and b/HighWayIot/bin/Debug/HighWayIot.Log4net.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb index ac94b000..78fc9a14 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb and b/HighWayIot/bin/Debug/HighWayIot.Log4net.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.dll b/HighWayIot/bin/Debug/HighWayIot.Repository.dll index a7cf79c5..46fc0b5d 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.dll and b/HighWayIot/bin/Debug/HighWayIot.Repository.dll differ diff --git a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb index b0e1943e..fa9f6fe9 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.Repository.pdb and b/HighWayIot/bin/Debug/HighWayIot.Repository.pdb differ diff --git a/HighWayIot/bin/Debug/HighWayIot.exe b/HighWayIot/bin/Debug/HighWayIot.exe index 739a6ca4..e65310e8 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.exe and b/HighWayIot/bin/Debug/HighWayIot.exe differ diff --git a/HighWayIot/bin/Debug/HighWayIot.pdb b/HighWayIot/bin/Debug/HighWayIot.pdb index 2ceab677..c70144fa 100644 Binary files a/HighWayIot/bin/Debug/HighWayIot.pdb and b/HighWayIot/bin/Debug/HighWayIot.pdb differ diff --git a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index c14520b4..7da19c7b 100644 Binary files a/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/HighWayIot/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index 895dd160..c71d79e3 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache and b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache differ diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache index 73d122c2..1da73b1f 100644 --- a/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache +++ b/HighWayIot/obj/Debug/HighWayIot.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -afc27a56e1f15cc951dff1bb762f414f981b3134 +a06e08eba04b58b9c288665f37c4b068d1aa4bff diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt index 888d8738..2d091256 100644 --- a/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt +++ b/HighWayIot/obj/Debug/HighWayIot.csproj.FileListAbsolute.txt @@ -139,3 +139,5 @@ E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.csproj. E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.csproj.CopyComplete E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.exe E:\桌面\澳柯玛MES项目\Aucma.Scada\HighWayIot\obj\Debug\HighWayIot.pdb +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot\bin\Debug\Aucma.Scada.Model.dll +E:\桌面\澳柯玛MES项目\程序设计\Aucma.Scada\HighWayIot\bin\Debug\Aucma.Scada.Model.pdb diff --git a/HighWayIot/obj/Debug/HighWayIot.exe b/HighWayIot/obj/Debug/HighWayIot.exe index 739a6ca4..e65310e8 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.exe and b/HighWayIot/obj/Debug/HighWayIot.exe differ diff --git a/HighWayIot/obj/Debug/HighWayIot.pdb b/HighWayIot/obj/Debug/HighWayIot.pdb index 2ceab677..c70144fa 100644 Binary files a/HighWayIot/obj/Debug/HighWayIot.pdb and b/HighWayIot/obj/Debug/HighWayIot.pdb differ