Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS_MesInterface/LogicHandler.cs

@@ -137,7 +137,7 @@ namespace UAS_MesInterface
             oCdoe3 = "";
             oErrMessage = "";
             string omakeCode = "";
-            GetRcardMOInfo(iSN,out omakeCode,out oErrMessage);
+            GetRcardMOInfo(iSN, out omakeCode, out oErrMessage);
             string[] param = new string[] { iSN, omakeCode, oWIFI, oBT, oCode1, oCode2, oCdoe3, oErrMessage };
             dh.CallProcedure("CS_GETADDRESSBYMAKECODE", ref param);
             oWIFI = param[2];
@@ -170,7 +170,7 @@ namespace UAS_MesInterface
         /// <param name="oID3"></param>
         /// <param name="oErrMessage"></param>
         /// <returns></returns>
-        public bool GetMEIOrNetCodeRange(string iSnCode, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3,out string oID4,out string oID5, out string oErrMessage)
+        public bool GetMEIOrNetCodeRange(string iSnCode, string iIMEI1, string iNetCode, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrMessage)
         {
             oIMEI1 = "";
             oIMEI2 = "";
@@ -247,7 +247,7 @@ namespace UAS_MesInterface
         /// <param name="oID5"></param>
         /// <param name="oErrorMessage"></param>
         /// <returns></returns>
-        public bool GetMobileAllInfo(string iSnCode, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCode3, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3,out string oID4,out string oID5, out string oErrorMessage)
+        public bool GetMobileAllInfo(string iSnCode, out string oWIFI, out string oBT, out string oCode1, out string oCode2, out string oCode3, out string oIMEI1, out string oIMEI2, out string oIMEI3, out string oMEID, out string oNetCode, out string oPSN, out string oID1, out string oID2, out string oID3, out string oID4, out string oID5, out string oErrorMessage)
         {
             oBT = "";
             oMEID = "";
@@ -383,15 +383,22 @@ namespace UAS_MesInterface
                     return false;
             }
 
-            if (StepCode == CurrentStep)
-            {
-                InsertMakeProcess(iSN, iMakeCode, iSourceCode, iMPKind, iResult, iUserCode);
-                return true;
-            }
-            else
+            if (StepCode == CurrentStep && iResult == "OK")
             {
-                return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
+                DataTable dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_craftcode", "ms_prodcode" }, "ms_sncode='" + iSN + "'");
+                if (dt.Rows.Count > 0)
+                {
+                    string ms_status = dt.Rows[0]["ms_status"].ToString();
+                    string ms_craftcode = dt.Rows[0]["ms_craftcode"].ToString();
+                    string ms_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
+                    if (ms_status == "3")
+                    {
+                        string nextstepcode = dh.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").ToString();
+                        dh.UpdateByCondition("makeserial", "ms_status=1,ms_nextstepcode='"+ nextstepcode + "'", "ms_sncode='" + iSN + "'");
+                    }
+                }
             }
+            return CS_SetFinish(iMakeCode, iSourceCode, iSN, iUserCode, iResult, out oErrorMessage);
         }
 
         /// <summary>
@@ -408,7 +415,7 @@ namespace UAS_MesInterface
         public bool SetMobileData(string iSN, string iSourceCode, string iMPKind, string iResult, string iErrCode, out string oErrorMessage)
         {
             string omakecode = "";
-            GetRcardMOInfo(iSN,out omakecode,out oErrorMessage);
+            GetRcardMOInfo(iSN, out omakecode, out oErrorMessage);
             return SetStepFinish(omakecode, iSourceCode, iSN, iMPKind, iResult, "", iErrCode, out oErrorMessage);
         }
 
@@ -453,7 +460,7 @@ namespace UAS_MesInterface
             sql.Append(":std_class,:std_subclass1,:std_subclass2,:std_subclass3,:std_maxvalue,:std_minvalue,:std_actualvalue,:std_value1,");
             sql.Append(":std_value2,:std_value3,:std_testresult,sysdate)");
             dh.ExecuteSql(sql.ToString(), "select", iSN, omakeCode, iClass, iSubClass1, iSubClass2, iSubClass3, iMaxValue, iMinValue, iActualValue, iValue1, iValue2, iValue3, iTestResult);
-            return true;    
+            return true;
         }
 
         /// <summary>