chore: initial commit

MisDataFunction/Function1053/DataAccess/DataAccess.cs

@@ -0,0 +1,15 @@
+
+namespace MesServerFunctions
+{
+    partial class Function1053
+    {
+        //针对“MIS.BizFacade.Dll”中没有的存储过程，在此类中新建
+        //新建原则：所有的函数用private,只允许在内部使用
+        //针对单个工艺特殊，需要新建存储过程，但是存储过程不能被加入到“MIS.BizFacade.Dll”中
+
+        private void aa()
+        {
+
+        }
+    }
+}

MisDataFunction/Function1053/Db.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MesServerFunctions
+{
+    public class Db
+    {
+        
+       
+    }
+}

MisDataFunction/Function1053/Function02.csproj.vspscc

@@ -0,0 +1,10 @@
+""
+{
+"FILE_VERSION" = "9237"
+"ENLISTMENT_CHOICE" = "NEVER"
+"PROJECT_FILE_RELATIVE_PATH" = "relative:MesServer.Function\\Function02"
+"NUMBER_OF_EXCLUDED_FILES" = "0"
+"ORIGINAL_PROJECT_FILE_PATH" = ""
+"NUMBER_OF_NESTED_PROJECTS" = "0"
+"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
+}

MisDataFunction/Function1053/Function1053.csproj

@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{CA8A12C5-7BF0-4489-93FA-180B1C492BBA}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Function1053</RootNamespace>
+    <AssemblyName>Function1053</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\dll_fun\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
+  </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>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="MesWork.DeviceDriver">
+      <HintPath>..\..\dll_common\MesWork.DeviceDriver.dll</HintPath>
+    </Reference>
+    <Reference Include="MQTTnet">
+      <HintPath>..\..\..\Common\dll\MQTTnet.dll</HintPath>
+    </Reference>
+    <Reference Include="MQTTnet.Extensions.ManagedClient">
+      <HintPath>..\..\..\Common\dll\MQTTnet.Extensions.ManagedClient.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\dll_common\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http">
+      <HintPath>..\..\DLL\System.Net.Http.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Security, Version=4.0.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.Security.4.3.2\lib\net46\System.Net.Security.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.WebSockets, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.WebSockets.4.3.0\lib\net46\System.Net.WebSockets.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.WebSockets.Client, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.WebSockets.Client.4.3.2\lib\net46\System.Net.WebSockets.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Db.cs" />
+    <Compile Include="MesServerFunction\Fun_1053.cs" />
+    <Compile Include="Methods\EngineGetOverBaseWork.cs" />
+    <Compile Include="DataAccess\DataAccess.cs" />
+    <Compile Include="OpcServer\Barcode.cs" />
+    <Compile Include="OpcServer\EngineGetOver.cs" />
+    <Compile Include="OpcServer\HeartBeat.cs" />
+    <Compile Include="OpcServer\MaterialsVerify.cs" />
+    <Compile Include="OpcServer\MesRead.cs" />
+    <Compile Include="OpcServer\PartLoad.cs" />
+    <Compile Include="OpcServer\WebSubmit.cs" />
+    <Compile Include="OpcServer\WorkIsOk.cs" />
+    <Compile Include="OpcServer\WorkStart.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\00MesWorkMqtt\MesWorkMqtt\00MesWorkMqtt.csproj">
+      <Project>{f55da1a0-a982-4479-8c47-0d9a5aaf3e18}</Project>
+      <Name>00MesWorkMqtt</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\01DoWhatPlc\01_01DoWhatPlc.csproj">
+      <Project>{0d1af432-439a-4920-8692-43ae139f5530}</Project>
+      <Name>01_01DoWhatPlc</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\04DataBaseAccess\DataBaseAccess\04-DataBaseAccess.csproj">
+      <Project>{f434e066-4c59-47c8-aa82-6f48cc84501a}</Project>
+      <Name>04-DataBaseAccess</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\07WebBusinessFacade\BusinessFacade\07BusinessFacade.csproj">
+      <Project>{f0a0c525-03fd-428a-9b17-7f54aa0e4475}</Project>
+      <Name>07BusinessFacade</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\08WebFun_base\WebFun_base\08-WebFun_base.csproj">
+      <Project>{d98be764-adeb-488d-9714-61e308aa8201}</Project>
+      <Name>08-WebFun_base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\09MesDataFunction\MesDataFunction\01-MesDataFunction.csproj">
+      <Project>{90e76fb4-646d-45e2-95db-0b8ab4e465d6}</Project>
+      <Name>09-MesDataFunction</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Interface_WebAPI\SlMesDbIterface\ExternalDataSync.csproj">
+      <Project>{2f33d79d-1dff-4cda-b357-fcd5221cab9a}</Project>
+      <Name>ExternalDataSync</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\MisDataFun\SendMessageToWebMqtt\12SendMessageToWeb.csproj">
+      <Project>{e4eb6420-906d-4672-947a-ca33ddcdadfc}</Project>
+      <Name>12SendMessageToWeb</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\MIS_FuntionSaveData\MIS_FuntionSaveData\13.3MIS_FuntionSaveData.csproj">
+      <Project>{55b510c1-59e9-4bfd-ae84-d76d46f6e365}</Project>
+      <Name>02-13.3MIS_FuntionSaveData</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Common\MyLog4Net\00_MyLog4Net.csproj">
+      <Project>{1dc48c83-1842-4de8-acaf-26e1e7f7c58f}</Project>
+      <Name>00_MyLog4Net</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

MisDataFunction/Function1053/MesServerFunction/Fun_1053.cs

