客户抽检规则修改

UAS_MES_YDCY/FunctionCode/OQC/OQC_PlanMaintain_Cust.cs

@@ -110,9 +110,9 @@ namespace UAS_MES_NEW.OQC
                         if (ms_ifqccheck == "-2")
                         {
                             pr_code.Text = dt.Rows[0]["pcd_custqualmethod"].ToString();
+                            pcd_okretuenstep = dt.Rows[0]["pcd_okretuenstep"].ToString();
+                            pcd_ngretuenstep = dt.Rows[0]["pcd_ngretuenstep"].ToString();
                         }
-                        pcd_okretuenstep = dt.Rows[0]["pcd_okretuenstep"].ToString();
-                        pcd_ngretuenstep = dt.Rows[0]["pcd_ngretuenstep"].ToString();
                     }
                 }
                 else
@@ -127,19 +127,33 @@ namespace UAS_MES_NEW.OQC
         {
             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,pr_detail,pr_spec,ms_stepcode,ms_prodcode,PR_QUALMETHOD from makeserial left join product on pr_code=ms_prodcode where ms_id='" + oMSID + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
                     string ms_ifqccheck = dt.Rows[0]["MS_IFQCCHECK"].ToString();
+                    ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
                     ms_prodcode.Text = dt.Rows[0]["ms_prodcode"].ToString();
                     pr_detail.Text = dt.Rows[0]["pr_detail"].ToString();
-                    //pr_code.Text = dt.Rows[0]["PR_QUALMETHOD"].ToString();
                     if (ms_ifqccheck == "0")
                     {
                         OperateResult.AppendText(">>非QC抽检序列号，不允许采集\n", Color.Red);
                         return;
                     }
                 }
+                dt = (DataTable)dh.ExecuteSql("select pcd_qualmethod,pcd_custqualmethod,pcd_okretuenstep,pcd_ngretuenstep  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)
+                {
+                    if (ms_ifqccheck == "-1")
+                    {
+                        pr_code.Text = dt.Rows[0]["pcd_qualmethod"].ToString();
+                    }
+                    if (ms_ifqccheck == "-2")
+                    {
+                        pr_code.Text = dt.Rows[0]["pcd_custqualmethod"].ToString();
+                        pcd_okretuenstep = dt.Rows[0]["pcd_okretuenstep"].ToString();
+                        pcd_ngretuenstep = dt.Rows[0]["pcd_ngretuenstep"].ToString();
+                    }
+                }
             }
             else
             {
@@ -150,7 +164,6 @@ namespace UAS_MES_NEW.OQC
             List<string> ois_ifng_insert = new List<string>();
             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")
                 {
                     oi_itemcode_insert.Add(CheckTypeDGV.Rows[i].Cells["pd_itemname"].Value.ToString());
@@ -204,13 +217,13 @@ namespace UAS_MES_NEW.OQC
                 dh.BatchInsert(sql.GetString(), new string[] { "ois_itemcode", "ois_ifng", "ois_itemcode" },
                     oi_itemcode_insert.ToArray(), ois_ifng_insert.ToArray(), oi_itemcode_insert.ToArray());
                 dh.ExecuteSql("update makeserial set MS_IFQCCHECK=0,ms_status=3,ms_nextstepcode='' where ms_id='" + oMSID + "'", "select");
-                OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);
+           
 
                 dh.ExecuteSql("insert into makebad(MB_ID, MB_MAKECODE, MB_MSCODE, MB_SNCODE, MB_INMAN, MB_INDATE, MB_STEPCODE, MB_SOURCECODE, MB_BADCODE, MB_BGCODE, " +
                     "MB_BADNAME, MB_BGNAME, MB_YMD, MB_LINECODE, MB_TYPE, MB_RETURNSTEP)values(makebad_seq.nextval,'" + oMakeCode + "','" + ms_sncode.Text + "','" + ms_sncode.Text + "'," +
                     "'" + User.UserCode + "',sysdate,'" + ms_stepcode + "','" + User.UserSourceCode + "','CustError','CustError','客户抽检不良','客户抽检不良'," +
                     "to_char(sysdate,'yyyymmdd'),'" + User.UserLineCode + "','Client','" + pcd_ngretuenstep + "')", "insert");
-
+                OperateResult.AppendText(">>" + ms_sncode.Text + "不良品采集成功\n", Color.Green, ms_sncode);
                 LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "采集不良品", "采集不良品成功", ms_sncode.Text, "");
                 //}
                 //else