wenjy
/
Aucma.Scada
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 代码整理，视图层不关联持久层

Browse Source
foamRearStore
wenjy 1 year ago
parent 1b65145396
commit 00d883fcef
256 changed files with 452 additions and 801 deletions
Show Stats Download Patch File Download Diff File

BIN
.vs/HighWayIot/v17/.suo
View File

Binary file not shown.

27
Aucma.Scada.Business/AssemblyPlanBusiness.cs
Unescape Escape View File

@ -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<ExecutePlanInfo> 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
/// </summary>
/// <param name="productPlanCode"></param>
/// <param name="transmitAmount"></param>
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
/// 执行计划上移
/// </summary>
/// <param name="executePlanCode"></param>
public void ExecutePlanInfo_MoveUp(List<ExecutePlanInfo> executePlanInfos,string executePlanCode)
public void ExecutePlanInfo_MoveUp(List<ExecutePlanInfo> executePlanInfos, string executePlanCode)
{
List<ExecutePlanInfo> executePlans = new List<ExecutePlanInfo>();
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
/// 下传计划
/// </summary>
/// <param name="planCode"></param>
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);
}

4
Aucma.Scada.Business/Aucma.Scada.Business.csproj
Unescape Escape View File

@ -51,6 +51,10 @@
<Compile Include="TaskInfoBusiness.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Aucma.Scada.Model\Aucma.Scada.Model.csproj">
<Project>{320B716A-2373-4342-B0AA-3C4CB041E8AD}</Project>
<Name>Aucma.Scada.Model</Name>
</ProjectReference>
<ProjectReference Include="..\HighWayIot.Common\HighWayIot.Common.csproj">
<Project>{89a1edd9-d79e-468d-b6d3-7d07b8843562}</Project>
<Name>HighWayIot.Common</Name>

19
Aucma.Scada.Business/InStoreBusiness.cs
Unescape Escape View File

@ -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
/// <param name="materialName"></param>
/// <param name="spaceName"></param>
/// <param name="materialType"></param>
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;
/// <summary>
@ -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
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <param name="materialType"></param>
private void InStoreFinish(string taskCode,string storeCode)
private void InStoreFinish(string taskCode, string storeCode)
{
try
{

27
Aucma.Scada.Business/InventoryInfoBusiness.cs
Unescape Escape View File

@ -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<BaseSpaceInfo> 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
/// </summary>
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
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
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
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
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
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
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
public void RefreshBaseSpaceDetails(string storeCode,string spaceCode)
public void RefreshBaseSpaceDetails(string storeCode, string spaceCode)
{
List<BaseSpaceDetail> spaceDetails = _spaceDetailService.GetSpaceDetailsBySpaceCode(storeCode, spaceCode);
if(spaceDetails != null)
if (spaceDetails != null)
{
RefreshSpaceDetailsEvent?.Invoke(spaceDetails);
}

9
Aucma.Scada.Business/MainBusiness.cs
Unescape Escape View File

@ -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
{

48
Aucma.Scada.Business/OutStoreBusiness.cs
Unescape Escape View File

@ -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
/// <param name="storeCode"></param>
/// <param name="bomInfo"></param>
/// <param name="planCode"></param>
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
/// 创建出库任务
/// </summary>
/// <param name="spaceInfo"></param>
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
/// </summary>
/// <param name="spaceInfo"></param>
/// <param name="spaceDetail"></param>
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<RealTaskInfo> taskInfos = new List<RealTaskInfo>();
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
/// <param name="taskCode"></param>
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
/// <param name="storeCode"></param>
/// <param name="spaceCode"></param>
/// <returns></returns>
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);
}

1
Aucma.Scada.Business/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下

10
Aucma.Scada.Business/TaskHandleBusiness.cs
Unescape Escape View File

@ -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)

9
Aucma.Scada.Business/TaskInfoBusiness.cs
Unescape Escape View File

@ -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
/// <returns></returns>
public List<RealTaskInfo> 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);
}
}
}

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Common.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Common.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Config.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Config.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Log4net.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Plc.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
e95491ca2dbbb0933e831785e126e790f729e224
185c60829673f2e3cfd6d120f59a44345aa66057

2
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -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

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

61
Aucma.Scada.Model/Aucma.Scada.Model.csproj
Unescape Escape View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{320B716A-2373-4342-B0AA-3C4CB041E8AD}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Aucma.Scada.Model</RootNamespace>
<AssemblyName>Aucma.Scada.Model</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="SqlSugar">
<HintPath>..\HighWayIot.Repository\bin\Debug\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="domain\BaseBomInfo.cs" />
<Compile Include="domain\BaseSpaceDetail.cs" />
<Compile Include="domain\BaseSpaceInfo.cs" />
<Compile Include="domain\ExecutePlanInfo.cs" />
<Compile Include="domain\ProductPlanInfo.cs" />
<Compile Include="domain\RealTaskInfo.cs" />
<Compile Include="domain\SysUserInfo.cs" />
<Compile Include="dto\OperationType.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="enums\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

35
Aucma.Scada.Model/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -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")]

BIN
Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Model/bin/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Model/bin/Debug/SqlSugar.dll
View File

Binary file not shown.

7
HighWayIot.Repository/domain/BaseBomInfo.cs → Aucma.Scada.Model/domain/BaseBomInfo.cs
Unescape Escape View File

@ -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

6
HighWayIot.Repository/domain/BaseSpaceDetail.cs → Aucma.Scada.Model/domain/BaseSpaceDetail.cs
Unescape Escape View File