@@ -0,0 +1,270 @@
+using MesServerWork;
+using MisDataFunDll;
+using MisDataSaveDate;
+using System.Collections.Generic;
+using System.Threading;
+using System.Xml.Linq;
+
+namespace MesServerFunctions
+{
+    public partial class FunctionMES
+    {
+        object lockFunWork;
+        //public void FunWork(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        public void FunWork(string recData)
+        {
+
+
+            lockFunWork = new object();
+            lock (lockFunWork)
+            {
+                List<string> dataArray = MisDataFun.GetCmdStringList(recData);
+                //string[] dataArray = recData.Split('|');
+                //if (dataArray.Count != 4)
+                //return;
+                //消息来源
+                string m_Source = dataArray[0].ToString();
+                //消息类型 Barcode
+                string m_Command = dataArray[1].ToString();
+                //工位号
+                string m_OpName = dataArray[2].ToString();
+                //消息参数
+                string m_Value = dataArray[3].ToString();
+
+                DeviceDriver_BasicData.CustomeEvetnArgs e = new DeviceDriver_BasicData.CustomeEvetnArgs();// = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceDriver_BasicData.CustomeEvetnArgs>(m_Value);
+                string tagValue;
+
+                switch (m_Source)
+                {
+                    case "BarCode":
+                        e.OpName = m_OpName;
+                        e.TagValue = m_Value;
+                        fun_Barcode(e);
+                        break;
+                    case "WEB":
+                        e.OpName = m_OpName;
+                        e.TagValue = m_Command + "|" + m_Value;
+                        fun_WebSubmit(e);
+                        break;
+                    case "PLC":
+                        e = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceDriver_BasicData.CustomeEvetnArgs>(m_Value);
+                        string TagID = e.TagID.ToString();
+                        switch (e.TagValue.ToString().ToLower())
+                        {
+                            case "false":
+                                tagValue = "0";
+                                break;
+                            case "true":
+                                tagValue = "1";
+                                break;
+                            default:
+                                tagValue = e.TagValue.ToString();
+                                break;
+                        }
+                        e.TagValue = tagValue;
+                        switch (e.TagTypeCodeID.ToString())
+                        {
+                            //PLC 工件到位
+                            case "2":
+                                fun_WorkStart(e);
+                                break;
+                            //PLC 允许保存质量数据
+                            case "19":
+                                fun_MesRead(e);
+                                break;
+                            //MES 保存数据完成
+                            case "20":
+                                fun_MesReadOver(e);
+                                break;
+                            //PLC 申请上线
+                            case "43":
+                                PartLoad(e);
+                                break;
+                            //PLC 传递机型
+                            case "44":
+                                fun_EngineTypeGetOverPLC(e);
+                                break;
+                            //MES 合格放行
+                            case "51":
+                                fun_ConfirmOkGo(e);
+                                break;
+                            //MES 不合格放行
+                            case "8":
+                                fun_FalseGo(e);
+                                break;
+                            //PLC 工位合格标志
+                            case "21":
+                                fun_IsOk(e);
+                                break;
+                            //MES 系统健康心跳
+                            case "14":
+                                fun_HeartBeatMIS(e);
+                                break;
+                            //空料握手plc
+                            case "49":
+                                fun_Handshake(e);
+                                break;
+                            //待上料数量plc
+                            case "38":
+                                UpdateWait_NUM_PLC(e);
+                                break;
+                            case "63":
+                                string S_plcStatus;//DBX501.5 PLC直通，1 强制放行 0 正常循环
+                                MIS_BASE.Read_TagTypeID(63, m_OpName, out S_plcStatus);
+                                if (S_plcStatus.ToLower() != "true" || S_plcStatus.ToLower() == "1")
+                                {
+                                    SendMessageFun.SendInfomation("PlcStatus", "0", m_OpName);
+                                }
+                                else
+                                {
+                                    SendMessageFun.SendInfomation("PlcStatus", "1", m_OpName);
+                                }
+                                break;
+                            //物料扫码完成
+                            case "65":
+                                fun_MaterialsVerify(e);
+                                break;
+                        }
+                        break;
+                }
+            }
+        }
+
+        //1.工件到位后，PLC给MES传递机型(DBX0.4)(44)，
+        //MES判断条码是否全部扫描完成
+        //PLC给出允许保存(DBX100.2)(19)，MES见到(DBX100.2)(19)为1后给出保存完成(DBX102.2)(20)，
+        //PLC见到保存完成(DBX102.2)(20)为1后，清空允许保存(DBX100.2)(19)，
+        //MES见到允许保存(DBX100.2)(19)为0后，清空保存完成(DBX102.2)(20)
+        //MES判断总合格标志(INT104)(21)为1后，给出合格放行(DBX2.5)(51)
+        /// <summary>
+        /// 扫描条码
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="barcode"></param>
+        public void fun_Barcode(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(Barcode, e);
+        }
+
+        /// <summary>
+        /// 传递机型
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_EngineTypeGetOverPLC(DeviceDriver_BasicData .CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(EngineTypeGetOver_PLC, e);
+        }
+
+        /// <summary>
+        /// 合格放行
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_ConfirmOkGo(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            // ThreadPool.QueueUserWorkItem(ConfirmOkGo, e);
+        }
+
+        /// <summary>
+        /// 不合格放行
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_FalseGo(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            // ThreadPool.QueueUserWorkItem(FalseGO, e);
+        }
+
+        /// <summary>
+        /// 允许保存
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_MesRead(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(MesRead, e);
+        }
+
+        /// <summary>
+        /// 物料扫码完成
+        /// </summary>
+        public void fun_MaterialsVerify(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(MaterialsVerify, e);
+        }
+
+        /// <summary>
+        /// 保存完成
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_MesReadOver(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            // ThreadPool.QueueUserWorkItem(MesReadOver, e);
+        }
+        
+        /// <summary>
+        /// 工件到位离开(清空所有的MES信号)
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_WorkStart(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(WorkStart, e);
+        }
+
+        /// <summary>
+        /// 处理WEB页面发送过来的请求（m_Command + "|" + m_Value;）
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="Content"></param>
+        public void fun_WebSubmit(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(WebSubmit, e);
+        }
+
+
+        /// <summary>
+        /// 工位是否合格
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_IsOk(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(IsOk, e);
+        }
+
+        /// <summary>
+        /// 系统健康心跳监测
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_HeartBeatMIS(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            // ThreadPool.QueueUserWorkItem(HeartBeat, e);
+        }
+
+
+        /// <summary>
+        /// 空料握手plc
+        /// </summary>
+        public void fun_Handshake(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            //ThreadPool.QueueUserWorkItem(Handshake_Fun, e);
+        }
+
+
+        /// <summary>
+        /// MES实时保存质量数据
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_MesSaveNowData(DeviceDriver_BasicData.CustomeEvetnArgs e)
+        {
+            // ThreadPool.QueueUserWorkItem(MesSaveNowData, e);
+        }
+
+
+    }
+}

