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

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -321,7 +321,7 @@ namespace UAS_MES.Make
                     bool f = false;
                     for (int i = 0; i < pres.Length; i++)
                     {
-                        if (pres[i] == "" ? true : textbox.Text.StartsWith(pres[i]))
+                        if (pres[i] == "" ? true : code.Text.StartsWith(pres[i]))
                         {
                             //满足其中一条即可
                             f = true;

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -484,7 +484,7 @@ namespace UAS_MES.Make
                     bool f = false;
                     for (int i = 0; i < pres.Length; i++)
                     {
-                        if (pres[i] == "" ? true : textbox.Text.StartsWith(pres[i]))
+                        if (pres[i] == "" ? true : sncode.Text.StartsWith(pres[i]))
                         {
                             //满足其中一条即可
                             f = true;

UAS-MES/PublicMethod/LogicHandler.cs

@@ -294,7 +294,7 @@ namespace UAS_MES.PublicMethod
             //取MakeProcess表中的执行记录ID最大的一个工单的号码
             oMakeCode = "";
             oErrorMessage = "";
-            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id=(select max(ms_id) from makeserial where ms_sncode='" + iSnCode + "')").ToString();
+            oMakeCode = dh.getFieldDataByCondition("MakeSerial", "ms_makecode", "ms_id=(select max(ms_id) from makeserial where ms_sncode='" + iSnCode + "' and ms_status=1)").ToString();
             if (oMakeCode != "")
                 return true;
             else