@ -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
{
/// <summary>
/// 货道明细

7
HighWayIot.Repository/domain/BaseSpaceInfo.cs → Aucma.Scada.Model/domain/BaseSpaceInfo.cs
Unescape Escape View File

@ -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
{
/// <summary>
/// 货道信息

6
HighWayIot.Repository/domain/ExecutePlanInfo.cs → Aucma.Scada.Model/domain/ExecutePlanInfo.cs
Unescape Escape View File

@ -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

6
HighWayIot.Repository/domain/ProductPlanInfo.cs → Aucma.Scada.Model/domain/ProductPlanInfo.cs
Unescape Escape View File

@ -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

8
HighWayIot.Repository/domain/RealTaskInfo.cs → Aucma.Scada.Model/domain/RealTaskInfo.cs
Unescape Escape View File

@ -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
/// <summary>
/// 主键标识
///</summary>
[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; }
/// <summary>

10
HighWayIot.Repository/domain/SysUserInfo.cs → Aucma.Scada.Model/domain/SysUserInfo.cs
Unescape Escape View File

@ -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
{
/// <summary>
/// 用户信息
@ -31,7 +25,7 @@ namespace HighWayIot.Repository.domain
///</summary>
[SugarColumn(ColumnName = "PASSWORD")]
public string password { get; set; }
}
}

8
HighWayIot.Repository/enums/OperationType.cs → Aucma.Scada.Model/dto/OperationType.cs
Unescape Escape View File

@ -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
{

4
Aucma.Scada.Model/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs
Unescape Escape View File

@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")]

BIN
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.AssemblyReference.cache
View File

Binary file not shown.

0
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CopyComplete
Unescape Escape View File

1
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -0,0 +1 @@
f21fa175ee2704029739090502d89e171b1728e9

8
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -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

BIN
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.Model/obj/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

6
Aucma.Scada.UI/App.xaml.cs
Unescape Escape View File

@ -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()
{

4
Aucma.Scada.UI/Aucma.Scada.UI.csproj
Unescape Escape View File

@ -244,6 +244,10 @@
<Project>{004383BC-659A-41A5-9176-D60831B08438}</Project>
<Name>Aucma.Scada.Business</Name>
</ProjectReference>
<ProjectReference Include="..\Aucma.Scada.Model\Aucma.Scada.Model.csproj">
<Project>{320b716a-2373-4342-b0aa-3c4cb041e8ad}</Project>
<Name>Aucma.Scada.Model</Name>
</ProjectReference>
<ProjectReference Include="..\HighWayIot.Common\HighWayIot.Common.csproj">
<Project>{89a1edd9-d79e-468d-b6d3-7d07b8843562}</Project>
<Name>HighWayIot.Common</Name>

4
Aucma.Scada.UI/Converter/AssemblyPlan/PlanStatusConverter.cs
Unescape Escape View File

@ -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

8
Aucma.Scada.UI/Converter/LinerInventory/StatusLabelConverter.cs
Unescape Escape View File

@ -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)

8
Aucma.Scada.UI/Converter/ShellInventory/StatusLabelConverter.cs
Unescape Escape View File

@ -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)

4
Aucma.Scada.UI/Converter/TaskInfo/TaskStatusConverter.cs
Unescape Escape View File

@ -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

4
Aucma.Scada.UI/Converter/TaskInfo/TaskTypeConverter.cs
Unescape Escape View File

@ -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

13
Aucma.Scada.UI/LogInfoControl.xaml.cs
Unescape Escape View File

@ -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
{

14
Aucma.Scada.UI/MainWindow.xaml.cs
Unescape Escape View File

@ -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
{

13
Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml.cs
Unescape Escape View File

@ -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
{

14
Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml.cs
Unescape Escape View File

@ -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;
}

16
Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml.cs
Unescape Escape View File

@ -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
{

16
Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml.cs
Unescape Escape View File

@ -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
{

16
Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml.cs
Unescape Escape View File

@ -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
{

16
Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml.cs
Unescape Escape View File

@ -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
{

14
Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml.cs
Unescape Escape View File

@ -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;
}
}

15
Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml.cs
Unescape Escape View File

@ -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
{

13
Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml.cs
Unescape Escape View File

@ -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
{

13
Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml.cs
Unescape Escape View File

@ -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
{

2
Aucma.Scada.UI/Properties/AssemblyInfo.cs
Unescape Escape View File

@ -1,6 +1,4 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;

13
Aucma.Scada.UI/RecordControl.xaml.cs
Unescape Escape View File

@ -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
{

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.Model.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Common.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Common.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Config.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Config.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Log4net.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Plc.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.dll
View File

Binary file not shown.

BIN
Aucma.Scada.UI/bin/Debug/HighWayIot.Repository.pdb
View File

Binary file not shown.

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache
View File

Binary file not shown.

2
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.CoreCompileInputs.cache
Unescape Escape View File

@ -1 +1 @@
972145d32fb577cf15f13c2f976113859b9cacdd
d532180f0e1d6503c905235ff720a1761f0f3c80

2
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.FileListAbsolute.txt
Unescape Escape View File

@ -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

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.exe
View File

Binary file not shown.

BIN
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.pdb
View File

Binary file not shown.

6
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.cache
Unescape Escape View File

@ -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

6
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.cache
Unescape Escape View File

@ -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

32
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.i.lref
Unescape Escape View File

@ -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;;

32
Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI_MarkupCompile.lref
Unescape Escape View File

@ -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;;

BIN
Aucma.Scada.UI/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

22
Aucma.Scada.UI/viewModel/AssemblyPlan/AssemblyPlanViewModel.cs
Unescape Escape View File

@ -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("执行计划下达失败");
}
}
}
/// <summary>
@ -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<string>()
@ -344,5 +340,5 @@ namespace Aucma.Scada.UI.viewModel.AssemblyPlan
}
}
}

11
Aucma.Scada.UI/viewModel/AssemblyPlan/PlanInfoEditViewModel.cs
Unescape Escape View File

@ -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
{

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save