MisDataFunction/Function1053/Methods/EngineGetOverBaseWork.cs

@@ -0,0 +1,115 @@
+using System;
+using System.Data;
+using System.Threading;
+using MesServerWork;
+using MisDataFunDll;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// 正常逻辑工作(传递机型)
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="EngineTypeID"></param>
+        /// <param name="EngineType"></param>
+        /// <param name="EngineID"></param>
+        /// <param name="PartPallet_Code"></param>
+        private void EngineTypeGetOver_PLC_Work(string OpName, int EngineTypeID, string EngineType, string EngineID, int PartPallet_Code, string OrderForm)
+        {
+            int IsAllowWork;
+            int RepairPartStatusPLC = 0;
+
+            if (EngineTypeID <= 0 || EngineID.Length == 0 || EngineType.Length == 0)
+            {
+                string msg = "【" + OpName + "】" + "PLC传递机型为空！";
+                MyLog4Net.MyLogHelper.Error("EngineTypeGetOver", msg);
+                SendMessageFun.AsyncSendMessage_Notice(OpName, msg);
+                return;
+            }
+
+            //电子看板_装配零件_临时表_增加_北汽
+            //第二步，将零件信息转移到零件_临时表中
+            MisDataFun.MesServer_Process_EngineTypeOverBQ(OpName);
+
+            //通知web显示
+            //MIS_BASE.Read_PalletInfo(OpName, out MES_QualityMask);//合格标志  合格标志暂时改为即时响应式的
+            MIS_BASE.Read_RepairStatus_PLC(OpName, out RepairPartStatusPLC);//返修标志
+            //SendMessageFun.SendInfomation("QualityMask", Convert.ToString(MES_QualityMask), OpName);//显示合格标志
+            SendMessageFun.SendInfomation("RepairPartStatusPLC", Convert.ToString(RepairPartStatusPLC), OpName);//显示返修标志
+
+            //第四步，获取是否允许工作
+            MisDataFun.MesServer_Judge_IsCanWork(OpName, out IsAllowWork);
+
+            //暂时先定义为扫描完成才能进行压装工作，因为考虑到工作完成后，操作工未必会去扫描物料的情况
+            if (IsAllowWork == 1)
+            {
+                MIS_BASE.Write_WorkStart(OpName, true);
+                MIS_BASE.Write_FixAllow(OpName, true);
+                MIS_BASE.Write_EngineTypeGetOver_PLC(OpName, true);
+                MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.FixAllow, "1");
+            }
+            else
+            {
+                SendMessageFun.AsyncSendMessage_Notice(OpName, "请扫描物料！");
+            }
+            SendMessageFun.SendMessage("1235", "1111", OpName);
+        }
+
+        /// <summary>
+        /// 二次工作
+        /// </summary>
+        /// <param name="OpName"></param>
+        private void EngineTypeGetOver_PLC_Work_two(string OpName)
+        {
+            int EngineTypeID;//机型代码
+            int PartPallet_Code;//托盘编号
+
+            string EngineType;//机型
+            string EngineID;//工件编号
+            string OrderForm;
+            MIS_BASE.GetEngineTypeFromPLC(OpName, out EngineTypeID, out EngineType, out EngineID, out PartPallet_Code, out OrderForm);
+            EngineTypeGetOver_PLC_Work(OpName, EngineTypeID, EngineType, EngineID, Convert.ToInt32(PartPallet_Code), OrderForm);
+
+        }
+        /// <summary>
+        /// 跳过二次工作
+        /// </summary>
+        /// <param name="OpName"></param>
+        private void EngineTypeGetOver_PLC_Work_Skip(string OpName)
+        {
+            //MIS_BASE.Write_MesReadOver(OpName, true);
+            MIS_BASE.Write_MaterialVerifyOver(OpName, true);
+        }
+
+        /// <summary>
+        /// 返修件需要工作
+        /// </summary>
+        /// <param name="OpName">工位号</param>
+        private void IsNeedRepaire_OK(string OpName)
+        {
+            //string orderForm = "";
+            //int engineTypeID;
+            //string engineType = "";
+            //string engineID = "";
+            //string palletCode = "";
+            //int isRepair;
+            //string repairCode = "";
+            ////从监控系统中查询出本工位信息
+            //MisDataFun.OpName_MIS_Moby_Select(OpName,
+            //out orderForm, out engineTypeID, out engineType,
+            //out engineID, out palletCode, out isRepair, out repairCode);
+
+            //EngineTypeGetOver_PLC_Work(OpName, engineTypeID, engineType, engineID, Convert.ToInt32(palletCode), orderForm);
+        }
+
+        /// <summary>
+        /// 更新待上料数量
+        /// </summary>
+        /// <param name="OpName"></param>
+        private void UpdateWait_NUM_PLC(object e)
+        {
+        }
+    }
+}

