近期万利达反馈CS端修改提交

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -123,7 +123,7 @@ namespace UAS_MES.Make
                     }
                     OperateResult.AppendText(">>" + sncode.Text + "\n", Color.Black);
                     sql.Clear();
-                    sql.Append("select max(ms_id) ms_id from makeserial where ms_beforesn = '" + sncode.Text + "'");
+                    sql.Append("select max(ms_id) ms_id from makeserial where ms_code = '" + sncode.Text + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows[0][0].ToString() != "")
                     {

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -196,7 +196,7 @@ namespace UAS_MES.Make
                     dt = (DataTable)dh.ExecuteSql("select ms_status,ms_id,ms_makecode,ms_nextstepcode,ms_craftcode,ms_prodcode,nvl(ms_checkpack,0) ms_checkpack from makeserial where ms_sncode ='" + sn_code.Text + "' order by ms_id desc", "select");
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage) || (dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                     {
-                        if (oMsID == "" || oMsID == "null" || oMsID == "0")
+                        if (oMsID == "" || oMsID == "null" || oMsID == "0"|| (dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                         {
                             oMsID = dt.Rows[0]["ms_id"].ToString();
                             oMsStatus = dt.Rows[0]["ms_status"].ToString();

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -267,7 +267,7 @@ namespace UAS_MES.Make
                     dt = (DataTable)dh.ExecuteSql("select ms_status,ms_id,ms_makecode,ms_craftcode,ms_prodcode,nvl(ms_checkpack,0) ms_checkpack from makeserial where ms_sncode ='" + sn_code.Text + "'  order by ms_id desc", "select");
                     if (LogicHandler.CheckStepSNAndMacode("", User.UserSourceCode, sn_code.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage) || (dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                     {
-                        if (oMsID == "" || oMsID == "null" || oMsID == "0")
+                        if (oMsID == "" || oMsID == "null" || oMsID == "0"||(dt.Rows.Count > 0 && dt.Rows[0]["ms_status"].ToString() == "2"))
                         {
                             oMsID = dt.Rows[0]["ms_id"].ToString();
                             oMsStatus = dt.Rows[0]["ms_status"].ToString();

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -556,7 +556,7 @@ namespace UAS_MES.Make
                             soncode = soncode.Replace(LoadSoncode.Rows[i][0].ToString(), "");
                         }
                     }
-                    OperatResult.AppendText(">>" + soncode.Replace("'", "") + "物料尚未备料，不允许回流\n", Color.Red);
+                    OperatResult.AppendText(">>物料" + soncode.Replace("'", "") + "尚未上料，不允许回流\n", Color.Red);
                     return;
                 }
             }