添加动态配置 与 SLS改造机型判断位置

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 != 1 ) && (opName == "OP120" || opName == "OP140" || opName == "OP160")))   // CC GQ UPS 固定架不涂胶 所以直接跳 PDC 和 W05 需要涂胶校验
+                    if(!((engineTypeID != 1 && engineTypeID != 5 ) && (opName == "OP120" || opName == "OP140" || opName == "OP160")))   // CC GQ UPS 固定架不涂胶 所以直接跳 PDC 和 W05 需要涂胶校验
                     {
                         if (MisDataFun.GetSpecialOpExist(opName, "涂胶时间差校验"))
                         {

Common/09MesDataFunction/MesDataFunction/14MisDataFunctionDB/MisDataFun.DB.cs

@@ -284,6 +284,10 @@ namespace MisDataFunDll
         /// <returns></returns>
         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);
@@ -291,6 +295,30 @@ namespace MisDataFunDll
             return false;
         }
 
+        /// <summary>
+        /// 从启动缓存中读取特殊工位规则配置。
+        /// </summary>
+        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];
+        }
+
         /// <summary>
         /// 这是一个防错方法 判断200扫码工位 如果出现 产品到位 传递机型未完成时扫码 无物料与拧紧的情况下 会直接跳到出站 给两秒缓冲时间 确保物料已入库
         /// </summary>
@@ -517,7 +545,7 @@ namespace MisDataFunDll
             switch (EngineTypeID)
             {
                 case 1: case 5: targetField = "TEXT9"; break;
-                case 2: case 3: targetField = "TEXT14"; break;
+                case 2: case 3: case 6: case 7: targetField = "TEXT14"; break;
                 case 4: targetField = "TEXT16"; break;
                 default: targetField = ""; break;
             }

Common/09MesDataFunction/MesDataFunction/ToPrinter/PP.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;

Common/09MesDataFunction/MesDataFunction/webService/CallWebService.cs

@@ -1556,7 +1556,7 @@ namespace MisDataSaveDate
             int EngineTypeID = Convert.ToInt32(dt_quality.Rows[0]["产品代码"]);
             if (opName == "OP320")
             {
-                if (EngineTypeID == 2) dataCollectForResourceInspect.dcSequence = "B1";
+                if (EngineTypeID == 2 || EngineTypeID == 6 || EngineTypeID == 7) dataCollectForResourceInspect.dcSequence = "B1";
                 if (EngineTypeID == 3) dataCollectForResourceInspect.dcSequence = "B2";
                 if (EngineTypeID == 4) dataCollectForResourceInspect.dcSequence = "B3";
             }