MisDataFunction/Function1053/OpcServer/Barcode.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Data;
+using System.Windows.Forms;
+using MesServerWork;
+using MisDataFunDll;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        ///1.扫描配送单号，用于接收物料，扫描单号的时候，将接收的物料信息显示在“物料拉动”Tab区域
+        ///2.扫描料箱标签/看板卡，用于追溯物料批次信息
+        ///3.扫描零件条码，根据零件图号进行防错
+        ///第一步，判断条码类型，根据条码类型，执行对应的存储过程
+        ///第二步，条码类型(将扫描的条码保存到对应的表中)
+        ///第三步，扫描完成之后给出允许工作信号
+        /// 处理页面扫描条码
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="barcode"></param>
+        public void Barcode(object e)
+        {
+
+            {
+                try
+                {
+                    DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                    string OpName = Convert.ToString(msgEvent.OpName);
+                    string barcode = Convert.ToString(msgEvent.TagValue);
+                    string AlarmStr = "";
+
+                    int IsAllowWork;
+                    bool IsSuccess = false;
+
+                    MisDataFun.PartMaterial_DM_Update(OpName, barcode, out IsSuccess);
+                    if (!IsSuccess)
+                    {
+                        SendMessageFun.AsyncSendMessage_Notice(OpName, "条码无效,请确认！");
+                        return;
+                    }
+                    else
+                    {
+                        SendMessageFun.SendInfomation("MaterialList", "1", OpName);//通知界面更新零件信息
+                    }
+
+                    //获取是否允许工作
+                    MisDataFun.MesServer_Judge_IsCanWork(OpName, out IsAllowWork);
+
+                    if (IsAllowWork == 1)
+                    {
+                        // 保存物料信息
+                        MisDataFun.Material_Insert(OpName, 1);
+
+                        SendMessageFun.SendMessage("24", "11", OpName);
+
+                        // 物料验证完成
+                        MIS_BASE.Write_MaterialVerifyOver(OpName, true);
+                       
+                        //通知PLC允许工作,允许工作在保存完成时清空
+                        MIS_BASE.Write_FixAllow(OpName, true);
+                    }
+                    else
+                    {
+                        SendMessageFun.AsyncSendMessage_Notice(OpName, "条码无效,请确认！");
+                    }
+                }
+                catch (Exception err)
+                {
+                    ////ApplicationLog.WriteLog(err, "Function02:Barcode");
+                }
+
+            }
+
+        }
+
+
+    }
+}

MisDataFunction/Function1053/OpcServer/EngineGetOver.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Data;
+using System.Windows.Forms;
+using System.Xml.Linq;
+//using SystemFramework;
+using MesServerWork;
+using MisDataFunDll;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// PLC传递机型处理
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void EngineTypeGetOver_PLC(object e)
+        {
+                try
+                {
+                    DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                    string OpName = Convert.ToString(msgEvent.OpName);
+                    //int tagValue = Convert.ToInt32(msgEvent.TagValue);
+                    if(msgEvent.TagValueUp.ToString() == "6")
+                    {
+                        MIS_BASE.Write_FixAllow(OpName, false);
+                        string Program_No = "";
+                        MisDataFun.GetEngineType_Order(OpName, Program_No, out int EngineTypeID, out string EngineType, out string EngineID, out string OrderForm, out int isCheckOk, out int planCount, out int haveUplaodCount, out int remainingQuantity, out string msg2);
+                        if (isCheckOk == 2)
+                        {
+                            string msg = "【" + OpName + "】" + msg2;
+                            SendMessage.AsyncSendMessage_Notice(OpName, msg);
+                            MyLog4Net.MyLogHelper.Error("PartLoad", msg);
+                            return;
+                        }
+                        else
+                        {
+                            MIS_BASE.Write_EngineTypeID_MES(OpName, EngineTypeID);
+                            MIS_BASE.Write_EngineType_MES(OpName, EngineType);
+                            MIS_BASE.Write_EngineID_MES(OpName, EngineID);
+                            MIS_BASE.Write_OrderForm_MES(OpName, OrderForm);
+
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName, MisDataFun.MobyTagType.WorkStartIn, DateTime.Now.ToString());
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.EngineTypeID, EngineTypeID.ToString());
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.EngineType, EngineType);
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.EngineID, EngineID);
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.OrderForm, OrderForm);
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.EngineTypeID_MES, EngineTypeID.ToString());
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.EngineType_MES, EngineType);
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.EngineID_MES, EngineID);
+                            MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.OrderForm_MES, OrderForm);
+
+                            MIS_BASE.Write_EngineTypeID_MES(OpName, EngineTypeID);
+                            MIS_BASE.Write_EngineType_MES(OpName, EngineType);
+                            MIS_BASE.Write_EngineID_MES(OpName, EngineID);
+                            MIS_BASE.Write_OrderForm_MES(OpName, OrderForm);
+
+                            EngineTypeGetOver_PLC_Work(OpName, EngineTypeID, EngineType, EngineID, 0, OrderForm);
+                        }
+                    }
+                }
+                catch (Exception err)
+                {
+                    // 保存出错日志 1.申请上线 2.传递机型 3.允许保存 4.扫码
+                    MisDataSaveDate.FuntionMesRead.Alarm_SaveFileLog4Error(System.Reflection.MethodBase.GetCurrentMethod().Name, e, "Fun1053", err);
+                    ////ApplicationLog.WriteLog(err, "Function02:EngineTypeGetOver_PLC");
+                }
+        }
+
+    }
+}

MisDataFunction/Function1053/OpcServer/HeartBeat.cs

@@ -0,0 +1,34 @@
+using MesServerWork;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// MES与PLC心跳监听
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void HeartBeat(object e)
+        {
+            try
+            {
+                DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+                //返写在MES心跳中
+                MIS_BASE.WritePLC(15, OpName, tagValue);
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:FalseGO");
+            }
+        }
+    }
+}

