|
@@ -77,9 +77,11 @@ namespace UAS_MES_NEW.OQC
|
|
|
{
|
|
{
|
|
|
if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
|
|
if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
|
|
|
{
|
|
{
|
|
|
- DataTable dt = (DataTable)dh.ExecuteSql("select nvl(MS_IFQCCHECK,0)MS_IFQCCHECK,pr_detail,pr_spec,ms_prodcode,PR_QUALMETHOD from makeserial left join product on pr_code=ms_prodcode where ms_id='" + oMSID + "'", "select");
|
|
|
|
|
|
|
+ DataTable dt = (DataTable)dh.ExecuteSql("select nvl(MS_IFQCCHECK,0)MS_IFQCCHECK,ms_stepcode,pr_detail,pr_spec,ms_prodcode,PR_QUALMETHOD from makeserial left join product on pr_code=ms_prodcode where ms_id='" + oMSID + "'", "select");
|
|
|
|
|
+ string ms_stepcode = "";
|
|
|
if (dt.Rows.Count > 0)
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
{
|
|
|
|
|
+ ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
|
|
|
string ms_ifqccheck = dt.Rows[0]["MS_IFQCCHECK"].ToString();
|
|
string ms_ifqccheck = dt.Rows[0]["MS_IFQCCHECK"].ToString();
|
|
|
ms_prodcode.Text = dt.Rows[0]["ms_prodcode"].ToString();
|
|
ms_prodcode.Text = dt.Rows[0]["ms_prodcode"].ToString();
|
|
|
pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
|
|
pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
|
|
@@ -90,6 +92,11 @@ namespace UAS_MES_NEW.OQC
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select pcd_qualmethod from productcheckrate left join PRODUCTCHECKRATEDETAIL on pcd_pcrid=pcr_id where pcr_prodcode='" + ms_prodcode.Text + "' and pcd_stepcode='" + ms_stepcode + "'", "select");
|
|
|
|
|
+ if (dt.Rows.Count > 0)
|
|
|
|
|
+ {
|
|
|
|
|
+ pr_code.Text = dt.Rows[0]["pcd_qualmethod"].ToString();
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
|
{
|
|
{
|
|
@@ -109,7 +116,7 @@ namespace UAS_MES_NEW.OQC
|
|
|
string ms_ifqccheck = dt.Rows[0]["MS_IFQCCHECK"].ToString();
|
|
string ms_ifqccheck = dt.Rows[0]["MS_IFQCCHECK"].ToString();
|
|
|
ms_prodcode.Text = dt.Rows[0]["ms_prodcode"].ToString();
|
|
ms_prodcode.Text = dt.Rows[0]["ms_prodcode"].ToString();
|
|
|
pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
|
|
pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
|
|
|
- pr_code.Text = dt.Rows[0]["PR_QUALMETHOD"].ToString();
|
|
|
|
|
|
|
+ //pr_code.Text = dt.Rows[0]["PR_QUALMETHOD"].ToString();
|
|
|
if (ms_ifqccheck == "0")
|
|
if (ms_ifqccheck == "0")
|
|
|
{
|
|
{
|
|
|
OperateResult.AppendText(">>非QC抽检序列号,不允许采集\n", Color.Red);
|
|
OperateResult.AppendText(">>非QC抽检序列号,不允许采集\n", Color.Red);
|
|
@@ -125,6 +132,7 @@ namespace UAS_MES_NEW.OQC
|
|
|
List<string> ois_ifng_insert = new List<string>();
|
|
List<string> ois_ifng_insert = new List<string>();
|
|
|
for (int i = 0; i < CheckTypeDGV.Rows.Count; i++)
|
|
for (int i = 0; i < CheckTypeDGV.Rows.Count; i++)
|
|
|
{
|
|
{
|
|
|
|
|
+ Console.WriteLine(CheckTypeDGV.Rows[i].Cells["Choose"].FormattedValue);
|
|
|
if (CheckTypeDGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
|
|
if (CheckTypeDGV.Rows[i].Cells["Choose"].FormattedValue.ToString() == "True")
|
|
|
{
|
|
{
|
|
|
oi_itemcode_insert.Add(CheckTypeDGV.Rows[i].Cells["pd_itemname"].Value.ToString());
|
|
oi_itemcode_insert.Add(CheckTypeDGV.Rows[i].Cells["pd_itemname"].Value.ToString());
|