first commit
This commit is contained in:
ldw
@@ -0,0 +1 @@
|
||||
{"RootPath":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.MES","ProjectFileName":"JinYuan.MES.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Enums\\MesResType.cs"},{"SourceFile":"Enums\\MesUploadType.cs"},{"SourceFile":"IMes.cs"},{"SourceFile":"MESApiHelper.cs"},{"SourceFile":"MesDataProcess.cs"},{"SourceFile":"Models\\EqpStatusParam.cs"},{"SourceFile":"Models\\ParamReturnData.cs"},{"SourceFile":"Models\\SingleCellOutStation.cs"},{"SourceFile":"Models\\SingleCellInStation.cs"},{"SourceFile":"Models\\ManyCellInStation.cs"},{"SourceFile":"Models\\ManyCellOutStation.cs"},{"SourceFile":"Models\\LoginEnyity.cs"},{"SourceFile":"Models\\ParamChange.cs"},{"SourceFile":"Models\\ProductProcessParam.cs"},{"SourceFile":"Models\\ProductResultParameters.cs"},{"SourceFile":"Models\\MesResponse.cs"},{"SourceFile":"Models\\UploadAlarmParam.cs"},{"SourceFile":"Models\\UploadDeviceCollectData.cs"},{"SourceFile":"Models\\WattrMeter.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.7.2.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.Helper\\bin\\Debug\\JinYuan.Helper.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.Models\\bin\\Debug\\JinYuan.Models.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.7.2\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.MES\\bin\\Debug\\JinYuan.MES.dll","OutputItemRelativePath":"JinYuan.MES.dll"},{"OutputItemFullPath":"E:\\JY_项目\\1086大方形\\1086-1\\LargeSquareOne\\JinYuan.MES\\bin\\Debug\\JinYuan.MES.pdb","OutputItemRelativePath":"JinYuan.MES.pdb"}],"CopyToOutputEntries":[]}
|
||||
@@ -0,0 +1,21 @@
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace JinYuan.MES.Enums
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public enum MesResType
|
||||
{
|
||||
[Description("停线")]
|
||||
A = 1,
|
||||
[Description("排出")]
|
||||
B = 2,
|
||||
[Description("警示")]
|
||||
C = 3,
|
||||
[Description("OK值")]
|
||||
D = 4,
|
||||
[Description("未知的结果")]
|
||||
UnKnow = 99999
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace JinYuan.MES.Enums
|
||||
{
|
||||
/// <summary>
|
||||
/// MES上传的三种类型
|
||||
/// </summary>
|
||||
public enum MesUploadType
|
||||
{
|
||||
/// <summary>
|
||||
/// 单进整出
|
||||
/// </summary>
|
||||
[Description("DZ")]
|
||||
DZ = 1,
|
||||
/// <summary>
|
||||
/// 整进整出
|
||||
/// </summary>
|
||||
[Description("ZZ")]
|
||||
ZZ = 2,
|
||||
/// <summary>
|
||||
/// 单进单出
|
||||
/// </summary>
|
||||
[Description("DD")]
|
||||
DD = 3,
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,232 @@
|
||||
using JinYuan.MES.Enums;
|
||||
using JinYuan.MES.Models;
|
||||
using JinYuan.Models;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES
|
||||
{
|
||||
/// <summary>
|
||||
/// MES接口
|
||||
/// </summary>
|
||||
public interface IMes
|
||||
{
|
||||
/// <summary>
|
||||
/// 登录接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="passWord"></param>
|
||||
/// <param name="msg"></param>
|
||||
/// <returns></returns>
|
||||
bool LoginEnyity(string url, string siteCode, string lineCode, string equipNum, string userName, string passWord, string UserCardID, ref string resJson);
|
||||
/// <summary>
|
||||
/// 设备参数设定值请求接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <returns></returns>
|
||||
ParamReturnData GetParamSetRequest(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, ref string resJson);
|
||||
|
||||
/// <summary>
|
||||
/// 参数设定值变更接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="paramChangeItems"></param>
|
||||
/// <param name="msg"></param>
|
||||
/// <returns></returns>
|
||||
bool ParamChange(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, List<TagListItem> paramChangeItems, ref string resJson);
|
||||
|
||||
/// <summary>
|
||||
/// 单个上传（只上传条码，不上传卷芯码）
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="BarCode"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <param name="mesResType"></param>
|
||||
/// <returns></returns>
|
||||
bool SingleCellInStation(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, string BarCode, ref string MesMessage, ref MesResType mesResType);
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 复投单个上传（只上传条码，不上传卷芯码）
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="BarCode"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <param name="mesResType"></param>
|
||||
/// <returns></returns>
|
||||
bool SingleFTCellInStation(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, string BarCode, ref string MesMessage, ref MesResType mesResType);
|
||||
|
||||
/// <summary>
|
||||
/// 电芯进站接口(多个)
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="code"></param>
|
||||
/// <param name="scanRes"></param>
|
||||
/// <param name="msg"></param>
|
||||
/// <param name="mesResType"></param>
|
||||
/// <returns></returns>
|
||||
bool ManyCellInStation(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, List<string> listBar, ref List<string> MesMessage, ref List<MesResType> mesResType);
|
||||
|
||||
/// <summary>
|
||||
/// 电芯进站接口(多个)
|
||||
/// </summary>
|
||||
/// <param name="list"></param>
|
||||
/// <param name="isWeldingSpotlssue"></param>
|
||||
/// <param name="MesMessage"></param>
|
||||
/// <param name="mesResType"></param>
|
||||
/// <returns></returns>
|
||||
bool OutboundInformations(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, BGearEntity listBar, ref string MesMessage, ref MesResType mesResType, List<string> NGcodeList,List<string> ngMessage);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 产品过程加工参数接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="unloadType"></param>
|
||||
/// <param name="productProcessParam"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <returns></returns>
|
||||
bool ProductProcessParam(string url, string siteCode, string userName, string equipNum, string lineCode, string materialCode, MesUploadType unloadType, List<ProductProcessParam> productProcessParam, ref string resJson);
|
||||
|
||||
/// <summary>
|
||||
/// 产品结果加工参数接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="tagDataVOListItem"></param>
|
||||
/// <param name="identificationListItem"></param>
|
||||
/// <param name="unloadType"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <returns></returns>
|
||||
bool ProducResultParam(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, BGearEntity m, MesUploadType unloadType, ref string resJson);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 单电芯出站
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="m"></param>
|
||||
/// <param name="type"></param>
|
||||
/// <param name="mesage"></param>
|
||||
/// <param name="mesResType"></param>
|
||||
/// <returns></returns>
|
||||
bool SingleCellOutStation(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, BGearEntity m, int type, string materialLotCodeLocator, ref string mesage, ref MesResType mesResType);
|
||||
|
||||
/// <summary>
|
||||
/// 多电芯出站接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="cellOutStation"></param>
|
||||
/// <param name="type"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <param name="mesResType"></param>
|
||||
/// <returns></returns>
|
||||
//bool ManyCellOutStation(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, List<BGearEntity> m, int type, string materialLotCodeLocator, ref List<string> MesMessage, ref List<MesResType> mesResType);
|
||||
|
||||
/// <summary>
|
||||
/// 设备运行状态接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="statusCode"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="faultCodes"></param>
|
||||
/// <param name="guid"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <returns></returns>
|
||||
bool UploadEquStatus(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, string guid, string statusCode, List<FaultCodeList> faultCodes, ref string resJson);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 设备报警接口
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="materialCode"></param>
|
||||
/// <param name="alarmLineListItem"></param>
|
||||
/// <param name="guid"></param>
|
||||
/// <param name="msg"></param>
|
||||
/// <returns></returns>
|
||||
bool UploadEquAlarm(string url, string siteCode, string lineCode, string equipNum, string materialCode, string userName, List<AlarmData> alarmObj, string guid, ref string msg);
|
||||
|
||||
/// <summary>
|
||||
/// 能耗数据上传
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="siteCode"></param>
|
||||
/// <param name="lineCode"></param>
|
||||
/// <param name="userName"></param>
|
||||
/// <param name="electricMeterNum"></param>
|
||||
/// <param name="wattrs"></param>
|
||||
/// <param name="msg"></param>
|
||||
/// <returns></returns>
|
||||
bool UploadEquEnergy(string url, string siteCode, string lineCode, string equipNum, string userName, List<string> electricMeterNum, List<WattrMeter> wattrs, ref string msg);
|
||||
|
||||
/// <summary>
|
||||
/// 风速仪数据上传
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="equipNum"></param>
|
||||
/// <param name="antiDustAirSpeedNum"></param>
|
||||
/// <param name="collectData"></param>
|
||||
/// <param name="resJson"></param>
|
||||
/// <returns></returns>
|
||||
bool UploadDeviceCollectData(string url, string equipNum, List<string> antiDustAirSpeedNum, List<float> collectData, ref string msg);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,83 @@
|
||||
<?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>{530B6426-08E7-461C-91DC-787F876620FC}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>JinYuan.MES</RootNamespace>
|
||||
<AssemblyName>JinYuan.MES</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.7.2</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="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.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="Enums\MesResType.cs" />
|
||||
<Compile Include="Enums\MesUploadType.cs" />
|
||||
<Compile Include="IMes.cs" />
|
||||
<Compile Include="MESApiHelper.cs" />
|
||||
<Compile Include="MesDataProcess.cs" />
|
||||
<Compile Include="Models\EqpStatusParam.cs" />
|
||||
<Compile Include="Models\ParamReturnData.cs" />
|
||||
<Compile Include="Models\SingleCellOutStation.cs" />
|
||||
<Compile Include="Models\SingleCellInStation.cs" />
|
||||
<Compile Include="Models\ManyCellInStation.cs" />
|
||||
<Compile Include="Models\ManyCellOutStation.cs" />
|
||||
<Compile Include="Models\LoginEnyity.cs" />
|
||||
<Compile Include="Models\ParamChange.cs" />
|
||||
<Compile Include="Models\ProductProcessParam.cs" />
|
||||
<Compile Include="Models\ProductResultParameters.cs" />
|
||||
<Compile Include="Models\MesResponse.cs" />
|
||||
<Compile Include="Models\UploadAlarmParam.cs" />
|
||||
<Compile Include="Models\UploadDeviceCollectData.cs" />
|
||||
<Compile Include="Models\WattrMeter.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\JinYuan.Helper\JinYuan.Helper.csproj">
|
||||
<Project>{258D0AB7-2B4F-4D8F-A3CD-7A8CB4A85360}</Project>
|
||||
<Name>JinYuan.Helper</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\JinYuan.Models\JinYuan.Models.csproj">
|
||||
<Project>{4C0BCB84-5CD7-4846-8363-C4C10D46E391}</Project>
|
||||
<Name>JinYuan.Models</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -0,0 +1,117 @@
|
||||
using JinYuan.MES.Models;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Net;
|
||||
using System.Net.Http;
|
||||
using System.Net.Http.Headers;
|
||||
using System.Text;
|
||||
|
||||
namespace JinYuan.MES
|
||||
{
|
||||
/// <summary>
|
||||
/// MES接口类
|
||||
/// </summary>
|
||||
public class MESApiHelper
|
||||
{
|
||||
|
||||
static HttpClient httpClient;
|
||||
private static readonly Lazy<HttpClient> _httpClient = new Lazy<HttpClient>(() => new HttpClient());
|
||||
public static HttpClient Instance => _httpClient.Value;
|
||||
|
||||
public MESApiHelper()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
public static string WepPostAPIAsync(string url, string strJosnData)
|
||||
{
|
||||
MesResponse mesResponse = new MesResponse();
|
||||
try
|
||||
{
|
||||
StringContent stringContent = new StringContent(strJosnData, Encoding.UTF8, "application/json");
|
||||
string ResponseMessage = new HttpClient()
|
||||
{
|
||||
Timeout = TimeSpan.FromSeconds(3.0)
|
||||
}.PostAsync(url, (HttpContent)stringContent).Result.Content.ReadAsStringAsync().Result;
|
||||
return ResponseMessage;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
mesResponse.success = false;
|
||||
mesResponse.message = ex.Message;
|
||||
return JsonConvert.SerializeObject(mesResponse);
|
||||
}
|
||||
}
|
||||
|
||||
public static string HttpPostJsonAPI(string url, string strJosnData)
|
||||
{
|
||||
MesResponse mesResponse = new MesResponse();
|
||||
try
|
||||
{
|
||||
StringContent stringContent = new StringContent(strJosnData, Encoding.UTF8, "application/json");
|
||||
return new HttpClient()
|
||||
{
|
||||
Timeout = TimeSpan.FromSeconds(5.0)
|
||||
}.PostAsync(url, (HttpContent)stringContent).Result.Content.ReadAsStringAsync().Result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
mesResponse.success = false;
|
||||
mesResponse.message = ex.Message;
|
||||
return JsonConvert.SerializeObject(mesResponse);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="strJosnData"></param>
|
||||
/// <returns></returns>
|
||||
public string WebApiPost(string url, string strJosnData)
|
||||
{
|
||||
MesResponse mesResponse = new MesResponse();
|
||||
try
|
||||
{
|
||||
HttpContent stringContent = new StringContent(strJosnData);
|
||||
stringContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
|
||||
var _response = httpClient.PostAsync(url, stringContent).Result;
|
||||
var _clientResult = _response.Content.ReadAsStringAsync().Result;
|
||||
return _clientResult;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
mesResponse.code = "99";
|
||||
mesResponse.success = false;
|
||||
mesResponse.message = ex.Message;
|
||||
return JsonConvert.SerializeObject(mesResponse);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 同步上传
|
||||
/// </summary>
|
||||
/// <param name="url"></param>
|
||||
/// <param name="json"></param>
|
||||
/// <returns></returns>
|
||||
public static string WebApiPostTranafer(string url, string json)
|
||||
{
|
||||
try
|
||||
{
|
||||
byte[] bytes = Encoding.UTF8.GetBytes(json);
|
||||
WebClient client = new WebClient();
|
||||
client.Headers.Add("Content-type", "application/json");
|
||||
client.Headers.Add("ContentLength", json.Length.ToString());
|
||||
Encoding enc = Encoding.GetEncoding("UTF-8");
|
||||
byte[] responsedata = client.UploadData(url, "Post", bytes);
|
||||
|
||||
string res = enc.GetString(responsedata);
|
||||
return res;
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,63 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备状态上传接口参数类
|
||||
/// </summary>
|
||||
public class EqpStatusParam
|
||||
{
|
||||
/// <summary>
|
||||
/// 工厂代码
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
/// 产线编号
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
/// 设备编号
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
/// 员工账号
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
/// 库位ID
|
||||
/// </summary>
|
||||
public string seatId { get; set; }
|
||||
/// <summary>
|
||||
/// 采集时间
|
||||
/// </summary>
|
||||
public string recordDate { get; set; }
|
||||
/// <summary>
|
||||
/// 设备状态 。Run：（正常运行）、Alert：（故障调试）、Idle：（闲置待机）、Maintain（停止运行）
|
||||
/// </summary>
|
||||
public string statusCode { get; set; }
|
||||
/// <summary>
|
||||
/// 状态变更时间
|
||||
/// </summary>
|
||||
public string uploadTime { get; set; }
|
||||
/// <summary>
|
||||
/// 唯一标识符号
|
||||
/// </summary>
|
||||
public string guid { get; set; }
|
||||
/// <summary>
|
||||
/// 故障代码数组
|
||||
/// </summary>
|
||||
public List<FaultCodeList> faultCodeList { get; set; }
|
||||
}
|
||||
|
||||
public class FaultCodeList
|
||||
{
|
||||
/// <summary>
|
||||
/// 故障代码
|
||||
/// </summary>
|
||||
public string faultCode { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 登录
|
||||
/// </summary>
|
||||
public class LoginEnyity
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string passWord { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
||||
public string userCardID { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 多个电池进站
|
||||
/// </summary>
|
||||
public class ManyCellInStation
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string productType { get; set; }
|
||||
/// <summary>
|
||||
/// 电芯条码
|
||||
/// </summary>
|
||||
public List<string> identificationList { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public List<string> containerCodeList { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,171 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 多个电池出站
|
||||
/// </summary>
|
||||
public class ManyCellOutStation
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
/// 产品类型
|
||||
/// </summary>
|
||||
public string productType { get; set; }
|
||||
/// <summary>
|
||||
/// 完工数
|
||||
/// </summary>
|
||||
public string completeQty { get; set; }
|
||||
/// <summary>
|
||||
/// 托盘码
|
||||
/// </summary>
|
||||
public string containerCode { get; set; }
|
||||
/// <summary>
|
||||
/// 1：通用出站；2：合芯出站；3：虚拟码替换出站；4：追溯标识替换出站；5：合芯有顶盖出站
|
||||
/// </summary>
|
||||
public int type { get; set; }
|
||||
|
||||
// public List<identiftyList> identiftyList { get; set; }
|
||||
public List<assembleLineList> assembleLineList { get; set; }
|
||||
}
|
||||
|
||||
|
||||
public class assembleLineList
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 产品条码
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
/// 原材料信息
|
||||
/// </summary>
|
||||
public List<string> materialLotList = new List<string>();
|
||||
/// <summary>
|
||||
/// 原材料条码
|
||||
/// </summary>
|
||||
public string materialLotCode { get; set; }
|
||||
/// <summary>
|
||||
/// 原材料上料位置
|
||||
/// </summary>
|
||||
public string materialLotCodeLocator { get; set; }
|
||||
/// <summary>
|
||||
/// 质量状态
|
||||
/// </summary>
|
||||
public string qualityStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 关联条码
|
||||
/// </summary>
|
||||
public string qrCode { get; set; }
|
||||
/// <summary>
|
||||
/// NG编码
|
||||
/// </summary>
|
||||
public List<string> ngCode = new List<string>();
|
||||
/// <summary>
|
||||
/// NG错误信息
|
||||
/// </summary>
|
||||
public string ngMessage = "";
|
||||
|
||||
}
|
||||
public class identiftyList
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 产品条码
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
/// 原材料信息
|
||||
/// </summary>
|
||||
public List<string> materialLotList = new List<string>();
|
||||
/// <summary>
|
||||
/// 原材料条码
|
||||
/// </summary>
|
||||
public string materialLotCode { get; set; }
|
||||
/// <summary>
|
||||
/// 原材料上料位置
|
||||
/// </summary>
|
||||
public string materialLotCodeLocator { get; set; }
|
||||
/// <summary>
|
||||
/// 质量状态
|
||||
/// </summary>
|
||||
public string qualityStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 关联条码
|
||||
/// </summary>
|
||||
public string qrCode { get; set; }
|
||||
/// <summary>
|
||||
/// NG编码
|
||||
/// </summary>
|
||||
public List<string> ngCode = new List<string>();
|
||||
/// <summary>
|
||||
/// NG错误信息
|
||||
/// </summary>
|
||||
public string ngMessage = "";
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 产品条码数组
|
||||
/// </summary>
|
||||
//public class IdentiftyListItems
|
||||
//{
|
||||
// /// <summary>
|
||||
// /// 产品条码
|
||||
// /// </summary>
|
||||
// public string identification { get; set; }
|
||||
// /// <summary>
|
||||
// /// 质量状态
|
||||
// /// </summary>
|
||||
// public string qualityStatus { get; set; }
|
||||
// /// <summary>
|
||||
// /// 关联条码
|
||||
// /// </summary>
|
||||
// public string qrCode { get; set; }
|
||||
// /// <summary>
|
||||
// /// NG错误信息
|
||||
// /// </summary>
|
||||
// public string ngMessage { get; set; }
|
||||
// /// <summary>
|
||||
// /// 原材料信息对象组
|
||||
// /// </summary>
|
||||
// public List<MaterialLotListItems> materialLotList { get; set; }
|
||||
//}
|
||||
|
||||
///// <summary>
|
||||
///// 原材料信息对象组
|
||||
///// </summary>
|
||||
//public class MaterialLotListItems
|
||||
//{
|
||||
// /// <summary>
|
||||
// /// 原材料条码
|
||||
// /// </summary>
|
||||
// public string materialLotCode { get; set; }
|
||||
// /// <summary>
|
||||
// /// 原材料上料位置
|
||||
// /// </summary>
|
||||
// public string materialLotCodeLocator { get; set; }
|
||||
//}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,170 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 执行结果
|
||||
/// </summary>
|
||||
public class MesResponse
|
||||
{
|
||||
/// <summary>
|
||||
/// 错误代码 错误代码，成功不返回
|
||||
/// </summary>
|
||||
public string code { get; set; }
|
||||
/// <summary>
|
||||
/// 数据处理消息 成功不返回
|
||||
/// </summary>
|
||||
public string message { get; set; }
|
||||
/// <summary>
|
||||
/// 报错消息类型
|
||||
/// </summary>
|
||||
public string category { get; set; }
|
||||
/// <summary>
|
||||
/// 成功标识 false失败 true 成功
|
||||
/// </summary>
|
||||
public bool success { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 单个上传（只上传条码，不上传卷芯码）
|
||||
/// </summary>
|
||||
public class MesResponseSingle
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string code { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string message { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public bool success { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string category { get; set; }
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
#region 进站反馈
|
||||
public class MesResponseIn
|
||||
{
|
||||
/// <summary>
|
||||
/// 错误代码 错误代码，成功不返回
|
||||
/// </summary>
|
||||
public string code { get; set; }
|
||||
/// <summary>
|
||||
/// 数据处理消息 成功不返回
|
||||
/// </summary>
|
||||
public string message { get; set; }
|
||||
/// <summary>
|
||||
/// 报错消息类型
|
||||
/// </summary>
|
||||
public string category { get; set; }
|
||||
/// <summary>
|
||||
/// 成功标识 false失败 true 成功
|
||||
/// </summary>
|
||||
public bool success { get; set; }
|
||||
}
|
||||
public class RowsItemIn
|
||||
{
|
||||
/// <summary>
|
||||
/// 错误代码 错误代码，成功不返回
|
||||
/// </summary>
|
||||
public string code { get; set; }
|
||||
/// <summary>
|
||||
/// 返回条码成功标识 false失败 true 成功
|
||||
/// </summary>
|
||||
public bool success { get; set; }
|
||||
/// <summary>
|
||||
/// 数据处理消息 成功不返回
|
||||
/// </summary>
|
||||
public string message { get; set; }
|
||||
/// <summary>
|
||||
/// 返回成品条码
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
/// 返回的容器码
|
||||
/// </summary>
|
||||
public string containerCode { get; set; }
|
||||
/// <summary>
|
||||
/// 报错消息类型 A=停线，B=排出，C=忽略（需警示）
|
||||
/// </summary>
|
||||
public string category { get; set; }
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
||||
#region 出站反馈
|
||||
//{"rows":[{"code":null,"success":true,"message":null,"identification":"InsertAt20231218095755934","containerCode":null,"category":null}],"success":true,"total":1}
|
||||
public class MesResponseOut
|
||||
{
|
||||
/// <summary>
|
||||
/// 返回参数
|
||||
/// </summary>
|
||||
public List<RowsItemOut> rows { get; set; }
|
||||
/// <summary>
|
||||
/// MES信息返回成功标识 false失败 true 成功
|
||||
/// </summary>
|
||||
public bool success { get; set; }
|
||||
/// <summary>
|
||||
/// 返回参数条数
|
||||
/// </summary>
|
||||
public int total { get; set; }
|
||||
}
|
||||
public class RowsItemOut
|
||||
{
|
||||
/// <summary>
|
||||
/// 错误代码 错误代码，成功不返回
|
||||
/// </summary>
|
||||
public string code { get; set; }
|
||||
/// <summary>
|
||||
/// 返回条码成功标识 false失败 true 成功
|
||||
/// </summary>
|
||||
public bool success { get; set; }
|
||||
/// <summary>
|
||||
/// 数据处理消息 成功不返回
|
||||
/// </summary>
|
||||
public string message { get; set; }
|
||||
/// <summary>
|
||||
/// 返回成品条码
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
/// 返回的容器码
|
||||
/// </summary>
|
||||
public string containerCode { get; set; }
|
||||
/// <summary>
|
||||
/// 报错消息类型 A=停线，B=排出，C=忽略（需警示）
|
||||
/// </summary>
|
||||
public string category { get; set; }
|
||||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 执行结果Entity，带返回值
|
||||
/// </summary>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
public class RequestResult<T> : MesResponse
|
||||
{
|
||||
public T Result { get; set; }
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 执行结果List，带返回值
|
||||
/// </summary>
|
||||
/// <typeparam name="T"></typeparam>
|
||||
public class RequestResultList<T> : MesResponse
|
||||
{
|
||||
public List<T> Result { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备参数设定值变更
|
||||
/// </summary>
|
||||
public class ParamChange
|
||||
{
|
||||
/// <summary>
|
||||
/// 工厂代码
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
/// 产线编号
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
/// 设备编号
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
/// 物料编码
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
/// 员工账号
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
/// 变更时间
|
||||
/// </summary>
|
||||
public string changeTime { get; set; }
|
||||
/// <summary>
|
||||
/// 数据组编码
|
||||
/// </summary>
|
||||
public string tagGroupCode { get; set; }
|
||||
/// <summary>
|
||||
/// 数据组描述
|
||||
/// </summary>
|
||||
public string tagGroupDescription { get; set; }
|
||||
/// <summary>
|
||||
/// 数据项数组
|
||||
/// </summary>
|
||||
public List<TagListItem> tagList { get; set; }
|
||||
}
|
||||
public class TagListItem
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据项编码
|
||||
/// </summary>
|
||||
public string tagCode { get; set; }
|
||||
/// <summary>
|
||||
/// 变更前计量单位
|
||||
/// </summary>
|
||||
public string unitBefore { get; set; }
|
||||
/// <summary>
|
||||
/// 变更前标准值
|
||||
/// </summary>
|
||||
public string standardValueBefore { get; set; }
|
||||
/// <summary>
|
||||
/// 变更前符合值
|
||||
/// </summary>
|
||||
public string trueValueBefore { get; set; }
|
||||
/// <summary>
|
||||
/// 变更前不符合值
|
||||
/// </summary>
|
||||
public string falseValueBefore { get; set; }
|
||||
/// <summary>
|
||||
/// 变更前最小值
|
||||
/// </summary>
|
||||
public int minValueBefore { get; set; }
|
||||
/// <summary>
|
||||
/// 变更前最大值
|
||||
/// </summary>
|
||||
public int maxValueBefore { get; set; }
|
||||
/// <summary>
|
||||
/// 变更后计量单位
|
||||
/// </summary>
|
||||
public string unitAfter { get; set; }
|
||||
/// <summary>
|
||||
/// 变更后标准值
|
||||
/// </summary>
|
||||
public string standardValueAfter { get; set; }
|
||||
/// <summary>
|
||||
/// 变更后符合值
|
||||
/// </summary>
|
||||
public string trueValueAfter { get; set; }
|
||||
/// <summary>
|
||||
/// 变更后不符合值
|
||||
/// </summary>
|
||||
public string falseValueAfter { get; set; }
|
||||
/// <summary>
|
||||
/// 变更后最小值
|
||||
/// </summary>
|
||||
public int minValueAfter { get; set; }
|
||||
/// <summary>
|
||||
/// 变更后最大值
|
||||
/// </summary>
|
||||
public int maxValueAfter { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备参数设定值返回
|
||||
/// </summary>
|
||||
public class ParamReturnData
|
||||
{
|
||||
/// <summary>
|
||||
/// 返回参数
|
||||
/// </summary>
|
||||
public List<RowsItem> rows { get; set; }
|
||||
/// <summary>
|
||||
/// 成功标识
|
||||
/// </summary>
|
||||
public bool success { get; set; }
|
||||
/// <summary>
|
||||
/// 返回参数条数
|
||||
/// </summary>
|
||||
public int total { get; set; }
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 返回参数项
|
||||
/// </summary>
|
||||
public class RowsItem
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据组编码
|
||||
/// </summary>
|
||||
public string tagGroupCode { get; set; }
|
||||
/// <summary>
|
||||
/// 配方0002
|
||||
/// </summary>
|
||||
public string tagGroupDescription { get; set; }
|
||||
/// <summary>
|
||||
/// 数据组描述
|
||||
/// </summary>
|
||||
public List<ReturnDataTagListItem> tagList { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 数据组描述
|
||||
/// </summary>
|
||||
public class ReturnDataTagListItem
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string tagCode { get; set; }
|
||||
/// <summary>
|
||||
/// 真空度设定值
|
||||
/// </summary>
|
||||
public string tagDescription { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string valueType { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string unit { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string standardValue { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string trueValue { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string falseValue { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string minValue { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string maxValue { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string tagRemark { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 产品过程加工参数
|
||||
/// </summary>
|
||||
public class ProductProcessParam
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 结果加工参数
|
||||
/// </summary>
|
||||
public class ProductResultParameters
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备编号
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
/// 类型单进整出：DZ 整进整出：ZZ 单进单出：DD 未传时默认按照ZZ进行数据解析
|
||||
/// </summary>
|
||||
public string type { get; set; }
|
||||
/// <summary>
|
||||
/// 设备数据
|
||||
/// </summary>
|
||||
public string payload { get; set; }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 单进整出
|
||||
/// </summary>
|
||||
public class Payload1
|
||||
{
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 工厂代码
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
/// 产线编号
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
/// 员工账号
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
/// 物料编码 工单产成品物料号
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
/// 小车号 装载电池的小车编号
|
||||
/// </summary>
|
||||
public string carCode { get; set; }
|
||||
/// <summary>
|
||||
/// 补录 是否属于补录数据（BL=补录，JS=及时上传）
|
||||
/// </summary>
|
||||
public string collection { get; set; }
|
||||
/// <summary>
|
||||
/// 采集时间 数据的采集时间
|
||||
/// </summary>
|
||||
public string recordDate { get; set; }
|
||||
/// <summary>
|
||||
/// 条码数量 传入条码的个数
|
||||
/// </summary>
|
||||
public int qty { get; set; }
|
||||
/// <summary>
|
||||
/// RFID托杯码
|
||||
/// </summary>
|
||||
public string containerCode { get; set; }
|
||||
/// <summary>
|
||||
/// 条码数组
|
||||
/// </summary>
|
||||
|
||||
public IdentificationListItem identification { get; set; }
|
||||
public List<TagDataVOListItem> tagDataVOList { get; set; }
|
||||
}
|
||||
|
||||
public class IdentificationListItem
|
||||
{
|
||||
/// /// <summary>
|
||||
/// 条码
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
/// 质量状态 各产品所有参数的整体判断结果（Y/N）
|
||||
/// </summary>
|
||||
public string qualityStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 采集数组
|
||||
/// </summary>
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public class TagDataVOListItem
|
||||
{
|
||||
/// <summary>
|
||||
/// 设备每个采集项规定的编号
|
||||
/// </summary>
|
||||
public string tagCode { get; set; }
|
||||
/// <summary>
|
||||
/// 采集值
|
||||
/// </summary>
|
||||
public string tagValue { get; set; }
|
||||
/// <summary>
|
||||
/// 采集项采集时间
|
||||
/// </summary>
|
||||
public string tagTime { get; set; }
|
||||
/// <summary>
|
||||
/// 各产品所有参数的整体判断结果（Y/N）
|
||||
/// </summary>
|
||||
public string tagCalculateResult { get; set; }
|
||||
/// <summary>
|
||||
/// 采集项描述
|
||||
/// </summary>
|
||||
public string tagRemark { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 单个电池进站
|
||||
/// </summary>
|
||||
public class SingleCellInStation
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string productType { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
|
||||
|
||||
public class MaterialLotListItem
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string materialLotCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string materialLotCodeLocator { get; set; }
|
||||
}
|
||||
|
||||
public class IdentiftyListItem
|
||||
{
|
||||
/// <summary>
|
||||
/// 条码
|
||||
/// </summary>
|
||||
public string identification { get; set; }
|
||||
/// <summary>
|
||||
/// 质量状态
|
||||
/// </summary>
|
||||
public string qualityStatus { get; set; }
|
||||
/// <summary>
|
||||
/// 关联条码
|
||||
/// </summary>
|
||||
public string qrCode { get; set; }
|
||||
/// <summary>
|
||||
/// NG2信息,NG1信息
|
||||
/// </summary>
|
||||
public string ngMessage { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public List<string> ngCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public List<MaterialLotListItem> materialLotList { get; set; }
|
||||
}
|
||||
|
||||
public class SingleCellOutStation
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string productType { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string completeQty { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string containerCode { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int type { get; set; }
|
||||
/// <summary>
|
||||
/// 原材料条码
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
/// 产品条码
|
||||
/// </summary>
|
||||
public List<IdentiftyListItem> identiftyList { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
/// <summary>
|
||||
/// 报警数据上传接口参数类
|
||||
/// </summary>
|
||||
public class UploadAlarmParam
|
||||
{
|
||||
/// <summary>
|
||||
/// 工厂代码
|
||||
/// </summary>
|
||||
public string siteCode { get; set; }
|
||||
/// <summary>
|
||||
/// 产线编号
|
||||
/// </summary>
|
||||
public string lineCode { get; set; }
|
||||
/// <summary>
|
||||
/// 设备编号
|
||||
/// </summary>
|
||||
public string equipNum { get; set; }
|
||||
/// <summary>
|
||||
/// 物料编码
|
||||
/// </summary>
|
||||
public string materialCode { get; set; }
|
||||
/// <summary>
|
||||
/// 员工账号
|
||||
/// </summary>
|
||||
public string userName { get; set; }
|
||||
/// <summary>
|
||||
/// 采集时间
|
||||
/// </summary>
|
||||
public string recordDate { get; set; }
|
||||
/// <summary>
|
||||
/// 唯一标识符号
|
||||
/// </summary>
|
||||
public string guid { get; set; }
|
||||
/// <summary>
|
||||
/// 库位ID 库位ID，化成段用
|
||||
/// </summary>
|
||||
public string seatId { get; set; }
|
||||
/// <summary>
|
||||
/// 报警数组
|
||||
/// </summary>
|
||||
public List<AlarmLineListItem> alarmLineList { get; set; }
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 报警数组
|
||||
/// </summary>
|
||||
public class AlarmLineListItem
|
||||
{
|
||||
/// <summary>
|
||||
/// 报警消除时间
|
||||
/// </summary>
|
||||
public string alarmEndTime { get; set; }
|
||||
/// <summary>
|
||||
/// 报警类型
|
||||
/// </summary>
|
||||
public string alarmType { get; set; }
|
||||
/// <summary>
|
||||
/// 报警名称
|
||||
/// </summary>
|
||||
public string alarmName { get; set; }
|
||||
/// <summary>
|
||||
/// 报警开始时间
|
||||
/// </summary>
|
||||
public string alarmStartTime { get; set; }
|
||||
/// <summary>
|
||||
/// 故障代码
|
||||
/// </summary>
|
||||
public string faultCode { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
internal class UploadDeviceCollectData
|
||||
{
|
||||
/// <summary>
|
||||
/// 应用id,对应不同系统对接
|
||||
/// </summary>
|
||||
public string appid { get; set; }
|
||||
/// <summary>
|
||||
/// 采集指标类型和具体值的集合
|
||||
/// </summary>
|
||||
public List<Collect_code_value_list> collect_code_value_list { get; set; }
|
||||
/// <summary>
|
||||
/// 采集时间，unix时间戳，整数类型
|
||||
/// </summary>
|
||||
public long collect_time { get; set; }
|
||||
/// <summary>
|
||||
/// 设备编号
|
||||
/// </summary>
|
||||
public string device_code { get; set; }
|
||||
}
|
||||
public class Collect_code_value_list
|
||||
{
|
||||
/// <summary>
|
||||
/// 指标类型，1 温度 2湿度 3露点 4粉尘 5风速，整数类型
|
||||
/// </summary>
|
||||
public int target_code { get; set; }
|
||||
/// <summary>
|
||||
/// 指标对应采集值,若是某个指标或某个指标的某个值未采集到，则传N
|
||||
/// </summary>
|
||||
public string target_value { get; set; }
|
||||
/// <summary>
|
||||
/// 风速仪标签，风速仪值对应target_value
|
||||
/// </summary>
|
||||
public string target_value_tag { get; set; }
|
||||
}
|
||||
|
||||
|
||||
public class UploadDeviceCollectDataResult
|
||||
{
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public int status { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public Data data { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public string message { get; set; }
|
||||
}
|
||||
|
||||
public class Data
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
namespace JinYuan.MES.Models
|
||||
{
|
||||
public class WattrMeter
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// 工厂代码
|
||||
/// </summary>
|
||||
public System.String siteCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 产线编号
|
||||
/// </summary>
|
||||
public System.String lineCode { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 设备编号
|
||||
/// </summary>
|
||||
public System.String equipNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 电表编号
|
||||
/// </summary>
|
||||
public System.String electricMeterNum { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 员工账号
|
||||
/// </summary>
|
||||
public System.String userName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 工序编号
|
||||
/// </summary>
|
||||
public System.String specName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 采集时间
|
||||
/// </summary>
|
||||
public System.String recordDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 有功电能（累计电能）KWH
|
||||
/// </summary>
|
||||
public System.Decimal? accumulatedElectricity { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// A相电压 V
|
||||
/// </summary>
|
||||
public System.Decimal? phaseVoltageA { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// B相电压 V
|
||||
/// </summary>
|
||||
public System.Decimal? phaseVoltageB { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// C相电压 V
|
||||
/// </summary>
|
||||
public System.Decimal? phaseVoltageC { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// A相电流
|
||||
/// </summary>
|
||||
public System.Decimal? phaseCurrentA { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// B相电流
|
||||
/// </summary>
|
||||
public System.Decimal? phaseCurrentB { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// C相电流
|
||||
/// </summary>
|
||||
public System.Decimal? phaseCurrentC { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// A相功率
|
||||
/// </summary>
|
||||
public System.Decimal? phasePowerA { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// B相功率
|
||||
/// </summary>
|
||||
public System.Decimal? phasePowerB { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// C相功率
|
||||
/// </summary>
|
||||
public System.Decimal? phasePowerC { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 总有功功率
|
||||
/// </summary>
|
||||
public System.Decimal? activePower { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 总功率因数
|
||||
/// </summary>
|
||||
public System.Decimal? powerFactor { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 电流变比
|
||||
/// </summary>
|
||||
public System.Decimal? pt { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 电压变比
|
||||
/// </summary>
|
||||
public System.Decimal? ct { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// 有关程序集的一般信息由以下
|
||||
// 控制。更改这些特性值可修改
|
||||
// 与程序集关联的信息。
|
||||
[assembly: AssemblyTitle("JinYuan.MES")]
|
||||
[assembly: AssemblyDescription("")]
|
||||
[assembly: AssemblyConfiguration("")]
|
||||
[assembly: AssemblyCompany("")]
|
||||
[assembly: AssemblyProduct("JinYuan.MES")]
|
||||
[assembly: AssemblyCopyright("Copyright © 2023")]
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
// 将 ComVisible 设置为 false 会使此程序集中的类型
|
||||
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
|
||||
//请将此类型的 ComVisible 特性设置为 true。
|
||||
[assembly: ComVisible(false)]
|
||||
|
||||
// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
|
||||
[assembly: Guid("530b6426-08e7-461c-91dc-787f876620fc")]
|
||||
|
||||
// 程序集的版本信息由下列四个值组成:
|
||||
//
|
||||
// 主版本
|
||||
// 次版本
|
||||
// 生成号
|
||||
// 修订号
|
||||
//
|
||||
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
|
||||
//通过使用 "*"，如下所示:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.0.0.0")]
|
||||
[assembly: AssemblyFileVersion("1.0.0.0")]
|
||||
@@ -0,0 +1,35 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Security.Cryptography.Xml" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
@@ -0,0 +1,4 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user