MisDataFunction/Function1053/OpcServer/MaterialsVerify.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Data;
+using System.Threading;
+using System.Xml.Linq;
+
+using MesServerWork;
+using MisDataFunDll;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// PLC物料扫码校验
+        /// </summary>
+        /// <param name="e"></param>
+        public void MaterialsVerify(object e)
+        {
+
+            try
+            {
+                DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+                //判断PLC机型与MES机型是否一致
+                if (tagValue == 1)
+                {
+                    int EngineTypeID;//机型代码
+                    int PartPallet_Code;//托盘编号
+                    string EngineType;//机型
+                    string EngineID;//工件编号
+                    string OrderForm;
+                    MIS_BASE.GetEngineTypeFromPLC(OpName, out EngineTypeID, out EngineType, out EngineID, out PartPallet_Code, out OrderForm);
+
+                    int MaterialsTypeCode = Convert.ToInt32(MIS_BASE.ReadPLC(201, OpName));
+                    string MaterialsCode = MIS_BASE.ReadPLC(40, OpName).ToString();
+
+                    DataTable dt = MisDataFun.XD_MaterialsVerify(OpName, EngineID, MaterialsCode, MaterialsTypeCode);
+                    int result = Convert.ToInt32(dt.Rows[0]["result"]);
+                    if (result == 1)
+                    {
+                        MIS_BASE.WritePLC(95, OpName, 1); // 物料校验成功
+                    }
+                    else
+                    {
+                        MIS_BASE.WritePLC(95, OpName, 2); // 物料校验失败
+                        string msg = $"【{OpName}】产品:{EngineID} | 物料码:{MaterialsCode} | 物料类型:{MaterialsTypeCode.ToString()} 物料校验失败！";
+                        MisDataSaveDate.Helper.ApiLogHelper.SaveMesLog(OpName, "MaterialsVerify " + msg, MisDataSaveDate.Helper.MesLogType.ERROR);
+                    }
+                }
+                else
+                {
+                    MIS_BASE.WritePLC(95, OpName, 0); // 物料验证结果清空
+                }
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function08:EngineTypeGetOver_PLC");
+            }
+        }
+    }
+}

MisDataFunction/Function1053/OpcServer/MesRead.cs

@@ -0,0 +1,88 @@
+using MesServerWork;
+using MesWork;
+using MisDataFunDll;
+using System;
+using System.Data;
+using System.Threading;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// 允许保存(针对半自动和手动压装工位)
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void MesRead(object e)
+        {
+            {
+                try
+                {
+                    DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                    string OpName = Convert.ToString(msgEvent.OpName);
+                    int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+                    int EngineTypeID_MES;//机型代码
+                    string EngineType_MES;//机型
+                    string EngineID_MES;//工件编号
+                    string OrderForm_MES;
+                    MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.MesRead, "0");
+                    Thread.Sleep(500);
+                    MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.MesRead, "1");
+                    if (tagValue == 1)
+                    {
+                        bool isEngineGetOver;
+                        DataRow mobyData = MisDataFun.GetMobyTableByOpName(OpName).Rows[0];
+                        EngineTypeID_MES = Convert.ToInt32(mobyData["产品型号代码_MES"]);
+                        EngineType_MES = mobyData["发动机型号_MES"].ToString();
+                        EngineID_MES = mobyData["变速器序列号_MES"].ToString();
+                        OrderForm_MES = mobyData["订单号_MES"].ToString();
+                        isEngineGetOver = Convert.ToBoolean(mobyData["允许工作"]);
+
+                        if (!isEngineGetOver)
+                        {
+                            string msg2 = "【" + OpName + "】" + "请先开始订单生产后再进行保存，当前未允许工作!";
+                            SendMessage.AsyncSendMessage_Notice(OpName, msg2);
+                            return;
+                        }
+
+                        // 存追溯表数据
+                        MisDataFun.WorkOrderOpWorkOver(OpName, EngineID_MES, OrderForm_MES);
+
+                        // 保存物料数据
+                        MisDataFun.Material_Insert(OpName, 1);
+
+                        // 测量数据发动机在线状态
+                        MisDataFun.WorkStartInsert(OpName, 1);
+
+                        //通知设备，MES的质量数据（和物料数据）保存完成
+                        //统计在线产量，在线节拍
+                        SendMessage.SendActuallyCount(OpName, tagValue);
+
+                        MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.MesReadOver, "1");
+                        Thread.Sleep(1000 * 1);                  
+                        MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.WorkStart, "0");
+                        MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.EngineTypeGetOverPLC, "0");
+                        MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.PartLoad, "0");
+                        MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.MesRead, "0");
+                        MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.MesReadOver, "0");
+                        MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.FixAllow, "0");
+
+
+                        string msg = "【" + OpName + "】" + "工件数据保存完成!";
+                        SendMessage.AsyncSendMessage_Notice(OpName, msg);
+                    }
+                }
+                catch (Exception err)
+                {
+                    // 保存出错日志 1.申请上线 2.传递机型 3.允许保存 4.扫码
+                    MisDataSaveDate.FuntionMesRead.Alarm_SaveFileLog4Error(System.Reflection.MethodBase.GetCurrentMethod().Name, e, "Fun1053", err);
+                    ////ApplicationLog.WriteLog(err, "Function08:MesReadOver");
+                }
+            }
+
+        }
+
+    }
+}

MisDataFunction/Function1053/OpcServer/PartLoad.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Threading;
+//using SystemFramework;
+using MesServerWork;
+using MisDataFunDll;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// 申请上线(针对上线工位)
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void PartLoad(object e)
+        {
+            try
+            {
+                DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+                // 清空MOBY表中所有数据
+                MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.WorkStart, "0");
+                MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.EngineTypeGetOverPLC, "0");
+                MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.PartLoad, "0");
+                MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.MesRead, "0");
+                MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.MesReadOver, "0");
+                MisDataFun.MobySendWebAndSaveData(OpName, MisDataFun.MobyTagType.FixAllow, "0");
+                Thread.Sleep(500);
+                // 按照生产排序顺序获取订单相关数据
+                // 获取到数据 显示 申请上线、传递机型、允许工作三个点位
+                // 显示对应物料信息、
+
+                if (tagValue == 1)
+                {
+                    
+                }
+                else
+                {
+                    ////上线工位清MES传递机型信号
+                    //MIS_BASE.Write_EngineTypeGetOver_MES(OpName, false);
+                    //// 清除报警
+                }
+            }
+            catch (Exception err)
+            {
+                // 保存出错日志 1.申请上线 2.传递机型 3.允许保存 4.扫码
+                MisDataSaveDate.FuntionMesRead.Alarm_SaveFileLog4Error(System.Reflection.MethodBase.GetCurrentMethod().Name, e, "Fun1053", err);
+                ////ApplicationLog.WriteLog(err, "Function08:MesReadOver");
+            }
+        }
+    }
+}

MisDataFunction/Function1053/OpcServer/WebSubmit.cs

