callm 2 дней назад
Родитель
Сommit
b68dc84c24
1 измененных файлов с 8 добавлено и 1 удалено
  1. 8 1
      UAS_MES_JWS/FunctionCode/Special/Special_CancelOQC.cs

+ 8 - 1
UAS_MES_JWS/FunctionCode/Special/Special_CancelOQC.cs

@@ -238,12 +238,19 @@ namespace UAS_MES_NEW.Special
         {
             if (NG.Checked)
             {
-                DataTable dt = (DataTable)dh.ExecuteSql("select ms_sncode,ms_makecode,ms_id,ma_prodcode,pr_detail from makeserial left join make on ms_makecode=ma_code left join product on pr_code=ma_prodcode where ms_sncode='" + SN.Text + "' or  ms_imei1='" + SN.Text + "' or ms_imei2='" + SN.Text + "' order by ms_id desc", "select");
+                DataTable dt = (DataTable)dh.ExecuteSql("select nvl(ms_iftest,0)ms_iftest,ms_sncode,ms_makecode,ms_id,ma_prodcode,pr_detail from makeserial left join make on ms_makecode=ma_code left join product on pr_code=ma_prodcode where ms_sncode='" + SN.Text + "' or  ms_imei1='" + SN.Text + "' or ms_imei2='" + SN.Text + "' order by ms_id desc", "select");
                 if (dt.Rows.Count == 0)
                 {
                     OperateResult.AppendText("序列号" + SN.Text + "不存在", System.Drawing.Color.Red);
                     return;
                 }
+                string ms_iftest = dt.Rows[0]["ms_iftest"].ToString();
+                if (ms_iftest == "-1")
+                {
+                    OperateResult.AppendText("序列号" + SN.Text + "已抽检", System.Drawing.Color.Red);
+                    return;
+                }
+
                 BaseUtil.SetFormValue(this.Controls, dt);
                 string ms_id = dt.Rows[0]["ms_id"].ToString();
                 int RejectCount = ChoosedRejectList.Items.Count;