diff --git a/Common/09MesDataFunction/MesDataFunction/13MIS_FuntionSaveData/Funtion.MesRead.cs b/Common/09MesDataFunction/MesDataFunction/13MIS_FuntionSaveData/Funtion.MesRead.cs index 00afac1..0b295b0 100644 --- a/Common/09MesDataFunction/MesDataFunction/13MIS_FuntionSaveData/Funtion.MesRead.cs +++ b/Common/09MesDataFunction/MesDataFunction/13MIS_FuntionSaveData/Funtion.MesRead.cs @@ -228,7 +228,7 @@ namespace MisDataSaveDateMesRead MisDataFun.BaseData_tagTable_QualityData_B5A_Insert_OP170Status(id_tagCF, engineTypeID, engineID, "72300031", MaxUseTime.ToString(), qualityMask, opName); } - if(!((engineTypeID != 1 && engineTypeID != 5 ) && (opName == "OP120" || opName == "OP140" || opName == "OP160"))) // CC GQ UPS 固定架不涂胶 所以直接跳 PDC 和 W05 需要涂胶校验 + if(!((engineTypeID != 1 && engineTypeID != 1 ) && (opName == "OP120" || opName == "OP140" || opName == "OP160"))) // CC GQ UPS 固定架不涂胶 所以直接跳 PDC 和 W05 需要涂胶校验 { if (MisDataFun.GetSpecialOpExist(opName, "涂胶时间差校验")) { diff --git a/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.BaseFlow.cs b/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.BaseFlow.cs index 1c5dd60..b359bcc 100644 --- a/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.BaseFlow.cs +++ b/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.BaseFlow.cs @@ -176,6 +176,34 @@ namespace MisDataFunDll return false; } + /// + /// 写入 保存完成和工作完成 并且对此进行一定判断校验 + /// + /// + public static void WriteMesReadOver(string OpName, bool isOver) + { + if (isOver) + { + MIS_BASE.Read_WorkStart(OpName, out bool isWorkStart); + if (!isWorkStart) + { + MisDataFun.LogRecording_OP(OpName, "WARNING", "WriteMesReadOver", "产品未在位 不予写入工作完成"); + return; + } + MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES保存数据完成！"); + MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES工作完成！"); + } + else + { + MIS_BASE.Write_FalseGO(OpName, false); // 不合格放行（MES） + MIS_BASE.Write_ConfirmOkGo(OpName, false); // 合格放行（MES） + } + //通知PLC，MES工作完成 + MIS_BASE.Write_MesWorkFinish(OpName, isOver); + //通知PLC，MES保存完成 + MIS_BASE.Write_MesReadOver(OpName, isOver); + } + /// /// 上盖装配新产品 根据工位扫码 写入产品信息至PLC /// @@ -211,26 +239,5 @@ namespace MisDataFunDll MisDataFun.LogRecording_OP(OpName, "WARNING", "MOM", msg); return false; } - - /// - /// 写入 保存完成和工作完成 并且对此进行一定判断校验 - /// - /// - public static void WriteMesReadOver(string OpName,bool isOver) - { - if (isOver) - { - MIS_BASE.Read_WorkStart(OpName,out bool isWorkStart); - if(!isWorkStart) - { - MisDataFun.LogRecording_OP(OpName, "WARNING", "WriteMesReadOver", "产品未在位 不予写入工作完成"); - return; - } - } - //通知PLC，MES工作完成 - MIS_BASE.Write_MesWorkFinish(OpName, isOver); - //通知PLC，MES保存完成 - MIS_BASE.Write_MesReadOver(OpName, isOver); - } } } diff --git a/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.DB.cs b/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.DB.cs index 4198d1c..9a5ddeb 100644 --- a/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.DB.cs +++ b/Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.DB.cs @@ -284,10 +284,6 @@ namespace MisDataFunDll /// public static bool GetSpecialOpExist(string opName, string type) { - if (PP.SpecialOpList == null) - { - return false; - } if (PP.SpecialOpList.ContainsKey(type)) { return PP.SpecialOpList[type].Contains(opName); @@ -295,30 +291,6 @@ namespace MisDataFunDll return false; } - /// - /// 从启动缓存中读取特殊工位规则配置。 - /// - public static string GetSpecialOpRuleValue(string opName, string type, string ruleKey, string defaultValue = "") - { - if (PP.SpecialOpRuleConfig == null) - { - return defaultValue; - } - if (!PP.SpecialOpRuleConfig.ContainsKey(type)) - { - return defaultValue; - } - if (!PP.SpecialOpRuleConfig[type].ContainsKey(opName)) - { - return defaultValue; - } - if (!PP.SpecialOpRuleConfig[type][opName].ContainsKey(ruleKey)) - { - return defaultValue; - } - return PP.SpecialOpRuleConfig[type][opName][ruleKey]; - } - /// /// 这是一个防错方法 判断200扫码工位 如果出现 产品到位 传递机型未完成时扫码 无物料与拧紧的情况下 会直接跳到出站 给两秒缓冲时间 确保物料已入库 /// @@ -544,15 +516,15 @@ namespace MisDataFunDll string targetField; if (OpName.StartsWith("OP450")) { - targetField = "TEXT1"; + targetField = "TEXT2"; } else { switch (EngineTypeID) { case 1: case 5: targetField = "TEXT9"; break; - case 2: case 3: case 6: case 7: targetField = "TEXT14"; break; - case 4: targetField = "TEXT16"; break; + case 2: case 3: targetField = "TEXT14"; break; + case 4: case 6: case 7: targetField = "TEXT16"; break; default: targetField = ""; break; } } @@ -1827,6 +1799,31 @@ namespace MisDataFunDll DataAccess.ExecuteStoredProcedure(procedureName, ref thisParms); } + /// + /// 保存 OP420 静置B位开始记录，同一产品只保留最新一条。 + /// + public static bool SaveManualStaticBRecord(string engineID, string engineType, int engineTypeID, out string message) + { + message = ""; + SqlParameter[] sqlParameters = new SqlParameter[] + { + new SqlParameter("@产品编号", engineID), + new SqlParameter("@产品型号", engineType), + new SqlParameter("@产品型号代码", engineTypeID), + new SqlParameter("@静置开始时间", DateTime.Now) + }; + + string errorMessage; + DataAccess.ExecuteStoredProcedure("线下手动静置_记录_保存", ref sqlParameters, out errorMessage); + if (!string.IsNullOrWhiteSpace(errorMessage)) + { + message = "保存线下手动静置记录失败：" + errorMessage; + return false; + } + + return true; + } + /// /// 工位打码记录 增加 /// diff --git a/Common/09MesDataFunction/MesDataFunction/MesDataFunction/MIS.OpcServerMIS.Write.cs b/Common/09MesDataFunction/MesDataFunction/MesDataFunction/MIS.OpcServerMIS.Write.cs index 8e664bf..ebaeb62 100644 --- a/Common/09MesDataFunction/MesDataFunction/MesDataFunction/MIS.OpcServerMIS.Write.cs +++ b/Common/09MesDataFunction/MesDataFunction/MesDataFunction/MIS.OpcServerMIS.Write.cs @@ -515,13 +515,11 @@ namespace MesServerWork // -99 是复位 if (qualityMask == -99) { - Write_TagValueByTagTypeID(51, opName, false); - Write_TagValueByTagTypeID(8, opName, false); + MIS_BASE.Write_FalseGO(opName, false); // 不合格放行（MES） + MIS_BASE.Write_ConfirmOkGo(opName, false); // 合格放行（MES） } else { - //Write_TagValueByTagTypeID(51, opName, false); - //Write_TagValueByTagTypeID(8, opName, false); Write_TagValueByTagTypeID(qualityMask == 1 ? 51 : 8, opName, true); } } diff --git a/Common/09MesDataFunction/MesDataFunction/ToPrinter/PP.cs b/Common/09MesDataFunction/MesDataFunction/ToPrinter/PP.cs index a807533..53ab265 100644 --- a/Common/09MesDataFunction/MesDataFunction/ToPrinter/PP.cs +++ b/Common/09MesDataFunction/MesDataFunction/ToPrinter/PP.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -13,7 +13,6 @@ namespace MesDataFunction public static string PrintURL { get; set; } public static int IsDemoMesServer { get; set; } public static Dictionary SpecialOpList { get; set; } - public static Dictionary>> SpecialOpRuleConfig { get; set; } } } diff --git a/Common/09MesDataFunction/MesDataFunction/webService/CallWebService.cs b/Common/09MesDataFunction/MesDataFunction/webService/CallWebService.cs index 2cc9769..70e08a5 100644 --- a/Common/09MesDataFunction/MesDataFunction/webService/CallWebService.cs +++ b/Common/09MesDataFunction/MesDataFunction/webService/CallWebService.cs @@ -1560,11 +1560,12 @@ namespace MisDataSaveDate int EngineTypeID = Convert.ToInt32(dt_quality.Rows[0]["产品代码"]); if (opName == "OP320") { - if (EngineTypeID == 2 ) dataCollectForResourceInspect.dcSequence = "B1"; + if (EngineTypeID == 2) dataCollectForResourceInspect.dcSequence = "B1"; if (EngineTypeID == 3) dataCollectForResourceInspect.dcSequence = "B2"; if (EngineTypeID == 4) dataCollectForResourceInspect.dcSequence = "B3"; - if (EngineTypeID == 5) dataCollectForResourceInspect.dcSequence = "B4"; - if (EngineTypeID == 6) dataCollectForResourceInspect.dcSequence = "B5"; + if (EngineTypeID == 5) dataCollectForResourceInspect.dcSequence = "B5"; + if (EngineTypeID == 6) dataCollectForResourceInspect.dcSequence = "B4"; + if (EngineTypeID == 7) dataCollectForResourceInspect.dcSequence = "B4"; } List parametricDataArray = new List(); diff --git a/MisDataFun.sln b/MisDataFun.sln index 0dc8075..748b5ba 100644 --- a/MisDataFun.sln +++ b/MisDataFun.sln @@ -35,6 +35,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function1061", "MisDataFunc EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function1065", "MisDataFunction\Function1065\Function1065.csproj", "{ABE98FA8-80EB-40E8-A93A-D70F14EB80DC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Function1062", "MisDataFunction\Function1062\Function1062.csproj", "{304A54D1-63AD-44DE-B573-772EE533C47F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -163,6 +165,14 @@ Global {ABE98FA8-80EB-40E8-A93A-D70F14EB80DC}.Release|Any CPU.Build.0 = Release|Any CPU {ABE98FA8-80EB-40E8-A93A-D70F14EB80DC}.Release|x86.ActiveCfg = Release|Any CPU {ABE98FA8-80EB-40E8-A93A-D70F14EB80DC}.Release|x86.Build.0 = Release|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Debug|x86.ActiveCfg = Debug|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Debug|x86.Build.0 = Debug|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Release|Any CPU.Build.0 = Release|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Release|x86.ActiveCfg = Release|Any CPU + {304A54D1-63AD-44DE-B573-772EE533C47F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -180,6 +190,7 @@ Global {D5DC93C7-91DD-4C82-9444-64180F15A9C9} = {4BF576F8-7AFE-41D3-A998-2AE62375DEC6} {9ACE8658-5E01-4323-8A59-D43CFFCB47F3} = {4BF576F8-7AFE-41D3-A998-2AE62375DEC6} {ABE98FA8-80EB-40E8-A93A-D70F14EB80DC} = {4BF576F8-7AFE-41D3-A998-2AE62375DEC6} + {304A54D1-63AD-44DE-B573-772EE533C47F} = {4BF576F8-7AFE-41D3-A998-2AE62375DEC6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9BB32B35-134E-4853-B853-73A014D416DF} diff --git a/MisDataFun/MisDataFun/MisDataFun.cs b/MisDataFun/MisDataFun/MisDataFun.cs index ad4365d..a3a9954 100644 --- a/MisDataFun/MisDataFun/MisDataFun.cs +++ b/MisDataFun/MisDataFun/MisDataFun.cs @@ -1,4 +1,4 @@ -using DataLinkMesWork; +using DataLinkMesWork; using MesDataFunction; using MesServerWork; using MesWork.PLC; @@ -138,7 +138,7 @@ namespace MisDataSaveDate var dt_Device = MisDataFunDll.MisDataFun.dt_Device(); var dt_TagTypeDataType = MisDataFunDll.MisDataFun.dt_TagTypeDataType(); - ReloadSpecialConfig(); + Get_SpecialOpList(); var sql = $" SELECT [工位号],[工位名称],[PLC],[PLC代码],[MesDll]" + @@ -221,13 +221,6 @@ namespace MisDataSaveDate } - // 重新加载特殊工位及硬编码规则配置缓存 - static public void ReloadSpecialConfig() - { - Get_SpecialOpList(); - Get_SpecialOpRuleConfig(); - } - // 获取特殊工位列表 static public void Get_SpecialOpList() { @@ -245,35 +238,6 @@ namespace MisDataSaveDate PP.SpecialOpList = specialOpList; } - // 获取特殊工位规则配置，缓存结构：type -> opName -> ruleKey -> ruleValue - static public void Get_SpecialOpRuleConfig() - { - string procedureName = "MES_特殊工位规则配置表_查询"; - SqlParameter[] thisParms = new SqlParameter[0]; - DataAccess.ExecuteStoredProcedure(procedureName, ref thisParms, out DataTable dt); - var ruleConfig = new Dictionary>>(); - foreach (DataRow row in dt.Rows) - { - string type = row["type"].ToString(); - string opName = row["opName"].ToString(); - string ruleKey = row["ruleKey"].ToString(); - string ruleValue = row["ruleValue"].ToString(); - - if (!ruleConfig.ContainsKey(type)) - { - ruleConfig[type] = new Dictionary>(); - } - if (!ruleConfig[type].ContainsKey(opName)) - { - ruleConfig[type][opName] = new Dictionary(); - } - - ruleConfig[type][opName][ruleKey] = ruleValue; - } - - PP.SpecialOpRuleConfig = ruleConfig; - } - public void SaveData_Load(object sender, EventArgs e) { @@ -1110,8 +1074,7 @@ namespace MisDataSaveDate private void button19_Click_1(object sender, EventArgs e) { - ReloadSpecialConfig(); - MessageBox.Show("特殊工位和规则配置已重新加载！"); + Get_SpecialOpList(); } private void button21_Click(object sender, EventArgs e) diff --git a/MisDataFun/MisDataFun/MisDataFun.csproj b/MisDataFun/MisDataFun/MisDataFun.csproj index 37f354c..baaf8d4 100644 --- a/MisDataFun/MisDataFun/MisDataFun.csproj +++ b/MisDataFun/MisDataFun/MisDataFun.csproj @@ -275,6 +275,10 @@ {9ace8658-5e01-4323-8a59-d43cffcb47f3} Function1061 + + {304a54d1-63ad-44de-b573-772ee533c47f} + Function1062 + {abe98fa8-80eb-40e8-a93a-d70f14eb80dc} Function1065 diff --git a/MisDataFun/MisDataFun/webApi/Controller/WebSendControll.cs b/MisDataFun/MisDataFun/webApi/Controller/WebSendControll.cs index b726d8a..dd589aa 100644 --- a/MisDataFun/MisDataFun/webApi/Controller/WebSendControll.cs +++ b/MisDataFun/MisDataFun/webApi/Controller/WebSendControll.cs @@ -10,6 +10,7 @@ namespace MisDataSaveDate readonly string headUrl = "WebSend/"; [HttpPost] + [Route("ApiFailRetry")] public HttpResponseMessage ReceiveMomPlanData([FromBody] JObject jobj) { diff --git a/MisDataFun/MisDataFun/webApi/WebSendServer.cs b/MisDataFun/MisDataFun/webApi/WebSendServer.cs index b8e9490..39998c2 100644 --- a/MisDataFun/MisDataFun/webApi/WebSendServer.cs +++ b/MisDataFun/MisDataFun/webApi/WebSendServer.cs @@ -861,8 +861,9 @@ namespace MisDataSaveDate /// 产品型号代码 /// public int EngineTypeID { get; set; } + /// - /// 工位号 + /// 工位号，如 OP120 /// public string OpName { get; set; } } diff --git a/MisDataFun_Exe/Function1062.dll.config b/MisDataFun_Exe/Function1062.dll.config new file mode 100644 index 0000000..95269f5 --- /dev/null +++ b/MisDataFun_Exe/Function1062.dll.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/MisDataFunction/Function1051/OpcServer/MesRead.cs b/MisDataFunction/Function1051/OpcServer/MesRead.cs index d33030c..4d78186 100644 --- a/MisDataFunction/Function1051/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1051/OpcServer/MesRead.cs @@ -1,6 +1,5 @@ using System; using System.Data; -using MesDataFunction; using MesServerWork; using MisDataFunDll; using MisDataSaveDate; @@ -85,15 +84,11 @@ namespace MesServerFunctions return; } - // 保存完成工作完成 - MisDataBaseFun.WriteMesReadOver(OpName, true); - - MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES保存数据完成！"); - MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES工作完成！"); + MisDataBaseFun.WriteMesReadOver(OpName, true); // 保存完成工作完成 } else { - MisDataBaseFun.WriteMesReadOver(OpName, false); + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, -99); MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "PLC允许保存数据取消！"); diff --git a/MisDataFunction/Function1052/OpcServer/MesRead.cs b/MisDataFunction/Function1052/OpcServer/MesRead.cs index c48861c..5085ee8 100644 --- a/MisDataFunction/Function1052/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1052/OpcServer/MesRead.cs @@ -124,16 +124,11 @@ namespace MesServerFunctions return; } - // 保存完成工作完成 - MisDataBaseFun.WriteMesReadOver(OpName, true); - - MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES保存数据完成！"); - MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES工作完成！"); + MisDataBaseFun.WriteMesReadOver(OpName, true); // 保存完成工作完成 } else { - MisDataBaseFun.WriteMesReadOver(OpName, false); - + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, -99); MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "PLC允许保存数据取消！"); diff --git a/MisDataFunction/Function1055/Function1055.csproj b/MisDataFunction/Function1055/Function1055.csproj index bd457a9..6b18950 100644 --- a/MisDataFunction/Function1055/Function1055.csproj +++ b/MisDataFunction/Function1055/Function1055.csproj @@ -79,9 +79,9 @@ + - @@ -117,4 +117,4 @@ --> - + \ No newline at end of file diff --git a/MisDataFunction/Function1055/MesServerFunction/Fun_1055.cs b/MisDataFunction/Function1055/MesServerFunction/Fun_1055.cs index 276a9d0..93eed94 100644 --- a/MisDataFunction/Function1055/MesServerFunction/Fun_1055.cs +++ b/MisDataFunction/Function1055/MesServerFunction/Fun_1055.cs @@ -187,6 +187,16 @@ namespace MesServerFunctions ThreadPool.QueueUserWorkItem(FalseGO, e); } + /// + /// OP420 静置B位产品信息保存 + /// + /// + /// + public void fun_ManualStaticBSave(DeviceDriver_BasicData.CustomeEvetnArgs e) + { + ThreadPool.QueueUserWorkItem(ManualStaticBSave, e); + } + /// /// 允许保存 /// @@ -258,16 +268,6 @@ namespace MesServerFunctions ThreadPool.QueueUserWorkItem(MesSaveNowData, e); } - /// - /// OP420 静置B位产品信息保存 - /// - /// - /// - public void fun_ManualStaticBSave(DeviceDriver_BasicData.CustomeEvetnArgs e) - { - ThreadPool.QueueUserWorkItem(ManualStaticBSave, e); - } - /// /// 拧紧完成 /// diff --git a/MisDataFunction/Function1055/OpcServer/ManualStaticBSave.cs b/MisDataFunction/Function1055/OpcServer/ManualStaticBSave.cs index 3f94151..e93a13b 100644 --- a/MisDataFunction/Function1055/OpcServer/ManualStaticBSave.cs +++ b/MisDataFunction/Function1055/OpcServer/ManualStaticBSave.cs @@ -1,4 +1,4 @@ -using DataLinkMesWork1; +using DataLinkMesWork1; using MesServerWork; using MisDataFunDll; using System; @@ -13,12 +13,12 @@ namespace MesServerFunctions /// private void ManualStaticBSave(object e) { + var msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e; + string opName = Convert.ToString(msgEvent.OpName); + int tagValue = Convert.ToInt32(msgEvent.TagValue); + try { - var msgEvent = (DeviceDriver_BasicData.CustomeEvetnArgs)e; - string opName = Convert.ToString(msgEvent.OpName); - int tagValue = Convert.ToInt32(msgEvent.TagValue); - if (opName != "OP420") { return; @@ -45,16 +45,21 @@ namespace MesServerFunctions return; } - // PLC 当前产品区已是最终 PACK 码，只补查订单和产品型号。 - MisDataFun.Moby_Select_PDC(engineID, out orderForm, out engineType, out engineTypeID); - if (engineTypeID <= 0) + // PLC 可能只给产品码和机型代码，补查数据库中的产品型号。 + string dbEngineType; + int dbEngineTypeID; + MisDataFun.Moby_Select_PDC(engineID, out orderForm, out dbEngineType, out dbEngineTypeID); + if (dbEngineTypeID > 0) { - WriteManualStaticBSaveError(opName, "未查询到产品执行信息：" + engineID); - return; + engineTypeID = dbEngineTypeID; + } + if (!string.IsNullOrWhiteSpace(dbEngineType)) + { + engineType = dbEngineType; } string message; - if (!SaveManualStaticBRecord(engineID, engineType, engineTypeID, out message)) + if (!MisDataFun.SaveManualStaticBRecord(engineID, engineType, engineTypeID, out message)) { WriteManualStaticBSaveError(opName, message); return; @@ -66,34 +71,11 @@ namespace MesServerFunctions catch (Exception err) { MyLog4Net.MyLogHelper.Error("Function1055.ManualStaticBSave", err.Message); - WriteManualStaticBSaveError("OP420", err.Message); + WriteManualStaticBSaveError(opName, err.Message); } } - /// - /// 保存 OP420 静置B位开始记录，同一产品只保留最新一条。 - /// - private bool SaveManualStaticBRecord(string engineID, string engineType, int engineTypeID, out string message) - { - message = ""; - SqlParameter[] sqlParameters = new SqlParameter[] - { - new SqlParameter("@产品编号", engineID), - new SqlParameter("@产品型号", engineType), - new SqlParameter("@产品型号代码", engineTypeID), - new SqlParameter("@静置开始时间", DateTime.Now) - }; - - string errorMessage; - DataAccess.ExecuteStoredProcedure("线下手动静置_记录_保存", ref sqlParameters, out errorMessage); - if (!string.IsNullOrWhiteSpace(errorMessage)) - { - message = "保存线下手动静置记录失败：" + errorMessage; - return false; - } - - return true; - } + /// /// OP420 静置B位保存失败时复位完成点位并通知页面。 @@ -106,4 +88,4 @@ namespace MesServerFunctions MisDataFun.LogRecording_OP(opName, "ERROR", "ManualStaticBSave", message); } } -} +} \ No newline at end of file diff --git a/MisDataFunction/Function1055/OpcServer/MesRead.cs b/MisDataFunction/Function1055/OpcServer/MesRead.cs index 4ea964b..b8a73ff 100644 --- a/MisDataFunction/Function1055/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1055/OpcServer/MesRead.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Data; using System.Threading; -using MesDataFunction; //using SystemFramework; using MesServerWork; using MisDataFunDll; @@ -100,7 +99,8 @@ namespace MesServerFunctions } else { - MisDataBaseFun.WriteMesReadOver(OpName, false); + MIS_BASE.Write_MesReadOver(OpName, false); + MIS_BASE.Write_MesWorkFinish(OpName, false); MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "PLC允许保存数据取消！"); } diff --git a/MisDataFunction/Function1056/OpcServer/MesRead.cs b/MisDataFunction/Function1056/OpcServer/MesRead.cs index 198761b..054faa0 100644 --- a/MisDataFunction/Function1056/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1056/OpcServer/MesRead.cs @@ -111,14 +111,11 @@ namespace MesServerFunctions return; } - // 保存完成工作完成 - MisDataBaseFun.WriteMesReadOver(OpName, true); - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES保存数据完成！"); - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES工作完成！"); + MisDataBaseFun.WriteMesReadOver(OpName, true); // 保存完成工作完成 } else { - MisDataBaseFun.WriteMesReadOver(OpName, false); + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, -99); MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "PLC允许保存数据取消！"); @@ -130,4 +127,4 @@ namespace MesServerFunctions } } } -} +} \ No newline at end of file diff --git a/MisDataFunction/Function1057/OpcServer/MesRead.cs b/MisDataFunction/Function1057/OpcServer/MesRead.cs index 127d747..76cf353 100644 --- a/MisDataFunction/Function1057/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1057/OpcServer/MesRead.cs @@ -1,5 +1,4 @@ using MesServerWork; -using MesDataFunction; using MisDataFunDll; using MisDataSaveDate; using System; @@ -128,16 +127,19 @@ namespace MesServerFunctions // 都出站成功了 才给PLC信号 if (part1_IsOk && part2_IsOk) { - // 保存完成工作完成 - MisDataBaseFun.WriteMesReadOver(OpName, true); - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES保存数据完成！"); - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES工作完成！"); + //通知PLC，MES工作完成 + MIS_BASE.Write_MesWorkFinish(OpName, true); + //通知PLC，MES保存完成 + MIS_BASE.Write_MesReadOver(OpName, true); + MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES保存数据完成！"); + MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES工作完成！"); + } - + } else { - MisDataBaseFun.WriteMesReadOver(OpName, false); + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "PLC允许保存数据取消！"); } } diff --git a/MisDataFunction/Function1058/OpcServer/MesRead.cs b/MisDataFunction/Function1058/OpcServer/MesRead.cs index 14cbfc1..b732161 100644 --- a/MisDataFunction/Function1058/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1058/OpcServer/MesRead.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Threading; //using SystemFramework; -using MesDataFunction; using MesServerWork; using MisDataFunDll; @@ -66,16 +65,20 @@ namespace MesServerFunctions } // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, qualityMask); - // 保存完成工作完成 - MisDataBaseFun.WriteMesReadOver(OpName, true); + + //通知PLC，MES工作完成 + MIS_BASE.Write_MesWorkFinish(OpName, true); + //通知PLC，MES保存完成 + MIS_BASE.Write_MesReadOver(OpName, true); MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES保存数据完成！"); MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES工作完成！"); + } else { // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, -99); - MisDataBaseFun.WriteMesReadOver(OpName, false); + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "PLC允许保存数据取消！"); } diff --git a/MisDataFunction/Function1059/OpcServer/MesRead.cs b/MisDataFunction/Function1059/OpcServer/MesRead.cs index acd45a3..dcffdb6 100644 --- a/MisDataFunction/Function1059/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1059/OpcServer/MesRead.cs @@ -1,5 +1,4 @@ //using SystemFramework; -using MesDataFunction; using MesServerWork; using MisDataFunDll; using MisDataSaveDate; @@ -100,10 +99,7 @@ namespace MesServerFunctions return; } - // 保存完成工作完成 - MisDataBaseFun.WriteMesReadOver(OpName, true); - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES保存数据完成！"); - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES工作完成！"); + MisDataBaseFun.WriteMesReadOver(OpName, true); // 保存完成工作完成 } else { @@ -119,7 +115,7 @@ namespace MesServerFunctions { // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, -99); - MisDataBaseFun.WriteMesReadOver(OpName, false); + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "PLC允许保存数据取消！"); } diff --git a/MisDataFunction/Function1060/OpcServer/MesRead.cs b/MisDataFunction/Function1060/OpcServer/MesRead.cs index e0ffc61..eb2c890 100644 --- a/MisDataFunction/Function1060/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1060/OpcServer/MesRead.cs @@ -49,19 +49,13 @@ namespace MesServerFunctions // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, qualityMask); - //通知PLC，MES保存完成 - MIS_BASE.Write_MesReadOver(OpName, true); - //通知PLC，MES工作完成 - MIS_BASE.Write_MesWorkFinish(OpName, true); - MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES保存数据完成！"); - MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "MES工作完成！"); + MisDataBaseFun.WriteMesReadOver(OpName, true); // 保存完成工作完成 } else { // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, -99); - MIS_BASE.Write_MesReadOver(OpName, false); - MIS_BASE.Write_MesWorkFinish(OpName, false); + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 MisDataFun.LogRecording_OP(OpName, "INFO", "MIS", "PLC允许保存数据取消！"); } diff --git a/MisDataFunction/Function1061/OpcServer/Barcode.cs b/MisDataFunction/Function1061/OpcServer/Barcode.cs index 37db047..e2a0920 100644 --- a/MisDataFunction/Function1061/OpcServer/Barcode.cs +++ b/MisDataFunction/Function1061/OpcServer/Barcode.cs @@ -64,7 +64,7 @@ namespace MesServerFunctions //InitWorkStep(OpName, EngineTypeID, EngineType, EngineID); //更新订单完工数量及物料 SendMessageFun.SendMessage("2", "11", OpName); - if(EngineTypeID == 2 || EngineTypeID == 3 || EngineTypeID == 6 || EngineTypeID == 7) PrinterCommandCenter.PrintToPrinter(OpName, EngineID); // 打印PACK条码 + if(EngineTypeID == 2 || EngineTypeID == 3) PrinterCommandCenter.PrintToPrinter(OpName, EngineID); // 打印PACK条码 MIS_BASE.Write_FixAllow(OpName, true); // 允许工作 MisDataFun.LogRecording_OP(OpName, "INFO", "Barcode", "物料验证完成 允许工作！"); } diff --git a/MisDataFunction/Function1061/OpcServer/MesRead.cs b/MisDataFunction/Function1061/OpcServer/MesRead.cs index b751cc4..893f6d9 100644 --- a/MisDataFunction/Function1061/OpcServer/MesRead.cs +++ b/MisDataFunction/Function1061/OpcServer/MesRead.cs @@ -1,6 +1,5 @@ using System; using System.Data; -using MesDataFunction; using MesServerWork; using MisDataFunDll; using MisDataSaveDate; @@ -82,15 +81,11 @@ namespace MesServerFunctions return; } - // 保存完成工作完成 - MisDataBaseFun.WriteMesReadOver(OpName, true); - - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES保存数据完成！"); - MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "MES工作完成！"); + MisDataBaseFun.WriteMesReadOver(OpName, true); // 保存完成工作完成 } else { - MisDataBaseFun.WriteMesReadOver(OpName, false); + MisDataBaseFun.WriteMesReadOver(OpName, false); // 保存完成工作完成 // 写入加工合格还是不合格 根据工位合格标志写 MIS_BASE.Write_OpNameIsOk(OpName, -99); MisDataFun.LogRecording_OP(OpName, "INFO", "MesRead", "PLC允许保存数据取消！"); diff --git a/MisDataFunction/Function1062.zip b/MisDataFunction/Function1062.zip deleted file mode 100644 index dc8fd2b..0000000 Binary files a/MisDataFunction/Function1062.zip and /dev/null differ diff --git a/MisDataFunction/Function1062/Function1062.csproj b/MisDataFunction/Function1062/Function1062.csproj index 8371f7b..fb85ab1 100644 --- a/MisDataFunction/Function1062/Function1062.csproj +++ b/MisDataFunction/Function1062/Function1062.csproj @@ -5,7 +5,7 @@ AnyCPU 8.0.30703 2.0 - {B5A0BAA3-C1A7-4AAB-9486-2E650ADACA7E} + {304A54D1-63AD-44DE-B573-772EE533C47F} Library Properties Function1062 @@ -106,4 +106,4 @@ --> - + \ No newline at end of file