@@ -0,0 +1,336 @@
+using System;
+using MesServerWork;
+using System.Threading;
+using MisDataSaveDate;
+using System.Collections;
+//using SystemFramework;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// 处理WEB页面发送过来的请求（m_Command + "|" + m_Value;）
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="Content"></param>
+        private void WebSubmit(object e)
+        {
+            try
+            {
+                DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                string OpName=Convert.ToString(msgEvent.OpName);
+                string Content = Convert.ToString(msgEvent.TagValue);
+
+                string[] dataArray = Content.Split('|');
+                if (dataArray.Length != 2)
+                    return;
+                //消息类型
+                string m_Command = dataArray[0].ToString();
+                //消息参数
+                string m_Value = dataArray[1].ToString();
+                //消息参数数量
+                string[] m_Value_array = m_Value.Split('&');
+                //消息参数长度
+                int m_Value_length = m_Value_array.Length;
+
+                //工件信息
+                string engineID = "";
+                if (MIS_BASE.hashtable_EngineGetOver_EngineTypeID == null)
+                {
+                    MIS_BASE.InitHashtable_MesServerCode();
+                }
+                if (MIS_BASE.hashtable_EngineGetOver_EngineTypeID == null)
+                {
+                    return;
+                }
+                if (MIS_BASE.hashtable_EngineGetOver_EngineID.ContainsKey(OpName))
+                {
+                    engineID = MIS_BASE.hashtable_EngineGetOver_EngineID[OpName].ToString();
+                }
+
+                DeviceDriver_BasicData.CustomeEvetnArgs _e = new DeviceDriver_BasicData.CustomeEvetnArgs();
+                _e.OpName = OpName;
+                _e.TagValue = m_Value;
+
+                //根据请求的命令处理逻辑
+                switch (m_Command)
+                {
+                    case "Barcode":
+                        if (m_Value_length > 1) return;
+                        fun_Barcode(_e);
+                        break;
+                    case "OnLineState"://在线0、离线1、屏蔽2
+                        try
+                        {
+                            if (m_Value_length > 1) return;
+                            int a = Convert.ToInt32(m_Value);
+                            if (a <= 2)
+                            {
+                                //BaseDataSystemMES.IsOnLine_Update(OpName, m_Value.ToString());
+                                MIS_BASE.Write_OnLineState(OpName, Convert.ToInt32(m_Value));
+                                if (a == 2) SendMessage.AsyncSendMessage_Notice(OpName, "屏蔽MES！");
+                                if (a == 0) SendMessage.AsyncSendMessage_Notice(OpName, "启用MES！");
+                            }
+                        }
+                        catch
+                        {
+
+                        }
+                        break;
+                    case "Reset"://复位，将MES所有的信息都复位了
+                        SetMoby(OpName);//将MES所有信号清空
+                        break;
+                    case "FixAllow"://重新拧紧
+                        MIS_BASE.Write_FixAllow(OpName, false);
+                        MIS_BASE.Write_FixAllow(OpName, true);
+                        break;
+                    case "IsAutoGetEngineID"://自动手动申请编号（线首）
+                        if (m_Value_length > 1) return;
+                        MIS_BASE.Write_IsAutoGetEngineID(OpName, Convert.ToInt32(m_Value));
+                        break;
+                    case "PartPalletGoOver"://空托盘放行
+                         int Is_PartPalletGoOver;
+                        MIS_BASE.Read_PartPalletGoOver(OpName, out Is_PartPalletGoOver);
+                        if (Is_PartPalletGoOver == 1)
+                        {
+                            MIS_BASE.Write_PartPalletGoOver(OpName, 1);
+                        }
+                        else
+                        {
+                            MIS_BASE.Write_PartPalletGoOver(OpName,0);
+                        }
+                        break;
+                    case "SetMoby"://清空托盘（线首）
+                        SetMoby(OpName);//将MES所有信号清空
+                        //MIS_BASE.Write_PartPalletCode_PLC(OpName, 1);
+                        break;
+                    case "RepairUplineMES"://返修上线
+                        MIS_BASE.Write_RepairUpline_MES(OpName, true);
+                        break;
+                    case "CancelRepair"://将返修件置为正常件
+
+                        break;
+                    case "PartPalletCode"://申请写入托盘号
+                        //MIS_BASE.Write_PartPalletCode_PLC(OpName, 1);
+                        break;
+                    case "WritePartPalletCode"://写入托盘号
+                        if (m_Value_length > 1) return;
+                        MIS_BASE.Write_PalletCode(OpName, Convert.ToInt32(m_Value));
+                        break;
+                    case "Normal"://启用正常拧紧工位
+                        MIS_BASE.Write_Normal(OpName, 1);
+                        MIS_BASE.Write_UnNormal(OpName, 0);
+                        break;
+                    case "UnNormal"://启用备用拧紧工位
+                        MIS_BASE.Write_Normal(OpName, 0);
+                        MIS_BASE.Write_UnNormal(OpName, 1);
+                        break;
+                    case "ResetDevice"://复位设备
+                        MIS_BASE.Write_ResetDevice(OpName, true);
+                        System.Threading.Thread.Sleep(1000);
+                        MIS_BASE.Write_ResetDevice(OpName, false);
+                        break;
+                    case "IsNeedRepaire"://返修上线(返修上线点)
+                        if (Convert.ToInt32(m_Value) == 1)
+                        {
+                            //修改托盘状态
+                            MIS_BASE.Write_PalletInfo(OpName, 3);
+                            //通知修改成功
+                            MIS_BASE.Write_UpdatePalletOK(OpName, true);
+                            IsNeedRepaire_OK(OpName);
+
+                        }
+                        else if (Convert.ToInt32(m_Value) == 0)
+                        {
+                            //通知修改成功
+                            MIS_BASE.Write_UpdatePalletOK(OpName, true);
+                            //直接给出工作完成
+                            MIS_BASE.Write_MaterialVerifyOver(OpName, true);
+                        }
+                        else
+                        { }
+
+                        break;
+                    case "ContinueMatch":
+                        //BaseDataSystemMES.QualityVerifyStatus_Hash_Write(OpName, true);
+                        break;
+                    //初始化网页信号
+                    case "IniSingalToWeb":
+                        InitializeSingalToWeb(OpName);
+                        break;
+                    case "Reset_Engine"://返修上线(返修上线点)
+                        SetMoby(OpName);//将MES所有信号清空
+                        //fun_EngineTypeGetOverPLC(OpName, 0);
+                        //fun_EngineTypeGetOverPLC(OpName, 1);
+                        break;
+
+                    case "twoWorkSkip"://重新工作工件跳过工作(重新工作工件)
+                        //工作完成
+                        EngineTypeGetOver_PLC_Work_Skip(OpName);
+                        break;
+                    case "twoWork"://重新工作工件重新工作(重新工作工件)
+                        //允许工作
+                        EngineTypeGetOver_PLC_Work_two(OpName);
+                        break;
+                    case "SelectOrderForm"://分线接受前端模拟传递机型
+                        _e.TagValueUp = "6";
+                        EngineTypeGetOver_PLC(_e);
+                        break;
+                    case "outLineOpNameWorkOver"://分线接受前端模拟工作完成
+                        _e.TagValueUp = "6";
+                        _e.TagValue = 1;
+                        MesRead(_e);
+                        break;
+                    default: break;
+                }
+            }
+            catch(Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:WebSubmit");
+            }
+        }
+        private void SetMoby(string OpName)
+        {
+            try
+            {
+                //清空Moby时，需要将MES信号清空
+                MIS_BASE.Write_ClearMesMoby(OpName);
+
+                //BaseDataSystemMES.MesServer_Process_EngineTypeOver(OpName);
+
+                SendMessageFun.SendMessage("5123", "1111", OpName);
+
+
+                MIS_BASE.Write_ResetDevice(OpName, true);
+                System.Threading.Thread.Sleep(1000);
+                MIS_BASE.Write_ResetDevice(OpName, false); 
+            }
+            catch
+            {
+
+            }
+        }
+        /// <summary>
+        /// 网页重现登录，恢复关闭前的页面状态
+        /// </summary>
+        /// <param name="Opname">工位号</param>
+        private void InitializeSingalToWeb(string OpName)
+        {
+            InitOpPosion(OpName);
+
+            ////3显示操作指导图片 PicShow_String_FirstOpName
+            //SendMessage.PicShow_FirstOpName(OpOpNamename);
+            ////1（直接在界面通过选择机型确认工序内容）
+            //SendMessage.ProcessList_FirstOpName(OpName);
+            //// MOBY数据
+            //SendMessageFun.SendMessage("5", "1", OpName);
+            //// 物料信息 物料信息
+            //SendMessage.MaterialList(OpName);
+
+            SendMessageFun.SendMessage("315", "111", OpName);
+
+            // 新增查询PLC直通状态 网页显示
+            //MIS_BASE.Read_TagTypeID(63, Opname, out S_plcStatus);
+            InitAlarm(OpName);
+        }
+
+        //分线发送工件到位信号函数
+        private void sendmessage(string OpName, int tagValue, string Command)
+        {
+            string SendMessage;
+            SendMessage = "MES|" + Command + "|" + OpName + "|" + tagValue;
+            SendMessageFun.AsyncSendMessage(SendMessage);
+
+        }
+        private void InitAlarm(string Opname)
+        {
+            FuntionMesRead.Alarm_InitAlarm_Send(Opname, out Hashtable ht);
+            foreach (DictionaryEntry kv in ht)
+            {
+                var TagID = kv.Key.ToString();
+                var TagValue = kv.Value.ToString();
+                FuntionMesRead.Send_AlarmMsg(TagID, TagValue);
+            }
+
+        }
+
+        private void InitOpPosion(string Opname)
+        {
+            int S_WorkCheckOver = Convert.ToInt32(MIS_BASE.ReadPLC(30, Opname));
+            string S_WorkCheckOver_Msg = "MES|checkWorkOverIsShow|" + Opname + "|" + S_WorkCheckOver;
+            SendMessage.AsyncSendMessage(S_WorkCheckOver_Msg);
+
+            bool S_WorkStart;//工件到位 DBX0.1
+            MIS_BASE.Read_WorkStart(Opname, out S_WorkStart);
+            if (S_WorkStart == true)
+            {
+                SendMessageFun.SendInfomation("WorkStart", Convert.ToString(Convert.ToInt32(S_WorkStart)), Opname);
+            }
+            //----------------------------------------------------
+            bool S_PartLoad;//申请上线
+            MIS_BASE.Read_PartLoad(Opname, out S_PartLoad);
+            if (S_PartLoad == true)
+            {
+                SendMessageFun.SendInfomation("PartLoad", Convert.ToString(Convert.ToInt32(S_PartLoad)), Opname);
+            }
+            //----------------------------------------------------
+            bool S_EngineGetOver;//传递机型 DBX0.4
+            MIS_BASE.Read_EngineGetOver_PLC(Opname, out S_EngineGetOver);
+            if (S_EngineGetOver == true)
+            {
+                SendMessageFun.SendInfomation("EngineTypeGetOverPLC", Convert.ToString(Convert.ToInt32(S_EngineGetOver)), Opname);
+
+                //5 显示订单、机型信息 线首工位用
+                SendMessage.ShowMoby_FirstOpName(Opname);
+                //界面显示物料信息
+                SendMessage.MaterialList_FirstOpName(Opname);
+            }
+            //----------------------------------------------------
+            bool S_FixAllow;//允许工作 DBX3.1
+            MIS_BASE.Read_FixAllow(Opname, out S_FixAllow);
+            if (S_FixAllow == true)
+            {
+                SendMessageFun.SendInfomation("FixAllow", Convert.ToString(Convert.ToInt32(S_FixAllow)), Opname);
+            }
+            //----------------------------------------------------
+            bool S_MesRead;//允许保存 DBX3.1
+            MIS_BASE.Read_QualityData_Read_CF(Opname, out S_MesRead);
+            if (S_MesRead == true)
+            {
+                SendMessageFun.SendInfomation("MesRead", Convert.ToString(Convert.ToInt32(S_MesRead)), Opname);
+            }
+            //----------------------------------------------------
+            bool S_ReadOver;//保存完成 
+            MIS_BASE.Read_MesReadOver(Opname, out S_ReadOver);
+            if (S_ReadOver == true)
+            {
+                SendMessageFun.SendInfomation("MesReadOver", Convert.ToString(Convert.ToInt32(S_ReadOver)), Opname);
+            }
+            //----------------------------------------------------
+            bool S_MaterialVerifyOver;//工作完成 DBX2.3
+            MIS_BASE.Read_MaterialVerifyOver(Opname, out S_MaterialVerifyOver);
+            if (S_MaterialVerifyOver == true)
+            {
+                SendMessageFun.SendInfomation("MaterialVerifyOver", Convert.ToString(Convert.ToInt32(S_MaterialVerifyOver)), Opname);
+            }
+            //----------------------------------------------------
+            int S_QualityMask;//合格标志 DBX588
+            MIS_BASE.Read_QualityMask(Opname, out S_QualityMask);
+            if (S_QualityMask == 1)
+            {
+                SendMessageFun.SendInfomation("QualityMask", Convert.ToString(Convert.ToInt32(S_QualityMask)), Opname);
+            }
+            //----------------------------------------------------
+            string S_plcStatus = "false";//DBX501.5 PLC直通，1 强制放行 0 正常循环
+            if (S_plcStatus.ToLower() == "false")
+            {
+                SendMessageFun.SendInfomation("PlcStatus", "0", Opname);
+            }
+            else
+            {
+                SendMessageFun.SendInfomation("PlcStatus", "1", Opname);
+            }
+        }
+    }
+}

