添加工装治具记录

UAS_MES_BG/FunctionCode/Make/Make_TestCollection.cs

@@ -242,7 +242,8 @@ namespace UAS_MES_NEW.Make
                                 LockMakeCode.Checked = true;
                             }
                         }
-                        if (dh.getRowCount("PRODUCTDEVICE left join product on pr_id=PDE_PRID", " pr_code='" + ma_prodcode.Text + "' and pde_stepcode='"+User.CurrentStepCode+"'") > 0)
+                        int devicerow = dh.getRowCount("PRODUCTDEVICE left join product on pr_id=PDE_PRID", " pr_code='" + ma_prodcode.Text + "' and pde_stepcode='" + User.CurrentStepCode + "'");
+                        if (devicerow > 0)
                         {
                             if (device.Text == "")
                             {
@@ -250,6 +251,12 @@ namespace UAS_MES_NEW.Make
                                 return;
                             }
                             string[] dev = device.Text.Split(',');
+                            if (dev.Length != devicerow)
+                            {
+                                OperateResult.AppendText("治具编号数量少于维护数量\n");
+                                return;
+                            }
+                            int checkcount = 0;
                             for (int i = 0; i < dev.Length; i++)
                             {
                                 if (!dh.CheckExist("device", "de_code='" + dev[i] + "'"))
@@ -262,6 +269,12 @@ namespace UAS_MES_NEW.Make
                                     OperateResult.AppendText("治具编号" + dev[i] + "不允许用在产品编号" + ma_prodcode.Text + "\n");
                                     return;
                                 }
+                                checkcount = checkcount + 1;
+                            }
+                            if (checkcount != devicerow)
+                            {
+                                OperateResult.AppendText("治具编号数量少于维护数量\n");
+                                return;
                             }
                         }
                         if (User.CurrentStepName == "程序烧写")
@@ -587,7 +600,7 @@ namespace UAS_MES_NEW.Make
                     else
                     {
                         //良品信息采集
-                        if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, out ErrorMessage))
+                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, device.Text, out ErrorMessage))
                         {
                             LastSncode = ms_sncode.Text;
                             //提示正确返回时传递的信息
@@ -620,7 +633,7 @@ namespace UAS_MES_NEW.Make
                 {
                     if (reworkstatus != "3")
                     {
-                        if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, out ErrorMessage))
+                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, device.Text, out ErrorMessage))
                         {
                             //提示正确返回时传递的信息
                             if (ErrorMessage.Contains("AFTERSUCCESS"))

UAS_MES_BG/PublicMethod/LogicHandler.cs

@@ -754,6 +754,23 @@ namespace UAS_MES_NEW.PublicMethod
             return CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
         }
 
+        public static bool SetStepResult1(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, string iDevice, out string oErrorMessage)
+        {
+            return CS_SetResult1(iMakeCode, iSourceCode, iSN, iUserCode, iResult, iDevice, out oErrorMessage);
+        }
+
+        public static bool CS_SetResult1(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, string iDevice, out string oErrorMessage)
+        {
+            oErrorMessage = "";
+            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, iResult, iDevice, oErrorMessage };
+            dh.CallProcedure("CS_SETSTEPRESULT_NEW", ref param);
+            oErrorMessage = param[6];
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null" || oErrorMessage.Contains("AFTERSUCCESS"))
+                return true;
+            else
+                return false;
+        }
+
         public static bool CS_SetResult(string iMakeCode, string iSourceCode, string iSN, string iUserCode, string iResult, out string oErrorMessage)
         {
             oErrorMessage = "";