接口部分方法改为调用存储过程

UAS-MES/Login.cs

@@ -90,7 +90,7 @@ namespace UAS_MES
             if (LogicHandler.CheckUserLogin(UserName.Text, PassWord.Text, out ErrorMessage))
             {
                 //验证岗位资源,通过验证开启主窗体
-                if (LogicHandler.CheckUserAndSourcePassed(UserName.Text, Source.Text, out ErrorMessage))
+                if (LogicHandler.CheckUserAndResourcePassed(UserName.Text, Source.Text, out ErrorMessage))
                 {
                     this.Hide();
                     SetInf();//设置User的全局变量

UAS-MES/PublicMethod/LogicHandler.cs

@@ -201,24 +201,14 @@ namespace UAS_MES.PublicMethod
         /// <returns></returns>
         public static bool CheckCurrentStep(string iSnCode, string iMakeCode, string iSourceCode, out string oErrMessage)
         {
-            if (GetMakeInfo(iSnCode, out iMakeCode, out oErrMessage))
-            {
-                string nextstepcode = dh.getFieldDataByCondition("makeserial", "ms_nextstepcode", "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'").ToString();
-                string sourcestepcode = GetStepCodeBySource(iSourceCode);
-                if (nextstepcode == "")
-                {
-                    oErrMessage = "当前序列号已无可执行工序";
-                    return false;
-                }
-                if (nextstepcode == sourcestepcode)
-                    return true;
-                else
-                {
-                    oErrMessage = "资源" + iSourceCode + "对应的工序是" + sourcestepcode + ",序列号" + iSnCode + "当前工序是" + nextstepcode;
-                    return false;
-                }
-            }
-            else return false;
+            oErrMessage = "";
+            string[] param = new string[] { iSnCode, iMakeCode, iSourceCode, oErrMessage };
+            dh.CallProcedure("CS_CHECKSTEPSNANDMACODE", ref param);
+            oErrMessage = param[3];
+            if (oErrMessage == "" || oErrMessage == null)
+                return true;
+            else
+                return false;
         }
 
         /// <summary>
@@ -370,9 +360,9 @@ namespace UAS_MES.PublicMethod
         /// <summary>
         /// 记录登陆信息
         /// </summary>
-        public static void RecordLogInfo(string iUserCode,string iUserName,string iVersion,string iType,string iIP)
+        public static void RecordLogInfo(string iUserCode, string iUserName, string iVersion, string iType, string iIP)
         {
-            dh.ExecuteSql("insert into LogInfo(id,sip,usname,indate,uscode,versioncode,terminaltype) values (LogInfo_seq.nextval,'"+iIP+"','"+iUserName+"',sysdate,'"+iUserCode+"','"+ iVersion + "','"+iType+"')", "insert");
+            dh.ExecuteSql("insert into LogInfo(id,sip,usname,indate,uscode,versioncode,terminaltype) values (LogInfo_seq.nextval,'" + iIP + "','" + iUserName + "',sysdate,'" + iUserCode + "','" + iVersion + "','" + iType + "')", "insert");
         }
 
         /// <summary>
@@ -382,7 +372,7 @@ namespace UAS_MES.PublicMethod
         /// <param name="iPassWord"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public static bool CheckUserAndSourcePassed(string iUserCode, string iSourceCode, out string oErrorMessage)
+        public static bool CheckUserAndResourcePassed(string iUserCode, string iSourceCode, out string oErrorMessage)
         {
             oErrorMessage = "";
             string SQL = "select em_code,em_type,em_name from employee where em_code=:UserName ";
@@ -457,72 +447,24 @@ namespace UAS_MES.PublicMethod
         /// <returns></returns>
         public static bool GetAddressRangeByMakeCode(string iSnCode, string iMakeCode, out string oMac, out string oBT, out string oID1, out string oID2, out string oID3, out string oErrorMessage)
         {
-            string id = "";
             oMac = "";
             oBT = "";
             oID1 = "";
             oID2 = "";
             oID3 = "";
             oErrorMessage = "";
-            if (GetMakeInfo(iSnCode, out iMakeCode, out oErrorMessage))
-            {
-                DataTable dt = dh.getFieldsDataByCondition("MakeSerial", new string[] { "ms_mac", "ms_bt", "ms_othid1", "ms_othid2", "ms_othid3" }, "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'");
-                if (dt.Rows.Count > 0)
-                {
-                    if (dt.Rows[0]["ms_mac"].ToString() != "")
-                    {
-                        id = dt.Rows[0]["ms_id"].ToString();
-                        oMac = dt.Rows[0]["ms_mac"].ToString();
-                        oBT = dt.Rows[0]["ms_bt"].ToString();
-                        oID1 = dt.Rows[0]["ms_othid1"].ToString();
-                        oID2 = dt.Rows[0]["ms_othid2"].ToString();
-                        oID3 = dt.Rows[0]["ms_othid3"].ToString();
-                        return true;
-                    }
-                    //如果没有数据则从MakeIMEIList表中查询
-                    else
-                    {
-                        dt = dh.getFieldsDataByCondition("MakeIMEIList", new string[] { "mil_id", "mil_mac", "mil_bt", "mil_meid", "mil_netcode", "mil_psn", "mil_imei1", "mil_imei2", "mil_imei3", "mil_othid1", "mil_othid2", "mil_othid3" }, "mil_sncode='" + iSnCode + "' and mil_makecode='" + iMakeCode + "'");
-                        if (dt.Rows.Count > 0)
-                        {
-                            id = dt.Rows[0]["mil_id"].ToString();
-                            oMac = dt.Rows[0]["mil_mac"].ToString();
-                            oBT = dt.Rows[0]["mil_bt"].ToString();
-                            oID1 = dt.Rows[0]["mil_othid1"].ToString();
-                            oID2 = dt.Rows[0]["mil_othid2"].ToString();
-                            oID3 = dt.Rows[0]["mil_othid3"].ToString();
-                            return true;
-                        }
-                        else
-                        {
-                            dt = dh.getFieldsDataByCondition("MakeIMEIList", new string[] { "mil_id", "mil_mac", "mil_bt", "mil_meid", "mil_netcode", "mil_psn", "mil_imei1", "mil_imei2", "mil_imei3", "mil_othid1", "mil_othid2", "mil_othid3" }, "mil_sncode is null and mil_makecode is null order by mil_sncode");
-                            if (dt.Rows.Count > 0)
-                            {
-                                id = dt.Rows[0]["mil_id"].ToString();
-                                oMac = dt.Rows[0]["mil_mac"].ToString();
-                                oBT = dt.Rows[0]["mil_bt"].ToString();
-                                oID1 = dt.Rows[0]["mil_othid1"].ToString();
-                                oID2 = dt.Rows[0]["mil_othid2"].ToString();
-                                oID3 = dt.Rows[0]["mil_othid3"].ToString();
-                                //将已经分配的序列号的SN和MakeCode更新到MakeIMEIList表中
-                                dh.UpdateByCondition("MakeIMEIList", "mil_sncode='" + iSnCode + "',mil_makecode='" + iMakeCode + "',mil_status='已使用'", "mil_id=" + id);
-                                return true;
-                            }
-                            else
-                            {
-                                oErrorMessage = "当前序列号无可分配地址";
-                                return false;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    oErrorMessage = "序列号" + iSnCode + "不存在";
-                    return false;
-                }
-            }
-            else return false;
+            string[] param = new string[] { iSnCode, iMakeCode, oMac, oBT, oID1, oID2, oID3, oErrorMessage };
+            dh.CallProcedure("CS_GETADDRESSBYMAKECODE", ref param);
+            oMac = param[2];
+            oBT = param[3];
+            oID1 = param[4];
+            oID2 = param[5];
+            oID3 = param[6];
+            oErrorMessage = param[7];
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
+                return true;
+            else
+                return false;
         }
 
         /// <summary>
@@ -546,100 +488,36 @@ namespace UAS_MES.PublicMethod
         /// <param name="oID3"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public static bool GetIMEIOrNetCodeRange(string iSnCode, string iMakeCode, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oMac, out string oBT, out string oID1, out string oID2, out string oID3, out string oErrorMessage)
+        public static bool GetIMEIOrNetCodeRange(string iSnCode, string iMakeCode, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oBT, out string oID1, out string oID2, out string oID3, out string oErrorMessage)
         {
-            string id = "";
-            oBT = "";
-            oMEID = "";
-            oMac = "";
-            oPSN = "";
-            oNetCode = "";
             oIMEI1 = "";
             oIMEI2 = "";
             oIMEI3 = "";
+            oMEID = "";
+            oNetCode = "";
+            oPSN = "";
+            oBT = "";
             oID1 = "";
             oID2 = "";
             oID3 = "";
             oErrorMessage = "";
-            //先判断MakeSerial表的数据，是否已经烧入了，如已经烧入直接从MakeSerial表取数据
-            //condition iIMEI1,iNETCode
-            if (GetMakeInfo(iSnCode, out iMakeCode, out oErrorMessage))
-            {
-                DataTable dt = dh.getFieldsDataByCondition("MakeSerial", new string[] { "ms_id", "ms_mac", "ms_bt", "ms_meid", "ms_netcode", "ms_psn", "ms_imei1", "ms_imei2", "ms_imei3", "ms_othid1", "ms_othid2", "ms_othid3" }, "ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "' and ms_netcode like '%" + iNetCode + "%' and ms_imei1 like '%" + iIMEI1 + "%'");
-                if (dt.Rows.Count > 0)
-                {
-                    if (dt.Rows[0]["ms_mac"].ToString() != "")
-                    {
-                        id = dt.Rows[0]["ms_id"].ToString();
-                        oMac = dt.Rows[0]["ms_mac"].ToString();
-                        oBT = dt.Rows[0]["ms_bt"].ToString();
-                        oPSN = dt.Rows[0]["ms_psn"].ToString();
-                        oNetCode = dt.Rows[0]["ms_netcode"].ToString();
-                        oMEID = dt.Rows[0]["ms_meid"].ToString();
-                        oIMEI1 = dt.Rows[0]["ms_imei1"].ToString();
-                        oIMEI2 = dt.Rows[0]["ms_imei2"].ToString();
-                        oIMEI3 = dt.Rows[0]["ms_imei3"].ToString();
-                        oID1 = dt.Rows[0]["ms_othid1"].ToString();
-                        oID2 = dt.Rows[0]["ms_othid2"].ToString();
-                        oID3 = dt.Rows[0]["ms_othid3"].ToString();
-                        return true;
-                    }
-                    //如果没有数据则从MakeIMEIList表中查询
-                    else
-                    {
-                        dt = dh.getFieldsDataByCondition("MakeIMEIList", new string[] { "mil_id", "mil_mac", "mil_bt", "mil_meid", "mil_netcode", "mil_psn", "mil_imei1", "mil_imei2", "mil_imei3", "mil_othid1", "mil_othid2", "mil_othid3" }, "mil_sncode='" + iSnCode + "' and mil_makecode='" + iMakeCode + "'  and mil_netcode like '%" + iNetCode + "%' and mil_imei1 like '%" + iIMEI1 + "%'");
-                        if (dt.Rows.Count > 0)
-                        {
-                            id = dt.Rows[0]["mil_id"].ToString();
-                            oMac = dt.Rows[0]["mil_mac"].ToString();
-                            oBT = dt.Rows[0]["mil_bt"].ToString();
-                            oPSN = dt.Rows[0]["mil_psn"].ToString();
-                            oNetCode = dt.Rows[0]["mil_netcode"].ToString();
-                            oMEID = dt.Rows[0]["mil_meid"].ToString();
-                            oIMEI1 = dt.Rows[0]["mil_imei1"].ToString();
-                            oIMEI2 = dt.Rows[0]["mil_imei2"].ToString();
-                            oIMEI3 = dt.Rows[0]["mil_imei3"].ToString();
-                            oID1 = dt.Rows[0]["mil_othid1"].ToString();
-                            oID2 = dt.Rows[0]["mil_othid2"].ToString();
-                            oID3 = dt.Rows[0]["mil_othid3"].ToString();
-                            return true;
-                        }
-                        else
-                        {
-                            dt = dh.getFieldsDataByCondition("MakeIMEIList", new string[] { "mil_id", "mil_mac", "mil_bt", "mil_meid", "mil_netcode", "mil_psn", "mil_imei1", "mil_imei2", "mil_imei3", "mil_othid1", "mil_othid2", "mil_othid3" }, "mil_sncode is null and mil_makecode is null and mil_netcode like '%" + iNetCode + "%' and mil_imei1 like '%" + iIMEI1 + "%' order by mil_sncode ");
-                            if (dt.Rows.Count > 0)
-                            {
-                                id = dt.Rows[0]["mil_id"].ToString();
-                                oMac = dt.Rows[0]["mil_mac"].ToString();
-                                oBT = dt.Rows[0]["mil_bt"].ToString();
-                                oPSN = dt.Rows[0]["mil_psn"].ToString();
-                                oNetCode = dt.Rows[0]["mil_netcode"].ToString();
-                                oMEID = dt.Rows[0]["mil_meid"].ToString();
-                                oIMEI1 = dt.Rows[0]["mil_imei1"].ToString();
-                                oIMEI2 = dt.Rows[0]["mil_imei2"].ToString();
-                                oIMEI3 = dt.Rows[0]["mil_imei3"].ToString();
-                                oID1 = dt.Rows[0]["mil_othid1"].ToString();
-                                oID2 = dt.Rows[0]["mil_othid2"].ToString();
-                                oID3 = dt.Rows[0]["mil_othid3"].ToString();
-                                //将已经分配的序列号的SN和MakeCode更新到MakeIMEIList表中
-                                dh.UpdateByCondition("MakeIMEIList", "mil_sncode='" + iSnCode + "',mil_makecode='" + iMakeCode + "',mil_status='已使用'", "mil_id=" + id);
-                                return true;
-                            }
-                            else
-                            {
-                                oErrorMessage = "当前序列号无可分配地址";
-                                return false;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    oErrorMessage = "序列号" + iSnCode + "不存在";
-                    return false;
-                }
-            }
-            else return false;
+            string[] param = new string[] { iSnCode, iMakeCode, iIMEI1, iNetCode, oIMEI1, oIMEI2, oIMEI3, oMEID, oNetCode, oPSN, oBT, oID1, oID2, oID3, oErrorMessage };
+            dh.CallProcedure("CS_GETIMEIORNETCODERANGE", ref param);
+            oIMEI1 = param[4];
+            oIMEI2 = param[5];
+            oIMEI3 = param[6];
+            oMEID = param[7];
+            oNetCode = param[8];
+            oPSN = param[9];
+            oBT = param[10];
+            oID1 = param[11];
+            oID2 = param[12];
+            oID3 = param[13];
+            oErrorMessage = param[14];
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
+                return true;
+            else
+                return false;
         }
 
         /// <summary>
@@ -654,7 +532,8 @@ namespace UAS_MES.PublicMethod
             //取MakeProcess表中的执行记录ID最大的一个工单的号码
             oMakeCode = "";
             oErrorMessage = "";
-            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_sncode='" + iSnCode + "' and ms_indate in (select max(ms_indate) from makeserial where ms_sncode='" + iSnCode + "')").ToString();
+            string ms_id = dh.getFieldDataByCondition("MakeSerial", "max(ms_id) ms_id", "ms_sncode='" + iSnCode + "' or ms_firstsn in (select firstsn from makesnrelation where sn='" + iSnCode + "')").ToString();
+            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id=" + ms_id).ToString();
             if (oMakeCode != "")
                 return true;
             else
@@ -968,28 +847,16 @@ namespace UAS_MES.PublicMethod
         /// <param name="iCode1"></param>
         /// <param name="iCode2"></param>
         /// <param name="iCode3"></param>
-        /// <param name="oErrMessage"></param>
+        /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public static bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrMessage)
+        public static bool SetAddressInfo(string iSN, string iWIFI, string iBT, string iCode1, string iCode2, string iCode3, out string oErrorMessage)
         {
-            string MakeCode = "";
-            if (GetMakeInfo(iSN, out MakeCode, out oErrMessage))
-            {
-                string sql = "update MakeSerial set ms_mac=:iWifi,ms_bt=:iBT,ms_othcode1=:iCode1,ms_othcode2=:iCode2,ms_othcode3=:iCode3 where ms_sncode='" + iSN + "' and ms_makecode='" + MakeCode + "'";
-                dh.ExecuteSql(sql, "update", iWIFI, iBT, iCode1, iCode2, iCode3);
-                DataTable dt = (DataTable)dh.ExecuteSql("select si_sn from SnInfo where si_sn='" + iSN + "' or  si_sn in (select sn from makesnrelation where firstsn='" + iSN + "' or sn='" + iSN + "')", "select");
-                if (dt.Rows.Count > 0)
-                {
-                    sql = "update SnInfo set si_mac=:iMac,si_bt=:iBT,si_othcode1=:iCode1,si_othcode2=:iCode2,si_othcode3=:iCode3 where si_sn='" + dt.Rows[0]["si_sn"].ToString() + "'";
-                    dh.ExecuteSql(sql, "update", iWIFI, iBT, iCode1, iCode2, iCode3);
-                }
-                else
-                {
-                    sql = "insert into SnInfo(si_id,si_sn,si_mac,si_bt,si_othcode1,si_othcode2,si_othcode3) values(SnInfo_seq.nextval,:iSn,:iWifi,:iBt,:iCode1,:iCode2,:iCode3)";
-                    dh.ExecuteSql(sql, "insert", iSN, iWIFI, iBT, iCode1, iCode2, iCode3);
-                }
+            oErrorMessage = "";
+            string[] param = new string[] { iSN, iWIFI, iBT, iCode1, iCode2, iCode3, oErrorMessage };
+            dh.CallProcedure("CS_SETADDRESSINFO", ref param);
+            oErrorMessage = param[6];
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
                 return true;
-            }
             else
                 return false;
         }
@@ -1010,6 +877,22 @@ namespace UAS_MES.PublicMethod
             }
         }
 
+        /// <summary>
+        /// 设置测试结果
+        /// </summary>
+        /// <param name="iMakeCode"></param>
+        /// <param name="iSourceCode"></param>
+        /// <param name="iSN"></param>
+        /// <param name="iMPKind"></param>
+        /// <param name="iResult"></param>
+        /// <param name="iUserCode"></param>
+        /// <param name="oErrorMessage"></param>
+        /// <returns></returns>
+        public static bool SetTestResult(string iMakeCode, string iSourceCode, string iSN, string iMPKind, string iResult, string iUserCode, out string oErrorMessage)
+        {
+            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 = "";
@@ -1069,12 +952,16 @@ namespace UAS_MES.PublicMethod
         /// <param name="iID3"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public static bool SetIMEIInfo(string iSnCode, string iMakeCode, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNetCode, string iPSN, string iID1, string iID2, string iID3, out string oErrorMessage)
+        public static bool SetIMEIInfo(string iSnCode, string iMakeCode, string iIMEI1, string iIMEI2, string iIMEI3, string iMEID, string iNetCode, string iPSN, string iID1, string iID2, string iID3, out string oErrMessage)
         {
-            oErrorMessage = "";
-            string sql = "update MakeSerial set ms_imei1=:iIMEI1 ,ms_imei2=:iIMEI2 ,ms_imei3=:iIMEI3 ,ms_netcode=:iNetCode ,ms_psn=:iPSN ,ms_othcode1=:iCode1 ,ms_othcode2=:iCode2 ,ms_othcode3=:iCode3  where ms_sncode='" + iSnCode + "' and ms_makecode='" + iMakeCode + "'";
-            dh.ExecuteSql(sql, "update", iIMEI1, iIMEI2, iIMEI3, iNetCode, iPSN, iID1, iID2, iID3);
-            return true;
+            oErrMessage = "";
+            string[] param = new string[] { iSnCode, iMakeCode, iIMEI1, iIMEI2, iIMEI3, iMEID, iNetCode, iPSN, iID1, iID2, iID3, oErrMessage };
+            dh.CallProcedure("CS_SETIMEIINFO", ref param);
+            oErrMessage = param[11];
+            if (oErrMessage == "" || oErrMessage == null)
+                return true;
+            else
+                return false;
         }
 
         /// <summary>