MisDataFunction/Function1053/OpcServer/WorkIsOk.cs

@@ -0,0 +1,44 @@
+using MesServerWork;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// 工位合格标志
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void IsOk(object e)
+        {
+            try
+            {
+                DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+                int qualityMask;
+                MIS_BASE.Read_QualityMask(OpName, out qualityMask);
+                //判断是否合格
+                if (qualityMask == 1)
+                {
+                    qualityMask = 1;
+                } else {
+                    qualityMask = 0;
+                } 
+                //通知WEB修改状态
+                string message = "MES|QualityMask|" + OpName + "|" + qualityMask.ToString();
+                SendMessage.AsyncSendMessage(message);
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:FalseGO");
+            }
+        }
+    }
+}

MisDataFunction/Function1053/OpcServer/WorkStart.cs

@@ -0,0 +1,49 @@
+using MesServerWork;
+using System;
+using System.Threading;
+//using SystemFramework;
+
+namespace MesServerFunctions
+{
+    partial class FunctionMES
+    {
+        /// <summary>
+        /// 工件到位与离开时，清空MES自身信号
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void WorkStart(object  e)
+        {
+            try
+            {
+                DeviceDriver_BasicData.CustomeEvetnArgs msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+                //if (tagValue > 0)
+                //{
+                //    MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.WorkStartIn, DateTime.Now.ToString());
+                //    MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.WorkStart, tagValue.ToString());
+                //}
+                //else
+                //{
+                //    MisDataFun.OpName_MIS_MOBY_Insert(OpName,MisDataFun.MobyTagType.WorkStartOut, DateTime.Now.ToString());
+                //    MIS_BASE.Write_MesReadOver(OpName, false);
+                //    MIS_BASE.Write_ConfirmOkGo(OpName, false);
+                //    MIS_BASE.Write_FixAllow(OpName, false);
+                //    MIS_BASE.Write_EngineTypeGetOver_MES(OpName, false);
+                //    //工作完成
+                //    MIS_BASE.Write_MaterialVerifyOver(OpName, false);
+                //    MIS_BASE.Write_EngineTypeID_MES(OpName, 0);
+                //    MIS_BASE.Write_EngineType_MES(OpName, "");
+                //    MIS_BASE.Write_EngineID_MES(OpName, "");
+                //    MIS_BASE.Write_OrderForm_MES(OpName, "");
+                //}
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:WorkStart");
+            }
+        }
+
+    }
+}

