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

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -229,6 +229,7 @@ namespace UAS_MES.Make
                 bg_name.Text = BadInf_1[mb_id]["bg_name"];
                 bg_code.Text = BadInf_1[mb_id]["mb_bgcode"];
                 mb_badremark.Text = BadInf_1[mb_id]["mb_badremark"];
+                mbr_id = "";
             }
             if (e.Node.Level == 1)
             {
@@ -358,6 +359,15 @@ namespace UAS_MES.Make
                 OperatResult.AppendText(">>" + ErrorMessage + "未维护不良原因\n", Color.Red);
                 return;
             }
+            //如果岗位资源对应工序的版面不为空的时候
+            if (dh.getFieldDataByCondition("makeserial left join step on ms_stepcode=st_code", "st_table", "ms_sncode='" + GetSNCode.Text + "'").ToString() != "")
+            {
+                if (!dh.CheckExist("makebadrsloc", "mbl_mbrid='" + mbr_id + "' and mbl_sncode='" + GetSNCode.Text + "' "))
+                {
+                    OperatResult.AppendText(">>工序存在版面必须维护不良位置\n", Color.Red);
+                    return;
+                }
+            }
             dt = (DataTable)dh.ExecuteSql("select cr_id from craft where cr_statuscode='AUDITED' and cr_code='" + cr_code.Text + "'", "select");
             if (dt.Rows.Count == 0)
                 OperatResult.AppendText(">>回流工序不存在\n", Color.Red);

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1358,7 +1358,7 @@ namespace UAS_MES.PublicMethod
             switch (iRule)
             {
                 case "TSN":
-                    dt = (DataTable)dh.ExecuteSql("select ms_id,ms_prodcode,ms_nextmacode,ms_salecode,ms_downstatus from makeserial where ms_sncode='" + iSN + "' order by ms_id desc", "select");
+                    dt = (DataTable)dh.ExecuteSql("select ms_id,ms_prodcode,ms_nextmacode,ms_salecode,ms_downstatus from makeserial where ms_sncode='" + iSN + "' and ms_status=2 order by ms_id desc", "select");
                     if (dt.Rows.Count > 0)
                     {
                         if (dt.Rows[0]["ms_downstatus"].ToString() != "0")