导入号段的工单不能直接良品过站

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -208,7 +208,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        if (oMakeCode == ""||(oMakeCode != "" && oMakeCode != ma_code.Text))
+                        if (oMakeCode == "" || (oMakeCode != "" && oMakeCode == ma_code.Text))
                         {
                             oMakeCode = ma_code.Text;
                         }
@@ -241,17 +241,33 @@ namespace UAS_MES.Make
                                 LockMakeCode.Checked = true;
                             }
                         }
-                        dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
+                        dt = (DataTable)dh.ExecuteSql("select ms_nextstepcode,ms_craftcode,ms_prodcode,ms_sncode,ms_reworkstatus,nvl(ms_ifrework,0)ms_ifrework,ms_stepcode,ms_status,nvl(st_ifrepair,0) st_ifrepair from makeserial left join step on ms_stepcode=st_code where ms_id='" + oMSID + "'", "select");
                         string status = dt.Rows[0]["ms_status"].ToString();
                         reworkstatus = dt.Rows[0]["ms_reworkstatus"].ToString();
                         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)
                         {