MisDataFunction/Function1053/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 有关程序集的常规信息通过以下
+// 特性集控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("Function02")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("苏州宏软信息技术有限公司")]
+[assembly: AssemblyProduct("Function02")]
+[assembly: AssemblyCopyright("Copyright © 苏州宏软信息技术有限公司 2017")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 使此程序集中的类型
+// 对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型，
+// 则将该类型上的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("47710f2c-e141-4252-8d13-701bf4c1c027")]
+
+// 程序集的版本信息由下面四个值组成:
+//
+//      主版本
+//      次版本 
+//      内部版本号
+//      修订号
+//
+// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
+// 方法是按如下所示使用“*”:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

MisDataFunction/Function1053/app.config

@@ -0,0 +1,27 @@
+<?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.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="MQTTnet" publicKeyToken="b69712f52770c0a7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.13.0" newVersion="3.0.13.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

MisDataFunction/Function1053/mssccprj.scc

@@ -0,0 +1,5 @@
+SCC = This is a Source Code Control file
+
+[Function02.csproj]
+SCC_Aux_Path = "\\192.168.0.100\vss\MES4.0"
+SCC_Project_Name = "$/MisData/MisData/MisData/MesServer.Function/Function02", ILHAAAAA

MisDataFunction/Function1053/packages.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net461" />
+  <package id="MQTTnet" version="3.0.13" targetFramework="net461" />
+  <package id="MQTTnet.Extensions.ManagedClient" version="3.0.13" targetFramework="net461" />
+  <package id="NETStandard.Library" version="2.0.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="System.Net.Security" version="4.3.2" targetFramework="net461" />
+  <package id="System.Net.WebSockets" version="4.3.0" targetFramework="net461" />
+  <package id="System.Net.WebSockets.Client" version="4.3.2" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" requireReinstallation="true" />
+  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
+</packages>