去除无用的存储过程，更改采集不良调用的存储过程

UAS-MES/PublicMethod/LogicHandler.cs

@@ -804,7 +804,7 @@ namespace UAS_MES.PublicMethod
             }
             else
             {
-                return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, out oErrorMessage);
+                return CS_SetResult(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
             }
         }
 
@@ -840,18 +840,6 @@ namespace UAS_MES.PublicMethod
             return SetStepFinish(iMakeCode, iSourceCode, iSN, iMPKind, iResult, iUserCode, out oErrorMessage);
         }
 
-        public static bool CS_SetFinish(string iMakeCode, string iSourceCode, string iSN, string iUserCode, out string oErrorMessage)
-        {
-            oErrorMessage = "";
-            string[] param = new string[] { iMakeCode, iSourceCode, iSN, iUserCode, oErrorMessage };
-            dh.CallProcedure("CS_SETSTEPFINISH", ref param);
-            oErrorMessage = param[4];
-            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
-                return true;
-            else
-                return false;
-        }
-
         /// <summary>
         /// 方法说明：测试详细信息录入系统，针对一个SN多个测试项目结果可循环调用
         /// </summary>
@@ -983,7 +971,7 @@ namespace UAS_MES.PublicMethod
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "' ");
                     else
                         dh.UpdateByCondition("makeserial", "ms_nextstepcode='',ms_paststep = ms_paststep ||'," + StepCode + "',ms_reworkstatus=3", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
-                    SetTestResult(iMakeCode, iSourceCode, iSnCode, "不良采集", iResult, iUserCode, out oErrorMessage);
+                    SetTestResult(iMakeCode, iSourceCode, iSnCode, "不良采集", "NG", iUserCode, out oErrorMessage);
                 }
             }
             return true;
@@ -1131,21 +1119,6 @@ namespace UAS_MES.PublicMethod
                 return false;
         }
 
-        /// <summary>
-        /// 设置良品采集结果,iResult含有“批次通过”按抽检批次通过
-        /// </summary>
-        /// <param name="iSnCode"></param>
-        /// <param name="iMakeCode"></param>
-        /// <param name="iSourceCode"></param>
-        /// <param name="iUserName"></param>
-        /// <param name="iResult"></param>
-        /// <param name="oErrorMessage"></param>
-        /// <returns></returns>
-        public static bool UpdateMakeMessage(string iSnCode, string iMakeCode, string iMPKind, string iSourceCode, string iUserCode, string iResult, out string oErrorMessage)
-        {
-            return SetStepFinish(iMakeCode, iSourceCode, iSnCode, iMPKind, iResult, iUserCode, out oErrorMessage);
-        }
-
         /// <summary>
         /// 获取执行步骤代码，名称和线别
         /// </summary>