同步最新程序

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
         /// </summary>
         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);
             }
         }
 
-        /// <summary>
-        /// 保存 OP420 静置B位开始记录，同一产品只保留最新一条。
-        /// </summary>
-        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;
-        }
+       
 
         /// <summary>
         /// OP420 静置B位保存失败时复位完成点位并通知页面。
@@ -106,4 +88,4 @@ namespace MesServerFunctions
             MisDataFun.LogRecording_OP(opName, "ERROR", "ManualStaticBSave", message);
         }
     }
-}
+}