Browse Source

回退更改,改在存储过程

章政 7 years ago
parent
commit
70d0ef59c3
1 changed files with 0 additions and 16 deletions
  1. 0 16
      UAS-MES/FunctionCode/Make/Make_TestCollection.cs

+ 0 - 16
UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -247,27 +247,11 @@ namespace UAS_MES.Make
                         string stepcode = dt.Rows[0]["ms_stepcode"].ToString();
                         string ifrepair = dt.Rows[0]["st_ifrepair"].ToString();
                         string sncode = dt.Rows[0]["ms_sncode"].ToString();
-                        string craftcode = dt.Rows[0]["ms_craftcode"].ToString();
-                        string prodcode = dt.Rows[0]["ms_prodcode"].ToString();
                         if (sncode != ms_sncode.Text)
                         {
                             OperateResult.AppendText(">>" + ms_sncode.Text + " 序列号已执行过转号,不允许使用TSN采集\n", Color.Red, ms_sncode);
                             return;
                         }
-                        //判断是否是序列号转换工序,如果有导入号段则不允许直接良品过站
-                        if (dh.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid", "cd_ifsnchange", "cr_code='" + craftcode + "' and cr_prodcode='" + prodcode + "' and cd_stepcode='" + User.CurrentStepCode + "'").ToString() != "0")
-                        {
-                            if (dh.getRowCount("Makeaddresslist", "mal_makecode='" + oMakeCode + "'") > 0)
-                            {
-                                OperateResult.AppendText(">>工单导入烧写信息,不允许直接良品过站\n", Color.Red, ms_sncode);
-                                return;
-                            }
-                            if (dh.getRowCount("makeimeilist", "mil_makecode='" + oMakeCode + "'") > 0)
-                            {
-                                OperateResult.AppendText(">>工单导入烧写信息,不允许直接良品过站\n", Color.Red, ms_sncode);
-                                return;
-                            }
-                        }
                         ifrework = dt.Rows[0]["ms_ifrework"].ToString();
                         if (GoodProduct.Checked)
                         {