init: 导入项目到 meswork Gitea

2026-05-29 10:07:05 +08:00
commit ad9a4106fb
3582 changed files with 460312 additions and 0 deletions
--- a/MisDataFunction/MesServer.Function/Function02/DataAccess/DataAccess.cs
+++ b/MisDataFunction/MesServer.Function/Function02/DataAccess/DataAccess.cs
@@ -0,0 +1,15 @@
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        //针对“MIS.BizFacade.Dll”中没有的存储过程，在此类中新建
+        //新建原则：所有的函数用private,只允许在内部使用
+        //针对单个工艺特殊，需要新建存储过程，但是存储过程不能被加入到“MIS.BizFacade.Dll”中
+
+        private void aa()
+        {
+
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/DataAccess/vssver2.scc
+++ b/MisDataFunction/MesServer.Function/Function02/DataAccess/vssver2.scc
--- a/MisDataFunction/MesServer.Function/Function02/Function02.csproj
+++ b/MisDataFunction/MesServer.Function/Function02/Function02.csproj
@@ -0,0 +1,162 @@
+<?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>Function02</RootNamespace>
+    <AssemblyName>Function02</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="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>..\..\..\Common\dll\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="Methods\EngineGetOverBaseWork.cs" />
+    <Compile Include="Methods\SubmitToMisweb.cs" />
+    <Compile Include="DataAccess\DataAccess.cs" />
+    <Compile Include="MesServerFunction\Fun_02.cs" />
+    <Compile Include="Methods\UDP.Send.cs" />
+    <Compile Include="OpcServer\WorkNumber.cs" />
+    <Compile Include="OpcServer\Barcode.cs" />
+    <Compile Include="OpcServer\ConfirmOkGo.cs" />
+    <Compile Include="OpcServer\EngineGetOver.cs" />
+    <Compile Include="OpcServer\FalseGO.cs" />
+    <Compile Include="OpcServer\MesRead.cs" />
+    <Compile Include="OpcServer\MesReadOver.cs" />
+    <Compile Include="OpcServer\WebSubmit.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\00-1Json8.3\Json8.3\00-0Json8.3.1.csproj">
+      <Project>{1a10fdb2-1a6a-44a8-ab4d-33387563247e}</Project>
+      <Name>00-0Json8.3.1</Name>
+    </ProjectReference>
+    <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\02WebApiCall\02_02WebApiCallPLC.csproj">
+      <Project>{3e6d1dd5-01c9-435f-9941-61f906ce35bb}</Project>
+      <Name>02_02WebApiCallPLC</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\09-MesDataFunction.csproj">
+      <Project>{90e76fb4-646d-45e2-95db-0b8ab4e465d6}</Project>
+      <Name>09-MesDataFunction</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>
--- a/MisDataFunction/MesServer.Function/Function02/Function02.csproj.vspscc
+++ b/MisDataFunction/MesServer.Function/Function02/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"
+}
--- a/MisDataFunction/MesServer.Function/Function02/MesServerFunction/Fun_02.cs
+++ b/MisDataFunction/MesServer.Function/Function02/MesServerFunction/Fun_02.cs
@@ -0,0 +1,96 @@
+using System.Threading;
+
+namespace MesServerFunctions
+{
+    public partial class Functions_BASE_02
+    {
+
+        //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(DoWhatPlc.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(Barcode, e);
+        }
+
+        /// <summary>
+        /// 传递机型
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_EngineTypeGetOverPLC(DoWhatPlc.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(EngineTypeGetOver_PLC, e);
+        }
+
+        /// <summary>
+        /// 合格放行
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_ConfirmOkGo(DoWhatPlc.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(ConfirmOkGo, e);
+        }
+
+        /// <summary>
+        /// 不合格放行
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_FalseGo(DoWhatPlc.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(FalseGO, e);
+        }
+
+        /// <summary>
+        /// 允许保存
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_MesRead(DoWhatPlc.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(MesRead, e);
+        }
+
+        /// <summary>
+        /// 保存完成
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_MesReadOver(DoWhatPlc.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(MesReadOver, e);
+        }
+        
+        /// <summary>
+        /// 工件到位离开(清空所有的MES信号)
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        public void fun_WorkStart(DoWhatPlc.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(DoWhatPlc.CustomeEvetnArgs e)
+        {
+            ThreadPool.QueueUserWorkItem(WebSubmit, e);
+        }
+
+       
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/MesServerFunction/vssver2.scc
+++ b/MisDataFunction/MesServer.Function/Function02/MesServerFunction/vssver2.scc
--- a/MisDataFunction/MesServer.Function/Function02/Methods/EngineGetOverBaseWork.cs
+++ b/MisDataFunction/MesServer.Function/Function02/Methods/EngineGetOverBaseWork.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Data;
+using bizFacade;
+using MesServerWork;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <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 IsClear;
+            int IsAllowWork;
+            int RepairPartStatusPLC = 0;
+            int MES_QualityMask = 1;
+            bool isFixAllow = false;
+            //string OrderForm = "";//订单号
+            DataTable dt;
+
+            if (EngineTypeID<=0)
+            {
+                AsyncSendMessage_Notice(OpName, "PLC传递机型为空");
+                MIS_BASE.Write_FixAllow(OpName, true);
+                return;
+            }
+
+            //第一步，查询订单号，保存机型、机型代码、总成号、托盘号、订单号到数据库
+            BaseDataSystemMES.GetEngineID_Select(OpName, EngineID, out dt);
+            //if (dt != null && dt.Rows.Count > 0)
+            //{
+            //    OrderForm = Convert.ToString(dt.Rows[0]["订单号"]);
+            //}
+            BaseDataSystemMES.OpName_MIS_MOBY_Insert(OpName, OrderForm, EngineTypeID, EngineType, EngineID, PartPallet_Code, 0, 0, "");
+            //SaveMobyMessage(OpName, EngineTypeID, EngineType, EngineID, OrderForm);
+
+            //第二步，将零件信息转移到零件_临时表中（本地BOM与订单BOM的选择显示关系）
+            // 获取该工位该订单的物料是否有已经扫描的，有的话就不更新临时表
+            BaseDataSystemMES.MesServer_Judge_IsClearOld(OpName, OrderForm, out IsClear);
+            //查看是否有允许工作
+            MIS_BASE.Read_FixAllow(OpName, out isFixAllow);
+            if (IsClear == 1 && isFixAllow == false)
+            {
+                //第二步，将零件信息转移到零件_临时表中（本地BOM与订单BOM的选择显示关系）
+                BaseDataSystemMES.MesServer_Process_EngineTypeOver(OpName);
+            }
+
+            //通知web显示
+            Sendmessage("5123", "1111", OpName);
+            MIS_BASE.Read_PalletInfo(OpName, out MES_QualityMask);//合格标志
+            MIS_BASE.Read_RepairStatus_PLC(OpName, out RepairPartStatusPLC);//返修标志
+            SendInfomation("QualityMask", Convert.ToString(MES_QualityMask), OpName);//显示合格标志
+            SendInfomation("RepairPartStatusPLC", Convert.ToString(RepairPartStatusPLC), OpName);//显示返修标志
+
+            //if (MES_QualityMask == 2)
+            //{
+            //    //工作完成
+            //    MIS_BASE.Write_MaterialVerifyOver(OpName, true);
+            //    SendInfomation("NgGO", "1", OpName);//显示不合格标志
+            //    return;
+            //}
+
+
+            //第三步，用于工件离开后完工数量统计及工件编号追溯
+            BaseDataSystemMES.MaterialPush_EngineIDStatus_Insert(OpName);//更新订单产量
+
+            //如果是20工位判断是否已经输入壳体码  输入后才能进行接下来操作
+            if(OpName == "OP0020")
+            {
+                string EngineID_MES;
+                MIS_BASE.Read_EngineID_MES(OpName, out EngineID_MES);
+                if (EngineID_MES == null || EngineID_MES == "")
+                {
+                    AsyncSendMessage_Notice(OpName, "请先输入壳体码再进行操作");
+                    return;
+                }
+            }
+
+            //第四步，获取是否允许工作
+            BaseDataSystemMES.MesServer_Judge_IsCanWork(OpName, out IsAllowWork);
+
+            //判断扫码这里1050 与 2040 需要额外判断前面分线工位是否扫码，都扫码后才能允许工作 反之不允许工作
+            //给相关工位弹出弹窗提示，提示该去扫码才能进行放行操作
+            if (IsAllowWork == 1 && OpName == "OP1050")
+            {
+                BaseDataSystemMES.MesServer_Judge_IsCanWorkLineOut("OP1020", OrderForm, EngineType, out IsAllowWork);
+                if (IsAllowWork == 1)
+                {
+                    BaseDataSystemMES.MesServer_Judge_IsCanWorkLineOut("OP1030", OrderForm, EngineType, out IsAllowWork);
+                    if (IsAllowWork != 1)
+                    {
+                        MIS_BASE.WritePLC(70, OpName, 1);
+                        AsyncSendMessage_Notice(OpName, OrderForm + "工件A30工位物料未扫描完毕，请扫描完毕后在进行工作！");
+                    }
+                }
+                else
+                {
+                    MIS_BASE.WritePLC(70, OpName, 1);
+                    AsyncSendMessage_Notice(OpName, OrderForm + "工件A20工位物料未扫描完毕，请扫描完毕后在进行工作！");
+                }
+            }
+            if (IsAllowWork == 1 && OpName == "OP2040")
+            {
+                BaseDataSystemMES.MesServer_Judge_IsCanWorkLineOut("OP2020", OrderForm, EngineType, out IsAllowWork);
+                if (IsAllowWork != 1)
+                {
+                    MIS_BASE.WritePLC(70, OpName, 1);
+                    AsyncSendMessage_Notice(OpName, OrderForm + "工件B20工位物料未扫描完毕，请扫描完毕后在进行工作！");
+                }
+            }
+
+            //暂时先定义为扫描完成才能进行压装工作，因为考虑到工作完成后，操作工未必会去扫描物料的情况
+            if (IsAllowWork == 1)
+            {
+                //通知PLC允许工作,允许工作在保存完成时清空
+                MIS_BASE.WritePLC(70, OpName, 0);
+                MIS_BASE.Write_FixAllow(OpName, true);
+            }
+            else
+            {
+                //AsyncSendMessage_Notice(OpName, "请扫描物料！");
+            }
+
+        }
+
+        /// <summary>
+        /// 保存MOBY信息
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="engineTypeID"></param>
+        /// <param name="engineType"></param>
+        /// <param name="engineID"></param>
+        private void SaveMobyMessage(string OpName, int engineTypeID, string engineType, string engineID, string orderForm)
+        {
+            if (MIS_BASE.hashtable_EngineGetOver_EngineTypeID == null)
+            {
+                MIS_BASE.InitHashtable_MesServerCode();
+            }
+            if (MIS_BASE.hashtable_EngineGetOver_EngineTypeID.ContainsKey(OpName))
+            {
+                MIS_BASE.hashtable_EngineGetOver_EngineTypeID[OpName] = engineTypeID;
+            }
+            if (MIS_BASE.hashtable_EngineGetOver_EngineType.ContainsKey(OpName))
+            {
+                MIS_BASE.hashtable_EngineGetOver_EngineType[OpName] = engineType;
+            }
+            if (MIS_BASE.hashtable_EngineGetOver_EngineID.ContainsKey(OpName))
+            {
+                MIS_BASE.hashtable_EngineGetOver_EngineID[OpName] = engineID;
+            }
+            if (MIS_BASE.hashtable_EngineGetOver_OrderForm.ContainsKey(OpName))
+            {
+                MIS_BASE.hashtable_EngineGetOver_OrderForm[OpName] = orderForm;
+            }
+        }
+
+        /// <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 = "";
+            //从监控系统中查询出本工位信息
+            BaseDataSystemMES.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);
+        }
+
+
+
+
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/Methods/SubmitToMisweb.cs
+++ b/MisDataFunction/MesServer.Function/Function02/Methods/SubmitToMisweb.cs
@@ -0,0 +1,127 @@
+using System;
+using bizFacade;
+//using SystemFramework;
+
+namespace MesServerFunctions
+{
+
+    /// <summary>
+    /// 此类用于向WEB发送各种类型消息
+    /// </summary>
+    partial class Functions_BASE_02
+    {
+       
+        /// <summary>
+        /// 批量发送WEB消息（Value为BOOL值）
+        /// </summary>
+        /// <param name="MessageNumm">消息编号组合</param>
+        /// <param name="Value">消息值组合</param>
+        /// <param name="OpName">工位号</param>
+       void Sendmessage(string MessageNumm,string Value, string OpName)
+       {
+         for (int i=0;i<MessageNumm.Length;i++)
+         {
+             Sendmessage(MessageNumm[i], Value[i].ToString(), OpName);
+         
+         }
+       }
+        /// <summary>
+        /// 选择发送给WEB的消息
+        /// </summary>
+        /// <param name="Num">消息类型</param>
+        /// <param name="OpName">消息工位</param>
+       string Sendmessage(char Num,string Value, string OpName)
+       {
+           string SendMessage;
+           string result = "";
+           switch (Num)
+           { 
+               case '1':
+                   //1（直接在界面通过选择机型确认工序内容）
+                   SendMessage = "MES|ProcessList|" + OpName + "|" + Value;
+                    result = AsyncSendMessage(SendMessage);
+                   break;
+               case '2':
+                   //2显示物料
+                   SendMessage = "MES|MaterialList|" + OpName + "|" + Value;
+                    result = AsyncSendMessage(SendMessage);
+                   break;
+               case '3':
+                   //3显示操作指导图片
+                   SendMessage = "MES|PicShow|" + OpName + "|" + Value;
+                    result = AsyncSendMessage(SendMessage);
+                   break;
+               case '4':
+                   //4订单完工模块刷新完成数量
+                   SendMessage = "MES|OrderFormList|" + OpName + "|" + Value;
+                    AsyncSendMessage(SendMessage);
+                    break;
+               case '5':
+                    SendMessage = "MES|ShowMoby|" + OpName + "|" + Value;
+                    result = AsyncSendMessage(SendMessage);
+                    break;
+               case '6':
+                    SendMessage = "MES|MaterialCheckPosition|" + OpName + "|" +Value;
+                    result = AsyncSendMessage(SendMessage);
+                   break;
+               case '7':
+                   SendMessage = "MES|WorkStart|" + OpName + "|" + Value;
+                    result = AsyncSendMessage(SendMessage);
+                   break;
+               case '8'://清除MES生成编号
+                  
+                   break;
+               case '9':
+                   SendMessage = "MES|ConfirmOkGo|" + OpName + "|" + Value;
+                    result = AsyncSendMessage(SendMessage);
+                   break;
+               case 'a':
+                   SendMessage = "MES|FixAllow|" + OpName + "|" + Value;
+                    result = AsyncSendMessage(SendMessage);
+                   break;
+           }
+            return result;
+       }
+        /// <summary>
+        /// 向WEB发送信息（value为字符串）
+        /// </summary>
+        /// <param name="Command">消息种类</param>
+        /// <param name="Value">消息内容</param>
+        /// <param name="OpName">工位号</param>
+        string SendInfomation(string Command, string Value, string OpName)
+        {
+            string SendMessage = "MES|" + Command + "|" + OpName + "|" + Value;
+            return AsyncSendMessage(SendMessage);
+        }
+
+
+       /// <summary>
+       /// 发送在线产量、在线节拍
+       /// </summary>
+       /// <param name="OpName"></param>
+       /// <param name="tagValue"></param>
+       private void SendActuallyCount(string OpName, int tagValue)
+       {
+           //当工件离开时，更新在线产量、在线节拍
+           if (tagValue == 0)
+           {
+               try
+               {
+                   int opNameCount = 0;//在线产量
+                   int opNameCountTime = 0;//在线节拍
+                   //基本数据_工作日历_班次产量查询_New
+                   BaseDataSystemMES.OpNameCount_New(OpName, out opNameCount, out opNameCountTime);
+                   string SendMessage;
+                   SendMessage = "MES|ActuallyCount|" + OpName + "|" + opNameCount.ToString() + "&" + opNameCountTime.ToString();
+                   AsyncSendMessage(SendMessage);
+               }
+               catch (Exception err)
+               {
+                   ////ApplicationLog.WriteLog(err, "Function02:SendActuallyCount");
+               }
+           }
+       }
+
+
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/Methods/UDP.Send.cs
+++ b/MisDataFunction/MesServer.Function/Function02/Methods/UDP.Send.cs
@@ -0,0 +1,53 @@
+using bizFacade;
+//using SystemFramework;
+using MesServerWork;
+using DataLinkMesWork;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// 发送信息到MES通讯服务器或者其他的
+        /// </summary>
+        /// <param name="Message"></param>
+        private string AsyncSendMessage(string Message)
+        {
+            return MIS_BASE.asyncSendMessage(Message);
+        }
+
+        /// <summary>
+        /// 发送提示消息
+        /// </summary>
+        /// <param name="Message"></param>
+        private void AsyncSendMessage_Notice(string opname, string notice)
+        {
+            //通知Web界面
+            BaseDataSystemMES.Web_Notice_Insert(opname, notice);
+            string SendMessage = "MES|Notice|" + opname + "|" + "1";
+            MIS_BASE.asyncSendMessage(SendMessage);
+        }
+
+        /// <summary>
+        /// 发送信息到打印机
+        /// </summary>
+        /// <param name="Message"></param>
+        private void asyncSendMessageToMark(string Message)
+        {
+            string messageSend = (string)Message;
+            //UDPClientSend.Send_ALL(ApplicationConfig.MES_MarkPortNum, messageSend);
+        }
+
+        /// <summary>
+        /// 发送信息到LED
+        /// </summary>
+        /// <param name="Message"></param>
+        private void asyncSendMessageLED(string OpName)
+        {
+            //发送到大屏幕显示  41104
+            string strMessage = "MIS|" + OpName + "|" + "0" + "|" + "1";
+            //UDPClientSend.Send_ALL(ApplicationConfig.Port_ShowLED_ProductCount, strMessage);
+
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/Methods/vssver2.scc
+++ b/MisDataFunction/MesServer.Function/Function02/Methods/vssver2.scc
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/Barcode.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/Barcode.cs
@@ -0,0 +1,108 @@
+using System;
+using System.Threading;
+using bizFacade;
+//using SystemFramework;
+using MesServerWork;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        ///1.扫描配送单号，用于接收物料，扫描单号的时候，将接收的物料信息显示在“物料拉动”Tab区域
+        ///2.扫描料箱标签/看板卡，用于追溯物料批次信息
+        ///3.扫描零件条码，根据零件图号进行防错
+        ///第一步，判断条码类型，根据条码类型，执行对应的存储过程
+        ///第二步，条码类型(将扫描的条码保存到对应的表中)
+        ///第三步，扫描完成之后给出允许工作信号
+        /// 处理页面扫描条码
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="barcode"></param>
+        public void Barcode(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                string barcode = Convert.ToString(msgEvent.TagValue);
+                string AlarmStr = "";
+
+                int IsAllowWork;
+                bool IsSuccess = false;
+                bool EngineGetOver_PLC_NextWorkStep;
+                //工件是否到位
+                MIS_BASE.Read_WorkStart(OpName, out EngineGetOver_PLC_NextWorkStep);
+
+                //此处逻辑有问题   需要考虑到批次扫描  提示PLC未传递机型的情况
+                if (EngineGetOver_PLC_NextWorkStep)
+                {
+                    //如果是20工位判断是否已经输入壳体码  输入后才能进行接下来操作
+                    if(OpName == "OP0020")
+                    {
+                        string EngineID;
+                        MIS_BASE.Read_EngineID_MES(OpName, out EngineID);
+                        if (EngineID == null || EngineID == "")
+                        {
+                            AsyncSendMessage_Notice(OpName, "请先输入壳体码再进行操作");
+                            return;
+                        }
+                    }
+                    
+
+                    //如果传递机型后，那就更新条码
+                    BaseDataSystemMES.PartMaterial_DM_Update(OpName, barcode, out IsSuccess);
+                    if (!IsSuccess)
+                    {
+                        AsyncSendMessage_Notice(OpName, "条码无效,请确认");
+                        return;
+                    }
+                    else
+                    {
+                        SendInfomation("MaterialList", "1", OpName);//通知界面更新零件信息
+                    }
+                    //获取是否允许工作
+                    BaseDataSystemMES.MesServer_Judge_IsCanWork(OpName, out IsAllowWork);
+                    // 扫描完条码并且 条码扫描成功时允许工作并且跟新页面数据
+                    if (IsAllowWork == 1 && IsSuccess)
+                    {
+                        // 保存物料信息挪到允许保存那里了
+                        //  BaseDataSystemMES.Material_Insert(OpName, 1);
+
+                        //通知PLC允许工作,允许工作在保存完成时清空
+                        MIS_BASE.Write_FixAllow(OpName, true);
+                        
+                        //更新订单完工数量及物料
+                        Sendmessage("24", "11", OpName);
+                        Thread.Sleep(500);
+                        Sendmessage("24", "11", OpName);
+                        Thread.Sleep(500);
+                        Sendmessage("24", "11", OpName);
+                        // 物料验证完成
+                        MIS_BASE.Write_MaterialVerifyOver(OpName, true);
+                        //if (!BaseDataSystemMES.QualityVerifyStatusOutline(OpName, out AlarmStr))
+                        //{
+                        //    SendInfomation("LineoutAlert", AlarmStr, OpName);
+                        //    return;
+                        //}
+
+                    }
+                    else
+                    {
+                        AsyncSendMessage_Notice(OpName, "请扫描物料！");
+                    }
+                }
+                else
+                {
+                    AsyncSendMessage_Notice(OpName, "PLC未工件到位");
+                }
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:Barcode");
+            }
+        }
+
+
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/ConfirmOkGo.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/ConfirmOkGo.cs
@@ -0,0 +1,41 @@
+using System;
+using bizFacade;
+//using SystemFramework;
+using MesServerWork;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// 合格放行
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void ConfirmOkGo(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+                if (tagValue == 1)
+                {
+
+                    BaseDataSystemMES.Material_Insert(OpName, 1); 
+
+                    //更新订单完工数量及物料
+                    Sendmessage("24", "11", OpName);
+
+                    //工作完成
+                    MIS_BASE.Write_MaterialVerifyOver(OpName, true);
+                }
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:ConfirmOkGo");
+            }
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/EngineGetOver.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/EngineGetOver.cs
@@ -0,0 +1,40 @@
+using System;
+//using SystemFramework;
+using MesServerWork;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// PLC传递机型处理
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void EngineTypeGetOver_PLC(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+                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);
+                    EngineTypeGetOver_PLC_Work(OpName, EngineTypeID, EngineType, EngineID, PartPallet_Code, OrderForm);
+                }
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:EngineTypeGetOver_PLC");
+            }
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/FalseGO.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/FalseGO.cs
@@ -0,0 +1,41 @@
+using System;
+using bizFacade;
+//using SystemFramework;
+using MesServerWork;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// 不合格放行
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void FalseGO(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+                if (tagValue == 1)
+                {
+                    //总合格标志2（不合格）
+
+                    BaseDataSystemMES.Material_Insert_NG(OpName, 2);  
+
+                    Sendmessage("24", "11", OpName);
+
+                    //工作完成
+                    MIS_BASE.Write_MaterialVerifyOver(OpName, true);
+                }
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:FalseGO");
+            }
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/MesRead.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/MesRead.cs
@@ -0,0 +1,28 @@
+using System;
+//using SystemFramework;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// 允许保存(针对半自动和手动压装工位)
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void MesRead(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:MesRead");
+            }
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/MesReadOver.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/MesReadOver.cs
@@ -0,0 +1,55 @@
+using System;
+//using SystemFramework;
+using MesServerWork;
+using bizFacade;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// 保存完成(针对半自动和手动压装工位)
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void MesReadOver(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                var tagValue = msgEvent.TagValue.ToString ();
+
+                //if (tagValue == "1" | tagValue.ToLower () == "true")
+                //{
+                //    int qualityMask;
+                //    MIS_BASE.Read_QualityMask(OpName, out qualityMask);
+
+                //    SendInfomation("ShowTimelyQuality", "1&" + qualityMask.ToString(), OpName);//发给Web页面显示质量数据
+
+                //    if (qualityMask == 1)//全部OK，给出合格放行
+                //    {
+                //        //如果存在线外扫描工位，根据扫描条码绑定线外数据     需要时解除禁用
+                //        //BaseDataSystemMES.TransLaunchDataByMainMaterial(OpName, EngineType, EngineID, EngineTypeID);
+
+                //        //如果存在线外排队工位，根据排队编号绑定线外数据     需要时解除禁用
+                //        ////BaseDataSystemMES.MailLineAndSubLineData_InsertByEngineID_Subline(OpName,EngineID, EngineTypeID, EngineType);
+
+                //        MIS_BASE.Write_ConfirmOkGo(OpName, true);
+                //        //MIS_BASE.Write_FalseGO(OpName, false);
+                //    }
+                //    else
+                //    {
+                //        //MIS_BASE.Write_ConfirmOkGo(OpName, false);
+                //        MIS_BASE.Write_FalseGO(OpName, true);
+                //    }
+                    
+                //}
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:MesReadOver");
+            }
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/MesSaveNowData.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/MesSaveNowData.cs
@@ -0,0 +1,33 @@
+using bizFacade;
+using MesServerWork;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// MES保存实时质量数据
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void MesSaveNowData(object e)
+        {
+            try
+            {
+              
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:FalseGO");
+            }
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/WebSubmit.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/WebSubmit.cs
@@ -0,0 +1,258 @@
+using System;
+using MesServerWork;
+using bizFacade;
+//using SystemFramework;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// 处理WEB页面发送过来的请求（m_Command + "|" + m_Value;）
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="Content"></param>
+        private void WebSubmit(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.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_EngineID.ContainsKey(OpName))
+                {
+                    engineID = MIS_BASE.hashtable_EngineGetOver_EngineID[OpName].ToString();
+                }
+
+                DoWhatPlc.CustomeEvetnArgs _e = new DoWhatPlc.CustomeEvetnArgs();
+                _e.OpName = OpName;
+                _e.TagValue = m_Value;
+
+                //根据请求的命令处理逻辑
+                switch (m_Command)
+                {
+                    case "Barcode":
+                        if (m_Value_length > 1) return;
+                        fun_Barcode(_e);
+                        break;
+                    //手动输入壳体码，因目前无二维码所以得加这个
+                    case "WorkNumber":
+                        //if (m_Value_length > 1) return;
+                        WorkNumber(_e);
+                        break;
+                    case "ConfirmOkGo"://合格放行
+                        //删除不合格放行记录
+                        //修改托盘状态
+                        //Update_PalletStatus(OpName, 1, false);
+                        BaseDataSystemMES.BaseData_tagTable_Engine_IsNG_Delete(OpName, engineID);
+                        MIS_BASE.Write_ConfirmOkGo(OpName, true);
+                        MIS_BASE.Write_FalseGO(OpName, false);
+                        break;
+                    case "FalseGO"://返修放行
+                        //修改托盘状态
+                        //Update_PalletStatus(OpName, 3, false);
+                        BaseDataSystemMES.BaseData_tagTable_Engine_IsNG_Delete(OpName, engineID);
+                        MIS_BASE.Write_FalseGO(OpName, true);
+                        MIS_BASE.Write_ConfirmOkGo(OpName, false);
+                        break;
+                    case "NgGO"://不合格放行
+                        //修改托盘状态
+                        //Update_PalletStatus(OpName, 2, false);
+                        //保存不合格信息(必须保存不合格放行信息，由于B5A的Moby没有不合格标志位)
+                        BaseDataSystemMES.BaseData_tagTable_Engine_IsNG_Insert(OpName, engineID, "", "");
+                        MIS_BASE.Write_FalseGO(OpName, true);
+                        MIS_BASE.Write_ConfirmOkGo(OpName, false);
+                        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));
+                            }
+                        }
+                        catch
+                        {
+
+                        }
+                        break;
+                    case "Reset"://复位，将MES所有的信息都复位了
+                        SetMoby(OpName);//将MES所有信号清空
+                        break;
+                    case "ShowMoby"://重新加载MOBY数据
+                        Sendmessage("5", "1", OpName);//显示临时表数据
+                        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;
+
+
+                    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);
+
+                Sendmessage("5123", "1111", OpName);
+
+                MIS_BASE.Write_ResetDevice(OpName, true);
+                System.Threading.Thread.Sleep(1000);
+                MIS_BASE.Write_ResetDevice(OpName, false); 
+            }
+            catch
+            {
+
+            }
+        }
+        /// 网页重现登录，恢复关闭前的页面状态
+        /// </summary>
+        /// <param name="Opname">工位号</param>
+        private void InitializeSingalToWeb(string Opname)
+        {
+
+            //工件到位 DBX0.1
+            bool S_WorkStart;
+            bool S_FixAllow;
+            bool S_EngineGetOver;
+            bool S_MaterialVerifyOver;
+
+            MIS_BASE.Read_WorkStart(Opname, out S_WorkStart);
+            MIS_BASE.Read_FixAllow(Opname, out S_FixAllow);
+            MIS_BASE.Read_EngineGetOver_PLC(Opname, out S_EngineGetOver);
+            MIS_BASE.Read_MaterialVerifyOver(Opname, out S_MaterialVerifyOver);
+
+            Sendmessage("5123", "1111", Opname);
+
+            if (S_WorkStart == true)
+            {
+                SendInfomation("WorkStart", Convert.ToString(Convert.ToInt32(S_WorkStart)), Opname);
+            }
+
+            if (S_EngineGetOver == true)
+            {
+                SendInfomation("EngineTypeGetOverPLC", Convert.ToString(Convert.ToInt32(S_EngineGetOver)), Opname);
+            }
+            if (S_FixAllow == true)
+            {
+                SendInfomation("FixAllow", Convert.ToString(Convert.ToInt32(S_FixAllow)), Opname);
+            }
+            if (S_MaterialVerifyOver == true)
+            {
+                SendInfomation("MaterialVerifyOver", Convert.ToString(Convert.ToInt32(S_MaterialVerifyOver)), Opname);
+            }
+        }
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/WorkNumber.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/WorkNumber.cs
@@ -0,0 +1,85 @@
+using System;
+using bizFacade;
+//using SystemFramework;
+using MesServerWork;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        ///1.输入壳体码，只有输入壳体码后才能允许工作 
+        /// 手动输入壳体码，因目前无二维码所以得加这个
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="barcode"></param>
+        public void WorkNumber(object e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                string barcode = Convert.ToString(msgEvent.TagValue).Split('&')[0]; // 壳体码
+                string distanceNumber = Convert.ToString(msgEvent.TagValue).Split('&')[1]; // 间隔号
+                int IsAllowWork;
+                bool IsSuccess = false;
+                bool IsSuccess2 = false;
+                bool EngineGetOver_PLC_NextWorkStep;
+                //工件是否到位
+                MIS_BASE.Read_WorkStart(OpName, out EngineGetOver_PLC_NextWorkStep);
+
+                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);
+
+                //此处逻辑有问题   需要考虑到批次扫描  提示PLC未传递机型的情况
+                if (EngineGetOver_PLC_NextWorkStep)
+                {
+                    //1.更新壳体码
+                    BaseDataSystemMES.WorkNumber_Edit(OpName, barcode, OrderForm);
+                    // 1.1把输入的壳体码作为物料写到OP010工位里去
+                    //第二步，将零件信息转移到零件_临时表中（本地BOM与订单BOM的选择显示关系）
+                    BaseDataSystemMES.MesServer_Process_EngineTypeOver("OP0010", 1);
+                    //第三步直接验证物料
+                    BaseDataSystemMES.PartMaterial_DM_Update("OP0010", barcode, out IsSuccess2);
+
+                    //2.显示新MOBY
+                    Sendmessage("5", "1", OpName);
+                    //3.将MOBY写入地址，等待工作完成后保存在码块中
+                    MIS_BASE.Write_EngineID_MES(OpName, barcode);
+
+                    //1.1 写入间隔号
+                    BaseDataSystemMES.distanceNumber_Edit(distanceNumber, OrderForm);
+
+                    //4.判断有无要扫的物料，如果没有就直接允许工作
+                    //获取是否允许工作
+                    BaseDataSystemMES.MesServer_Judge_IsCanWork(OpName, out IsAllowWork);
+                    if (IsAllowWork == 1)
+                    {
+                        //通知PLC允许工作,允许工作在保存完成时清空
+                        MIS_BASE.Write_FixAllow(OpName, true);
+                        AsyncSendMessage_Notice(OpName, "壳体码与间隔号修改成功,请开始工作");
+                    }
+                    else
+                    {
+                        AsyncSendMessage_Notice(OpName, "壳体码与间隔号修改成功,请扫描物料");
+                    }
+                }
+                else
+                {
+                    AsyncSendMessage_Notice(OpName, "PLC未传递机型");
+                }
+            }
+            catch (Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:Barcode");
+            }
+        }
+
+
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/WorkStart.cs
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/WorkStart.cs
@@ -0,0 +1,29 @@
+using System;
+//using SystemFramework;
+
+namespace MesServerFunctions
+{
+    partial class Functions_BASE_02
+    {
+        /// <summary>
+        /// 工件到位与离开时，清空MES自身信号
+        /// </summary>
+        /// <param name="OpName"></param>
+        /// <param name="tagValue"></param>
+        private void WorkStart(object  e)
+        {
+            try
+            {
+                DoWhatPlc.CustomeEvetnArgs msgEvent = (DoWhatPlc.CustomeEvetnArgs)e;
+                string OpName = Convert.ToString(msgEvent.OpName);
+                int tagValue = Convert.ToInt32(msgEvent.TagValue);
+                
+            }
+            catch(Exception err)
+            {
+                ////ApplicationLog.WriteLog(err, "Function02:WorkStart");
+            }
+        }
+
+    }
+}
--- a/MisDataFunction/MesServer.Function/Function02/OpcServer/vssver2.scc
+++ b/MisDataFunction/MesServer.Function/Function02/OpcServer/vssver2.scc
--- a/MisDataFunction/MesServer.Function/Function02/Properties/AssemblyInfo.cs
+++ b/MisDataFunction/MesServer.Function/Function02/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")]
--- a/MisDataFunction/MesServer.Function/Function02/Properties/vssver2.scc
+++ b/MisDataFunction/MesServer.Function/Function02/Properties/vssver2.scc
--- a/MisDataFunction/MesServer.Function/Function02/app.config
+++ b/MisDataFunction/MesServer.Function/Function02/app.config
@@ -0,0 +1,19 @@
+<?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>
+    </assemblyBinding>
+  </runtime>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
--- a/MisDataFunction/MesServer.Function/Function02/mssccprj.scc
+++ b/MisDataFunction/MesServer.Function/Function02/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
--- a/MisDataFunction/MesServer.Function/Function02/packages.config
+++ b/MisDataFunction/MesServer.Function/Function02/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>
--- a/MisDataFunction/MesServer.Function/Function02/vssver2.scc
+++ b/MisDataFunction/MesServer.Function/Function02/vssver2.scc