Merge branch 'master' of ssh://10.10.100.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -109,9 +109,9 @@ namespace UAS_MES.Make
             sncode_1 = sncode;
             sql.Clear();
             sql.Append("select cm_craftcode,cm_spid,cm_craftname,cm_firstsn,cm_makecode,cm_stepcode,cm_stepname,cm_maprodcode,cm_fsoncode,cm_wccode,cm_maid,cm_soncode,pr_detail,cm_materialtype,");
-            sql.Append("max(cm_status) cm_status,max(cm_id) cm_id from craftmaterial left join product on pr_code=cm_soncode where(cm_sncode  in (select firstsn from makesnrelation where sn ");
-            sql.Append(" ='" + sncode_1 + "'union all select sn from makesnrelation where firstsn = '" + sncode_1 + "')");
-            sql.Append("or cm_sncode = '" + sncode_1 + "') group by cm_craftcode,cm_firstsn,cm_stepcode,cm_stepname,cm_spid,cm_makecode,cm_maprodcode,cm_maid,cm_soncode,cm_wccode,pr_detail,cm_materialtype,cm_craftname,cm_fsoncode ORDER BY cm_status DESC");
+            sql.Append("max(cm_status) cm_status,max(cm_id) cm_id from craftmaterial left join product on pr_code=cm_soncode where(cm_sncode  in (select '" + sncode_1 + "' from dual union select firstsn from makesnrelation where sn ");
+            sql.Append(" ='" + sncode_1 + "'union  select sn from makesnrelation where firstsn = '" + sncode_1 + "')");
+            sql.Append(") group by cm_craftcode,cm_firstsn,cm_stepcode,cm_stepname,cm_spid,cm_makecode,cm_maprodcode,cm_maid,cm_soncode,cm_wccode,pr_detail,cm_materialtype,cm_craftname,cm_fsoncode ORDER BY cm_status DESC");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -426,7 +426,7 @@ namespace UAS_MES.OQC
             if (wait.Rows.Count > 0)
             {
                 for (int i = 0; i < wait.Rows.Count; i++)
-                {
+                {                   
                     if (!Chooseed.Contains(wait.Rows[i]["bc_code"].ToString()))
                     {
                         DataRow dr1 = choose.NewRow();
@@ -436,6 +436,10 @@ namespace UAS_MES.OQC
                         choose.Rows.Add(dr1);
                     }
                 }
+                for (int i = 0; i < WaitChooseDGV.Rows.Count; i++)
+                {
+                    ((DataTable)WaitChooseDGV.DataSource).Rows[i]["ChooseAll"] = 0;
+                }
             }
             else OperateResult.AppendText(">>请勾选不良明细\n", Color.Red);
         }