修改抽样数据采集界面，修复BUG

UAS-MES/DataOperate/DataHelper.cs

@@ -57,6 +57,7 @@ namespace UAS_MES.DataOperate
         {
             DataTable dt = new DataTable();
             string sql = "select " + Field + " from " + TableName + " where " + Condition;
+            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter();
@@ -99,6 +100,7 @@ namespace UAS_MES.DataOperate
                 {
                     command.Parameters.Add("Param" + i, OracleDbType.Varchar2, Parameters[i], ParameterDirection.Input);
                 }
+
                 OracleDataAdapter ad = new OracleDataAdapter(command);
                 DataTable dt = new DataTable();
                 ad.Fill(dt);
@@ -117,6 +119,7 @@ namespace UAS_MES.DataOperate
         {
             DataTable dt = new DataTable();
             string sql = "select count(1) from " + TableName + " where " + Condition;
+            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
@@ -138,6 +141,7 @@ namespace UAS_MES.DataOperate
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
+            Console.WriteLine(sql);
             ad.Fill(dt);
             ad.Dispose();
             command.Dispose();
@@ -153,6 +157,7 @@ namespace UAS_MES.DataOperate
             string sql = "select ";
             sql += AddField(Fields);
             sql += " from " + TableName + " where " + Condition + " and rownum=1";
+            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
@@ -162,6 +167,22 @@ namespace UAS_MES.DataOperate
             return dt;
         }
 
+        /// <summary>
+        /// 将DataTable导入到指定的表中
+        /// </summary>
+        /// <param name="DataTable"></param>
+        /// <param name="TableName"></param>
+        public void InsertDataTable(DataTable DataTable, string TableName)
+        {
+            for (int i = 0; i < DataTable.Rows.Count; i++)
+            {
+                for (int j = 0; j < DataTable.Columns.Count; j++)
+                {
+
+                }
+            }
+        }
+
         /// <summary>
         /// 按分页获取数据
         /// </summary>
@@ -190,6 +211,7 @@ namespace UAS_MES.DataOperate
                 else
                     sql.Append(" from " + TableName + ") A where ROWNUM <= " + CurrentPage * PageSize + ") where RN> " + (CurrentPage - 1) * PageSize);
             }
+            Console.WriteLine(sql.ToString());
             command = new OracleCommand(sql.ToString(), connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
@@ -214,6 +236,7 @@ namespace UAS_MES.DataOperate
             string sql = "select ";
             sql += AddField(Fields);
             sql += " from " + TableName + " where " + Condition;
+            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
@@ -542,6 +565,7 @@ namespace UAS_MES.DataOperate
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
             DataTable dt = new DataTable();
+            Console.WriteLine(sql);
             ad.Fill(dt);
             ad.Dispose();
             command.Dispose();
@@ -585,6 +609,7 @@ namespace UAS_MES.DataOperate
                 for (int i = 0; i < addpar.Length; i++)
                     command.Parameters.Add(new OracleParameter(addpar[i].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
             }
+            Console.WriteLine(SQL);
             switch (Type.ToUpper())
             {
                 case "SELECT":
@@ -638,6 +663,7 @@ namespace UAS_MES.DataOperate
         {
             DataTable dt = new DataTable();
             string sql = "select distinct count('" + Field + "') from " + TableName;
+            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             OracleDataAdapter ad = new OracleDataAdapter(command);
@@ -668,6 +694,7 @@ namespace UAS_MES.DataOperate
         public void DeleteDataByID(string TableName, string ID, string[] DeleteID)
         {
             string sql = "delete from " + TableName + " where " + ID + " =:DeleteID";
+            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             command.ArrayBindCount = DeleteID.Length;
@@ -688,6 +715,23 @@ namespace UAS_MES.DataOperate
             return dt.Rows[0][0].ToString();
         }
 
+        /// <summary>
+        /// 通过序列的名称获取序列
+        /// </summary>
+        /// <param name="SeqName"></param>
+        /// <returns></returns>
+        public string[] GetSEQ(string SeqName, int Num)
+        {
+            DataTable dt = new DataTable();
+            dt = (DataTable)ExecuteSql("select " + SeqName + ".nextval from (select 1 from OQCITEMSAMPLES where rownum<" + (Num + 1) + ")", "select");
+            string[] SerialNum = new string[dt.Rows.Count];
+            for (int i = 0; i < dt.Rows.Count; i++)
+            {
+                SerialNum[i] = dt.Rows[i][0].ToString();
+            }
+            return SerialNum;
+        }
+
         public void SaveDataTable(DataTable dt, string TableName, string ID, params string[] sql)
         {
             if (dt == null)
@@ -797,6 +841,7 @@ namespace UAS_MES.DataOperate
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             command.ArrayBindCount = names[1].Length;
+            Console.WriteLine(sql);
             //因为第一个数组保存的是参数的名称，所以循环从1而不是0开始
             //将第一个数组的下标固定为0作为循环添加的参数的名称
             for (int i = 1; i <= names[0].Length; i++)
@@ -907,6 +952,7 @@ namespace UAS_MES.DataOperate
         public string UpdateByCondition(string TableName, string update, string condition)
         {
             string sql = "update " + TableName + " set " + update + " where " + condition;
+            Console.WriteLine(sql);
             command = new OracleCommand(sql, connection);
             Reconnect(command);
             command.ExecuteNonQuery();
@@ -950,6 +996,7 @@ namespace UAS_MES.DataOperate
                 {
                     if (!String.IsNullOrEmpty(sql))
                     {
+                        Console.WriteLine(sql);
                         command.CommandText = sql;
                         command.ExecuteNonQuery();
                     }
@@ -1040,6 +1087,7 @@ namespace UAS_MES.DataOperate
                 //新建一个char类型的数组用来存储每个字节的变量
                 char[] c = par[i + 1].ToCharArray();
                 addpar[i] = new StringBuilder();
+
                 for (int j = 0; j < c.Length; j++)
                 {
                     if (c[j] != ' ' && c[j] != ',' && c[j] != ')')

UAS-MES/Entity/SystemInf.cs

@@ -44,5 +44,9 @@ namespace UAS_MES.Entity
         /// 导航宽度
         /// </summary>
         public static int NavWidth = 0;
+        /// <summary>
+        /// HeadBar的高度
+        /// </summary>
+        public static int HeadBarHeight = 0;
     }
 }

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -302,6 +302,7 @@ namespace UAS_MES.Make
                     {
                         dh.UpdateByCondition("makeserial", "ms_status=4,ms_nextstepcode='',ms_stepcode='" + User.CurrentStepCode + "'", "ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + macode + "'");
                         dh.UpdateByCondition("make", "MA_NGMADEQTY=nvl(MA_NGMADEQTY,0)+1", "ma_code='" + macode + "'");
+                        LogicHandler.InsertMakeProcess(ms_sncode.Text,ms_makecode.Text,User.UserSourceCode,"报废","序列号报废",User.UserCode);
                         OperatResult.AppendText(">>报废成功\n", Color.Green);
                         GetSNCode.Clear();
                         BaseUtil.CleanForm(this);

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -232,7 +232,7 @@ namespace UAS_MES.OQC
         private void ob_projectcode_UserControlTextChanged(object sender, EventArgs e)
         {
             sql.Clear();
-            sql.Append("select nvl(max(oi_id),0)oi_id, ci_kind,max(oi_sampleqty) from QUA_PROJECT left join ");
+            sql.Append("select nvl(max(oi_id),0)oi_id, ci_kind,nvl(max(oi_sampleqty),0) oi_sampleqty from QUA_PROJECT left join ");
             sql.Append(" QUA_ProjectDetail on pd_prid=pr_id  left join QUA_CheckItem on pd_ciid=ci_id ");
             sql.Append("left join OQCITEMS on oi_checkno ='" + ob_checkno.Text + "' and oi_projectcode='" + ob_projectcode.Text + "' ");
             sql.Append("and oi_projectcode = pr_code and oi_checkkind = ci_kind where  pr_code='" + ob_projectcode.Text + "'  group by ci_kind");

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.Designer.cs

@@ -29,7 +29,7 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OQC_SamplingDataCollection));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.ob_checkno_label = new System.Windows.Forms.Label();
             this.obd_outboxcode_label = new System.Windows.Forms.Label();
             this.ms_sncode_label = new System.Windows.Forms.Label();
@@ -55,23 +55,28 @@
             this.ob_prodcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_makecode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ChoosedDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
-            this.WaitChooseDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
-            this.Column3 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.bg_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bg_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.or_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.WaitChooseDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
+            this.ChooseAll = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.bc_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bc_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.CheckTypeDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewExpand();
+            this.CheckTypeDGV = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
             this.choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.oi_itemcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.oi_ng = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.oi_leveldefect = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oi_checkkind = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oi_sampleqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oi_checkqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.oi_ng = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.oi_leveldefect = new System.Windows.Forms.DataGridViewComboBoxColumn();
             this.ois_remark = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ois_status = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ois_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ChooseedReject = new UAS_MES.CustomControl.ButtonUtil.ArrowRightButton();
             this.WaitReject = new UAS_MES.CustomControl.ButtonUtil.ArrowLeftButton();
-            this.oi_checkqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.oi_checkqty1 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_okqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_ngqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_nowcheckqty = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -87,9 +92,7 @@
             this.obd_outboxcode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ob_makecode_dgv = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.obd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.or_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_code1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bc_name1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.BadGroupCode = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -440,14 +443,37 @@
             this.ChoosedDGV.Size = new System.Drawing.Size(325, 321);
             this.ChoosedDGV.TabIndex = 205;
             // 
+            // or_id
+            // 
+            this.or_id.DataPropertyName = "or_id";
+            this.or_id.HeaderText = "or_id";
+            this.or_id.Name = "or_id";
+            this.or_id.Visible = false;
+            // 
+            // bc_code1
+            // 
+            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.bc_code1.DataPropertyName = "bc_code";
+            this.bc_code1.HeaderText = "不良代码";
+            this.bc_code1.Name = "bc_code1";
+            this.bc_code1.ReadOnly = true;
+            // 
+            // bc_name1
+            // 
+            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.bc_name1.DataPropertyName = "bc_name";
+            this.bc_name1.HeaderText = "不良名称 ";
+            this.bc_name1.Name = "bc_name1";
+            this.bc_name1.ReadOnly = true;
+            // 
             // WaitChooseDGV
             // 
             this.WaitChooseDGV.AllowUserToAddRows = false;
             this.WaitChooseDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.WaitChooseDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.Column3,
-            this.bg_code,
-            this.bg_name});
+            this.ChooseAll,
+            this.bc_code,
+            this.bc_name});
             this.WaitChooseDGV.Location = new System.Drawing.Point(629, 255);
             this.WaitChooseDGV.Margin = new System.Windows.Forms.Padding(4);
             this.WaitChooseDGV.Name = "WaitChooseDGV";
@@ -456,33 +482,30 @@
             this.WaitChooseDGV.Size = new System.Drawing.Size(357, 320);
             this.WaitChooseDGV.TabIndex = 204;
             this.WaitChooseDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.WaitChooseDGV_CellContentClick);
-            this.WaitChooseDGV.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.WaitChooseDGV_CellValueChanged);
             this.WaitChooseDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.WaitChooseDGV_DataError);
-            this.WaitChooseDGV.RowHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.WaitChooseDGV_RowHeaderMouseClick);
             // 
-            // Column3
+            // ChooseAll
             // 
-            this.Column3.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Column3.HeaderText = "勾选";
-            this.Column3.Name = "Column3";
-            this.Column3.Resizable = System.Windows.Forms.DataGridViewTriState.False;
-            this.Column3.Width = 60;
+            this.ChooseAll.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.ChooseAll.DataPropertyName = "ChooseAll";
+            this.ChooseAll.HeaderText = "勾选";
+            this.ChooseAll.Name = "ChooseAll";
+            this.ChooseAll.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ChooseAll.Width = 60;
             // 
-            // bg_code
+            // bc_code
             // 
-            this.bg_code.DataPropertyName = "bg_code";
-            this.bg_code.HeaderText = "不良分组";
-            this.bg_code.Name = "bg_code";
-            this.bg_code.ReadOnly = true;
-            this.bg_code.Width = 93;
+            this.bc_code.DataPropertyName = "bc_code";
+            this.bc_code.HeaderText = "不良分组";
+            this.bc_code.Name = "bc_code";
+            this.bc_code.ReadOnly = true;
             // 
-            // bg_name
+            // bc_name
             // 
-            this.bg_name.DataPropertyName = "bg_name";
-            this.bg_name.HeaderText = "分组名称";
-            this.bg_name.Name = "bg_name";
-            this.bg_name.ReadOnly = true;
-            this.bg_name.Width = 93;
+            this.bc_name.DataPropertyName = "bc_name";
+            this.bc_name.HeaderText = "分组名称";
+            this.bc_name.Name = "bc_name";
+            this.bc_name.ReadOnly = true;
             // 
             // ob_remark
             // 
@@ -524,22 +547,23 @@
             this.CheckTypeDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.choose,
             this.oi_itemcode,
+            this.oi_checkkind,
+            this.oi_sampleqty,
+            this.oi_checkqty,
             this.oi_ng,
             this.oi_leveldefect,
             this.ois_remark,
-            this.ois_status,
-            this.ois_id});
-            this.CheckTypeDGV.Location = new System.Drawing.Point(21, 210);
+            this.ois_status});
+            this.CheckTypeDGV.Location = new System.Drawing.Point(22, 214);
             this.CheckTypeDGV.Margin = new System.Windows.Forms.Padding(4);
             this.CheckTypeDGV.Name = "CheckTypeDGV";
             this.CheckTypeDGV.RowHeadersWidth = 20;
             this.CheckTypeDGV.RowTemplate.Height = 23;
-            this.CheckTypeDGV.Size = new System.Drawing.Size(589, 406);
+            this.CheckTypeDGV.Size = new System.Drawing.Size(589, 415);
             this.CheckTypeDGV.TabIndex = 198;
             this.CheckTypeDGV.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckTypeDGV_CellContentClick);
             this.CheckTypeDGV.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.CheckTypeDGV_CellValueChanged);
             this.CheckTypeDGV.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.CheckTypeDGV_DataError);
-            this.CheckTypeDGV.RowHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.CheckTypeDGV_RowHeaderMouseClick);
             // 
             // choose
             // 
@@ -553,50 +577,67 @@
             // oi_itemcode
             // 
             this.oi_itemcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.oi_itemcode.DataPropertyName = "oi_checkkind";
-            this.oi_itemcode.HeaderText = "检验类型";
+            this.oi_itemcode.DataPropertyName = "oi_itemcode";
+            this.oi_itemcode.HeaderText = "项目编号";
             this.oi_itemcode.Name = "oi_itemcode";
             // 
+            // oi_checkkind
+            // 
+            this.oi_checkkind.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.oi_checkkind.DataPropertyName = "oi_checkkind";
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.oi_checkkind.DefaultCellStyle = dataGridViewCellStyle2;
+            this.oi_checkkind.HeaderText = "项目名称";
+            this.oi_checkkind.Name = "oi_checkkind";
+            this.oi_checkkind.Width = 96;
+            // 
+            // oi_sampleqty
+            // 
+            this.oi_sampleqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.oi_sampleqty.DataPropertyName = "oi_sampleqty";
+            this.oi_sampleqty.HeaderText = "样本数";
+            this.oi_sampleqty.Name = "oi_sampleqty";
+            this.oi_sampleqty.Width = 96;
+            // 
+            // oi_checkqty
+            // 
+            this.oi_checkqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+            this.oi_checkqty.DataPropertyName = "oi_checkqty";
+            this.oi_checkqty.HeaderText = "已检数";
+            this.oi_checkqty.Name = "oi_checkqty";
+            this.oi_checkqty.Width = 81;
+            // 
             // oi_ng
             // 
-            this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.oi_ng.DataPropertyName = "oi_count";
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.oi_ng.DefaultCellStyle = dataGridViewCellStyle1;
-            this.oi_ng.HeaderText = "样本数量";
+            this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.oi_ng.DataPropertyName = "oi_ng";
+            this.oi_ng.HeaderText = "是否通过";
             this.oi_ng.Name = "oi_ng";
-            this.oi_ng.Width = 96;
+            this.oi_ng.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.oi_ng.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
             // 
             // oi_leveldefect
             // 
             this.oi_leveldefect.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.oi_leveldefect.DataPropertyName = "oi_checkedcount";
-            this.oi_leveldefect.HeaderText = "已检数量";
+            this.oi_leveldefect.DataPropertyName = "oi_leveldefect";
+            this.oi_leveldefect.HeaderText = "缺陷等级";
             this.oi_leveldefect.Name = "oi_leveldefect";
-            this.oi_leveldefect.Width = 96;
+            this.oi_leveldefect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.oi_leveldefect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.oi_leveldefect.Width = 80;
             // 
             // ois_remark
             // 
-            this.ois_remark.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-            this.ois_remark.HeaderText = "";
+            this.ois_remark.DataPropertyName = "ois_remark";
+            this.ois_remark.HeaderText = "备注";
             this.ois_remark.Name = "ois_remark";
-            this.ois_remark.Width = 23;
             // 
             // ois_status
             // 
-            this.ois_status.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ois_status.HeaderText = "";
+            this.ois_status.DataPropertyName = "ois_status";
+            this.ois_status.HeaderText = "是否检验";
             this.ois_status.Name = "ois_status";
             // 
-            // ois_id
-            // 
-            this.ois_id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.ois_id.DataPropertyName = "ois_id";
-            this.ois_id.HeaderText = "";
-            this.ois_id.Name = "ois_id";
-            this.ois_id.Visible = false;
-            this.ois_id.Width = 80;
-            // 
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
@@ -619,22 +660,22 @@
             this.WaitReject.UseVisualStyleBackColor = true;
             this.WaitReject.Click += new System.EventHandler(this.WaitReject_Click);
             // 
-            // oi_checkqty
-            // 
-            this.oi_checkqty.AllPower = null;
-            this.oi_checkqty.BackColor = System.Drawing.Color.White;
-            this.oi_checkqty.Enabled = false;
-            this.oi_checkqty.ID = null;
-            this.oi_checkqty.Location = new System.Drawing.Point(1211, 91);
-            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(4);
-            this.oi_checkqty.Name = "oi_checkqty";
-            this.oi_checkqty.Power = null;
-            this.oi_checkqty.Size = new System.Drawing.Size(195, 25);
-            this.oi_checkqty.Str = null;
-            this.oi_checkqty.Str1 = null;
-            this.oi_checkqty.Str2 = null;
-            this.oi_checkqty.TabIndex = 190;
-            this.oi_checkqty.Tag = "NoAuto";
+            // oi_checkqty1
+            // 
+            this.oi_checkqty1.AllPower = null;
+            this.oi_checkqty1.BackColor = System.Drawing.Color.White;
+            this.oi_checkqty1.Enabled = false;
+            this.oi_checkqty1.ID = null;
+            this.oi_checkqty1.Location = new System.Drawing.Point(1211, 91);
+            this.oi_checkqty1.Margin = new System.Windows.Forms.Padding(4);
+            this.oi_checkqty1.Name = "oi_checkqty1";
+            this.oi_checkqty1.Power = null;
+            this.oi_checkqty1.Size = new System.Drawing.Size(195, 25);
+            this.oi_checkqty1.Str = null;
+            this.oi_checkqty1.Str1 = null;
+            this.oi_checkqty1.Str2 = null;
+            this.oi_checkqty1.TabIndex = 190;
+            this.oi_checkqty1.Tag = "oi_checkqty";
             // 
             // ob_okqty
             // 
@@ -733,7 +774,7 @@
             this.BatchPass.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
-            this.BatchPass.Location = new System.Drawing.Point(743, 119);
+            this.BatchPass.Location = new System.Drawing.Point(720, 119);
             this.BatchPass.Margin = new System.Windows.Forms.Padding(4);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
@@ -852,34 +893,21 @@
             this.obd_id.Name = "obd_id";
             this.obd_id.Visible = false;
             // 
-            // or_id
-            // 
-            this.or_id.DataPropertyName = "or_id";
-            this.or_id.HeaderText = "or_id";
-            this.or_id.Name = "or_id";
-            this.or_id.Visible = false;
-            // 
-            // bc_code1
-            // 
-            this.bc_code1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.bc_code1.DataPropertyName = "bg_code";
-            this.bc_code1.HeaderText = "不良代码";
-            this.bc_code1.Name = "bc_code1";
-            this.bc_code1.ReadOnly = true;
+            // BadGroupCode
             // 
-            // bc_name1
-            // 
-            this.bc_name1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.bc_name1.DataPropertyName = "bg_name";
-            this.bc_name1.HeaderText = "不良名称 ";
-            this.bc_name1.Name = "bc_name1";
-            this.bc_name1.ReadOnly = true;
+            this.BadGroupCode.FormattingEnabled = true;
+            this.BadGroupCode.Location = new System.Drawing.Point(720, 222);
+            this.BadGroupCode.Name = "BadGroupCode";
+            this.BadGroupCode.Size = new System.Drawing.Size(173, 23);
+            this.BadGroupCode.TabIndex = 219;
+            this.BadGroupCode.SelectedIndexChanged += new System.EventHandler(this.BadGroupCode_SelectedIndexChanged);
             // 
             // OQC_SamplingDataCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1420, 762);
+            this.Controls.Add(this.BadGroupCode);
             this.Controls.Add(this.ob_projectcode_label);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_maxngacceptqty_label);
@@ -903,7 +931,7 @@
             this.Controls.Add(this.ChooseedReject);
             this.Controls.Add(this.WaitReject);
             this.Controls.Add(this.label9);
-            this.Controls.Add(this.oi_checkqty);
+            this.Controls.Add(this.oi_checkqty1);
             this.Controls.Add(this.label6);
             this.Controls.Add(this.ob_okqty);
             this.Controls.Add(this.label5);
@@ -956,17 +984,17 @@
         private System.Windows.Forms.Label label4;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_okqty;
         private System.Windows.Forms.Label label5;
-        private CustomControl.TextBoxWithIcon.EnterTextBox oi_checkqty;
+        private CustomControl.TextBoxWithIcon.EnterTextBox oi_checkqty1;
         private System.Windows.Forms.Label label6;
         private CustomControl.ButtonUtil.ArrowRightButton ChooseedReject;
         private CustomControl.ButtonUtil.ArrowLeftButton WaitReject;
         private System.Windows.Forms.Label label9;
-        private CustomControl.DataGrid_View.DataGridViewExpand CheckTypeDGV;
+        private CustomControl.DataGrid_View.DataGridViewWithCheckBox CheckTypeDGV;
         private CustomControl.TextBoxWithIcon.EnterTextBox sncode;
         private System.Windows.Forms.Label sncode_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_remark;
         private System.Windows.Forms.Label ob_remark_label;
-        private CustomControl.DataGrid_View.DataGridViewExpand WaitChooseDGV;
+        private UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox WaitChooseDGV;
         private CustomControl.DataGrid_View.DataGridViewExpand ChoosedDGV;
         private System.Windows.Forms.DataGridViewCheckBoxColumn 勾选;
         private System.Windows.Forms.DataGridViewTextBoxColumn ob_batchqty_dgv;
@@ -986,18 +1014,21 @@
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_maxngacceptqty;
         private System.Windows.Forms.Label ob_maxngacceptqty_label;
         private System.Windows.Forms.Label ob_projectcode_label;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn Column3;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bg_code;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bg_name;
+        private CustomControl.ComBoxWithFocus.ComBoxWithFocus BadGroupCode;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn ChooseAll;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name;
+        private System.Windows.Forms.DataGridViewTextBoxColumn or_id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn choose;
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_itemcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn oi_ng;
-        private System.Windows.Forms.DataGridViewTextBoxColumn oi_leveldefect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oi_checkkind;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oi_sampleqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn oi_checkqty;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn oi_ng;
+        private System.Windows.Forms.DataGridViewComboBoxColumn oi_leveldefect;
         private System.Windows.Forms.DataGridViewTextBoxColumn ois_remark;
         private System.Windows.Forms.DataGridViewTextBoxColumn ois_status;
-        private System.Windows.Forms.DataGridViewTextBoxColumn ois_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn or_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -24,8 +24,6 @@ namespace UAS_MES.OQC
 
         DataTable TempForCheckType = new DataTable();
 
-        DataTable TempForBadGroup = new DataTable();
-
         string ErrorMessage = "";
 
         public OQC_SamplingDataCollection()
@@ -36,8 +34,7 @@ namespace UAS_MES.OQC
         private void 抽样数据采集_Load(object sender, EventArgs e)
         {
             asc.controllInitializeSize(this);
-            BaseUtil.DataGridViewNotSort(CheckTypeDGV);
-            BaseUtil.DataGridViewNotSort(WaitChooseDGV);
+            BaseUtil.SetDgvColumnComboxData((DataGridViewComboBoxColumn)CheckTypeDGV.Columns["oi_leveldefect"], "oi_leveldefect", "display", "value", LevelDefect);
             dh = new DataHelper();
         }
 
@@ -55,7 +52,7 @@ namespace UAS_MES.OQC
                 {
                     BaseUtil.SetFormValue(Controls, dt[0]);
                     //如果已经判定过则不可再编辑
-                    if (ob_status.Text == "OK"|| ob_status.Text == "NG"|| ob_status.Text == "FOK"|| ob_status.Text == "FNG")
+                    if (ob_status.Text == "OK" || ob_status.Text == "NG" || ob_status.Text == "FOK" || ob_status.Text == "FNG")
                     {
                         BatchPass.Enabled = false;
                     }
@@ -63,7 +60,7 @@ namespace UAS_MES.OQC
                     {
                         BatchPass.Enabled = true;
                     }
-                    oi_checkqty.Text = dh.getFieldDataByCondition("oqcitems", "max(oi_checkqty)", "oi_checkno='" + ob_checkno.Text + "'").ToString();
+                    oi_checkqty1.Text = dh.getFieldDataByCondition("oqcitems", "max(oi_checkqty)", "oi_checkno='" + ob_checkno.Text + "'").ToString();
                     dgvr.Clear();
                 }
                 else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
@@ -85,9 +82,9 @@ namespace UAS_MES.OQC
             {
                 if (CheckSnCode())
                 {
-                    dt = (DataTable)dh.ExecuteSql("select or_id,or_reasoncode bg_code, oi_description bg_name from OQCNGReason where or_checkno='" + ob_checkno.Text + "' and or_sncode='" + sncode.Text + "'", "select");
+                    dt = (DataTable)dh.ExecuteSql("select or_id,or_reasoncode bc_code, oi_description bc_name from OQCNGReason where or_checkno='" + ob_checkno.Text + "' and or_sncode='" + sncode.Text + "'", "select");
                     BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
-                    GetBatchTypeGridData(); 
+                    GetBatchTypeGridData();
                 }
             }
         }
@@ -145,30 +142,43 @@ namespace UAS_MES.OQC
         private void GetBatchTypeGridData()
         {
             dt = (DataTable)dh.ExecuteSql("select oi_checkkind,max(oi_sampleqty) oi_count,nvl(max(oi_checkqty),0) oi_checkedcount from OQCBatch  left join OQCItems on ob_checkno=oi_checkno  where oi_checkno='" + ob_checkno.Text + "' group by oi_checkkind ", "select");
-            BaseUtil.FillExpandDgvWithDataTable(CheckTypeDGV, dt, true, true);
-            if (CheckTypeDGV.Rows.Count == 0)
+            if (dt.Rows.Count == 0)
             {
                 OperateResult.AppendText(">>请先维护抽样计划\n", Color.Red);
                 return;
             }
             string checkkind = "";
-            for (int i = 0; i < CheckTypeDGV.Rows.Count; i++)
+            for (int i = 0; i < dt.Rows.Count; i++)
             {
-                checkkind += ("'" + CheckTypeDGV.Rows[i].Cells["oi_itemcode"].Value.ToString() + "',");
+                checkkind += ("'" + dt.Rows[i]["oi_checkkind"].ToString() + "',");
             }
             sql.Clear();
-            sql.Append("select 1 choose,oi_checkkind,ois_sncode,nvl(ois_id,0) ois_id ,oi_itemcode ,nvl(ois_ifng,0) oi_ng,nvl(ois_defectlevel,'-1')");
-            sql.Append("oi_leveldefect,ois_remark,case nvl(ois_id,0) when 0 then '未检验' else '已检验' end ois_status from OQCItems ");
-            sql.Append("left join OQCItemSamples on  ois_sncode='" + sncode.Text + "' and ois_checkno=oi_checkno and ");
+            sql.Append("select 1 choose,oi_itemcode,oi_checkkind,oi_sampleqty,nvl((oi_checkqty),0) oi_checkqty, ");
+            sql.Append("nvl(ois_id,0) ois_id,nvl(ois_ifng,0) oi_ng,nvl(ois_defectlevel,'-1') oi_leveldefect, ");
+            sql.Append("ois_remark,case nvl(ois_id,0) when 0 then '未检验' else '已检验' end ois_status ");
+            sql.Append("from OQCItems left join OQCItemSamples on  ois_sncode='" + sncode.Text + "' and ois_checkno=oi_checkno and ");
             sql.Append("ois_itemcode=oi_itemcode and ois_projectcode = oi_projectcode where oi_checkno ='" + ob_checkno.Text + "' ");
             sql.Append("and oi_checkkind in (" + checkkind.Substring(0, checkkind.Length - 1) + ")");
-            TempForCheckType = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            BaseUtil.FillDgvWithDataTable(CheckTypeDGV, dt);
             sql.Clear();
-            sql.Append("select bg_code,bg_name from product left join productkind ");
-            sql.Append("on pr_kind=pk_name left join PRODUCTBADGROUP on pk_code= pb_kindcode ");
-            sql.Append("left join badgroup on  bg_code=pb_badgroup where pr_code='" + ob_prodcode.Text + "'");
+            sql.Append("select bg_code,bg_name from PRODUCTBADGROUP left join productkind on ");
+            sql.Append("pk_code= pb_kindcode left join product on pr_kind=pk_name left join ");
+            sql.Append("badgroup on  bg_code=pb_badgroup where pr_code='" + ob_prodcode.Text + "'");
             BadCode = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            BaseUtil.FillExpandDgvWithDataTable(WaitChooseDGV, BadCode, true, false);
+            if (BadCode.Rows.Count > 0)
+            {
+                BadGroupCode.DisplayMember = "bg_name";
+                BadGroupCode.ValueMember = "bg_code";
+                BadGroupCode.DataSource = BadCode;
+            }
+            else
+            {
+                BadCode = (DataTable)dh.ExecuteSql("select bg_code,bg_name from badgroup where bg_statuscode='AUDITED'", "select");
+                BadGroupCode.DisplayMember = "bg_name";
+                BadGroupCode.ValueMember = "bg_code";
+                BadGroupCode.DataSource = BadCode;
+            }
         }
 
         private void Confirm_Click(object sender, EventArgs e)
@@ -179,57 +189,52 @@ namespace UAS_MES.OQC
                 if (!CheckSnCode())
                     return;
                 //判断检验项是否勾选，如勾选取出明细数据
-                for (int i = TempForCheckType.Rows.Count - 1; i >= 0; i--)
+                DataTable dt = (DataTable)CheckTypeDGV.DataSource;
+                //判断是否有勾选的明
+                DataTable Savedt = BaseUtil.filterDataTable(dt, "choose<>0");
+                if (Savedt.Rows.Count > 0)
                 {
-                    if (TempForCheckType.Rows[i][0].ToString() == "False")
+                    bool IfContainNG = false;
+                    for (int i = 0; i < Savedt.Rows.Count; i++)
                     {
-                        TempForCheckType.Rows.RemoveAt(i);
-                    }
-                }
-                if (TempForCheckType != null && TempForCheckType.Rows.Count > 0)
-                {
-                    //用于存放更新的数据
-                    List<string> ois_ifng_update = new List<string>();
-                    List<string> ois_defectlevel_update = new List<string>();
-                    List<string> ois_remark_update = new List<string>();
-                    List<string> ois_id_update = new List<string>();
-                    //用于存放插入的数据
-                    List<string> ois_ifng_insert = new List<string>();
-                    List<string> ois_defectlevel_insert = new List<string>();
-                    List<string> ois_remark_insert = new List<string>();
-                    List<string> oi_itemcode_insert = new List<string>();
-                    for (int i = 0; i < TempForCheckType.Rows.Count; i++)
-                    {
-                        //将布尔值转换为0,-1
-                        if (TempForCheckType.Rows[i]["ois_id"].ToString() != "" && TempForCheckType.Rows[i]["ois_id"].ToString() != "0")
-                        {
-                            ois_ifng_update.Add(TempForCheckType.Rows[i]["oi_ng"].ToString());
-                            ois_defectlevel_update.Add(TempForCheckType.Rows[i]["oi_leveldefect"].ToString());
-                            ois_remark_update.Add(TempForCheckType.Rows[i]["ois_remark"].ToString());
-                            ois_id_update.Add(TempForCheckType.Rows[i]["ois_id"].ToString());
-                        }
-                        else
+                        string if_ng = Savedt.Rows[i]["oi_ng"].ToString();
+                        if (if_ng != "0" && if_ng != "")
                         {
-                            oi_itemcode_insert.Add(TempForCheckType.Rows[i]["oi_itemcode"].ToString());
-                            ois_ifng_insert.Add(TempForCheckType.Rows[i]["oi_ng"].ToString());
-                            ois_defectlevel_insert.Add(TempForCheckType.Rows[i]["oi_leveldefect"].ToString());
-                            ois_remark_insert.Add(TempForCheckType.Rows[i]["ois_remark"].ToString());
+                            IfContainNG = true;
                         }
                     }
-                    //判断是否含不通过的内容
-                    bool AllPass = true;
-                    for (int i = 0; i < ois_ifng_insert.Count; i++)
-                    {
-                        if (ois_ifng_insert[i] != "0")
-                            AllPass = false;
-                    }
-                    for (int i = 0; i < ois_ifng_update.Count; i++)
-                    {
-                        if (ois_ifng_update[i] != "0")
-                            AllPass = false;
-                    }
-                    if (ChoosedDGV.RowCount > 0 || AllPass)
+                    if ((IfContainNG && ChoosedDGV.RowCount > 0) || !IfContainNG)
                     {
+                        //用于存放更新的数据
+                        List<string> ois_ifng_update = new List<string>();
+                        List<string> ois_defectlevel_update = new List<string>();
+                        List<string> ois_remark_update = new List<string>();
+                        List<string> ois_id_update = new List<string>();
+                        //用于存放插入的数据
+                        List<string> ois_ifng_insert = new List<string>();
+                        List<string> ois_defectlevel_insert = new List<string>();
+                        List<string> ois_remark_insert = new List<string>();
+                        List<string> oi_itemcode_insert = new List<string>();
+                        for (int i = 0; i < Savedt.Rows.Count; i++)
+                        {
+                            //将布尔值转换为0,-1
+                            if (Savedt.Rows[i]["ois_id"].ToString() != "" && Savedt.Rows[i]["ois_id"].ToString() != "0")
+                            {
+                                ois_ifng_update.Add(Savedt.Rows[i]["oi_ng"].ToString());
+                                ois_defectlevel_update.Add(Savedt.Rows[i]["oi_leveldefect"].ToString());
+                                ois_remark_update.Add(Savedt.Rows[i]["ois_remark"].ToString());
+                                ois_id_update.Add(Savedt.Rows[i]["ois_id"].ToString());
+                            }
+                            else
+                            {
+                                oi_itemcode_insert.Add(Savedt.Rows[i]["oi_itemcode"].ToString());
+                                ois_ifng_insert.Add(Savedt.Rows[i]["oi_ng"].ToString());
+                                ois_defectlevel_insert.Add(Savedt.Rows[i]["oi_leveldefect"].ToString());
+                                ois_remark_insert.Add(Savedt.Rows[i]["ois_remark"].ToString());
+                            }
+                        }
+                        //判断是否含不通过的内容
+
                         //执行批量更新的SQL
                         if (ois_id_update.Count > 0)
                         {
@@ -240,10 +245,7 @@ namespace UAS_MES.OQC
                         if (oi_itemcode_insert.Count > 0)
                         {
                             string[] id = new string[oi_itemcode_insert.Count];
-                            for (int i = 0; i < id.Length; i++)
-                            {
-                                id[i] = dh.GetSEQ("OQCItemSamples_SEQ");
-                            }
+                            id = dh.GetSEQ("OQCItemSamples_SEQ", id.Length);
                             sql.Clear();
                             sql.Append("insert when (not exists (select ois_id from OQCItemSamples where ois_checkno='" + ob_checkno.Text + "' and ois_sncode='" + sncode.Text + "' and ois_itemcode =:ois_itemcode)) then ");
                             sql.Append("into OQCItemSamples (ois_id,ois_checkno,ois_makecode, ois_sncode,ois_projectcode,ois_itemcode,");
@@ -289,8 +291,6 @@ namespace UAS_MES.OQC
                         BaseUtil.CleanDGVData(CheckTypeDGV);
                         BaseUtil.CleanDGVData(WaitChooseDGV);
                         sncode.Text = "";
-                        TempForCheckType.Clear();
-                        TempForBadGroup.Clear();
                         sncode.Focus();
                     }
                     else OperateResult.AppendText(">>含有未通过项请勾选不良明细\n", Color.Red);
@@ -372,188 +372,33 @@ namespace UAS_MES.OQC
 
         private void ChooseedReject_Click(object sender, EventArgs e)
         {
-            if (TempForBadGroup != null)
+            DataTable dt = (DataTable)WaitChooseDGV.DataSource;
+            dt = BaseUtil.filterDataTable(dt, "ChooseAll<>0");
+            if (dt.Rows.Count > 0)
             {
-                for (int i = TempForBadGroup.Rows.Count - 1; i >= 0; i--)
-                {
-                    if (TempForBadGroup.Rows[i][0].ToString() != "True")
-                        TempForBadGroup.Rows.RemoveAt(i);
-                }
-                BaseUtil.FillDgvWithDataTable(ChoosedDGV, TempForBadGroup.Copy());
-            }
-            else
-                OperateResult.AppendText(">>请先勾选不良明细\n", Color.Red);
-        }
-
-        private void CheckTypeDGV_RowHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
-        {
-            if (!dgvr.Contains(CheckTypeDGV.Rows[e.RowIndex]))
-            {
-                string checkkind = CheckTypeDGV.Rows[e.RowIndex].Cells["oi_itemcode"].Value.ToString();
-
-                DataTable dt = BaseUtil.filterDataTable(TempForCheckType, "oi_checkkind='" + checkkind + "'");
-                DataGridViewRow headerRow = new DataGridViewRow();
-
-                DataGridViewTextBoxCell textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "";
-                headerRow.Cells.Add(textcell);
-
-                textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "检验项目";
-                headerRow.Cells.Add(textcell);
-
-                textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "不通过";
-                headerRow.Cells.Add(textcell);
-
-                textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "缺陷等级";
-                headerRow.Cells.Add(textcell);
-
-                textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "备注";
-                headerRow.Cells.Add(textcell);
-
-                textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "检验状态";
-                headerRow.Cells.Add(textcell);
-                headerRow.ReadOnly = true;
-                CollapseDataGridViewRow cl = new CollapseDataGridViewRow();
-                try
-                {
-                    cl = (CollapseDataGridViewRow)(CheckTypeDGV.Rows[e.RowIndex]);
-                }
-                catch
-                {
-
-                }
-                cl.Rows.Add(headerRow);
-
-                for (int i = 0; i < dt.Rows.Count; i++)
-                {
-                    DataGridViewRow dataRow = new DataGridViewRow();
-                    //标记展开的子行
-                    dataRow.Tag = "SonRow";
-                    DataGridViewCheckBoxCell checkcell = new DataGridViewCheckBoxCell();
-                    checkcell.Tag = "SonRow";
-                    checkcell.Value = true;
-                    dataRow.Cells.Add(checkcell);
-
-                    textcell = new DataGridViewTextBoxCell();
-                    textcell.Value = dt.Rows[i]["oi_itemcode"].ToString();
-                    dataRow.Cells.Add(textcell);
-                    textcell.ReadOnly = true;
-
-                    DataGridViewCheckBoxCell checkcel2 = new DataGridViewCheckBoxCell();
-                    checkcel2.Value = dt.Rows[i]["oi_ng"].ToString() != "0" ? true : false;
-                    dataRow.Cells.Add(checkcel2);
-                    textcell.ReadOnly = false;
-
-                    DataGridViewComboBoxCell combocell = new DataGridViewComboBoxCell();
-                    BaseUtil.SetDGVCellComboxData(combocell, "display", "value", LevelDefect);
-                    combocell.Value = dt.Rows[i]["oi_leveldefect"].ToString();
-                    dataRow.Cells.Add(combocell);
-                    textcell.ReadOnly = false;
-
-                    textcell = new DataGridViewTextBoxCell();
-                    textcell.Value = dt.Rows[i]["ois_remark"].ToString();
-                    dataRow.Cells.Add(textcell);
-                    textcell.ReadOnly = false;
-
-                    textcell = new DataGridViewTextBoxCell();
-                    textcell.Value = dt.Rows[i]["ois_status"].ToString();
-                    dataRow.Cells.Add(textcell);
-                    textcell.ReadOnly = true;
-
-                    textcell = new DataGridViewTextBoxCell();
-                    textcell.Value = dt.Rows[i]["ois_id"].ToString();
-                    dataRow.Cells.Add(textcell);
-
-                    cl.Rows.Add(dataRow);
-                }
-                dgvr.Add(CheckTypeDGV.Rows[e.RowIndex]);
+                BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
             }
+            else OperateResult.AppendText(">>请勾选不良明细\n", Color.Red);
         }
 
         private void CheckTypeDGV_DataError(object sender, DataGridViewDataErrorEventArgs e) { }
 
-        private void WaitChooseDGV_RowHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e)
-        {
-            if (!dgvr.Contains(WaitChooseDGV.Rows[e.RowIndex]))
-            {
-                string bg_code = WaitChooseDGV.Rows[e.RowIndex].Cells["bg_code"].Value.ToString();
-                DataTable dt = (DataTable)dh.ExecuteSql("select bc_code,bc_name  from BADCODE  where bc_groupcode='" + bg_code + "'", "select");
-                DataGridViewRow headerRow = new DataGridViewRow();
-                DataGridViewTextBoxCell textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "";
-                headerRow.Cells.Add(textcell);
-
-                textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "不良代码";
-                headerRow.Cells.Add(textcell);
-
-                textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "不良名称";
-                headerRow.Cells.Add(textcell);
-
-                headerRow.ReadOnly = true;
-                CollapseDataGridViewRow cl = new CollapseDataGridViewRow();
-                try
-                {
-                    cl = (CollapseDataGridViewRow)(WaitChooseDGV.Rows[e.RowIndex]);
-                }
-                catch (Exception) { }
-                cl.Rows.Add(headerRow);
-                for (int i = 0; i < dt.Rows.Count; i++)
-                {
-                    DataGridViewRow dataRow = new DataGridViewRow();
-                    //标记展开的子行
-                    dataRow.Tag = "SonRow";
-                    DataGridViewCheckBoxCell checkcell = new DataGridViewCheckBoxCell();
-                    checkcell.Tag = "SonRow";
-                    dataRow.Cells.Add(checkcell);
-
-                    textcell = new DataGridViewTextBoxCell();
-                    textcell.Value = dt.Rows[i]["bc_code"].ToString();
-                    dataRow.Cells.Add(textcell);
-
-                    textcell = new DataGridViewTextBoxCell();
-                    textcell.Value = dt.Rows[i]["bc_name"].ToString();
-                    dataRow.Cells.Add(textcell);
-                    cl.Rows.Add(dataRow);
-                }
-                dgvr.Add(WaitChooseDGV.Rows[e.RowIndex]);
-            }
-        }
-
         //如果当前行的Cell有修改过就将CheckBox勾选上
         private void CheckTypeDGV_CellValueChanged(object sender, DataGridViewCellEventArgs e)
         {
             if (e.RowIndex > 0 && e.ColumnIndex > 0)
                 CheckTypeDGV.Rows[e.RowIndex].Cells[0].Value = true;
-            try
-            {
-                if (CheckTypeDGV.Rows[e.RowIndex].Cells[0].Tag != null)
-                {
-                    if (CheckTypeDGV.Rows[e.RowIndex].Cells[0].Tag.ToString() == "SonRow")
-                        BaseUtil.GetExpandDGVCheckedRow(CheckTypeDGV, TempForCheckType, e.RowIndex, 1);
-                }
-            }
-            catch (Exception)
-            {
-            }
         }
 
         private void WaitChooseDGV_DataError(object sender, DataGridViewDataErrorEventArgs e) { }
 
         private void WaitChooseDGV_CellContentClick(object sender, DataGridViewCellEventArgs e)
         {
-            BaseUtil.ExpandDGVCheck(WaitChooseDGV, e);
+
         }
 
         private void CheckTypeDGV_CellContentClick(object sender, DataGridViewCellEventArgs e)
         {
-            BaseUtil.ExpandDGVCheck(CheckTypeDGV, e);
         }
 
         private void bccode_KeyDown(object sender, KeyEventArgs e)
@@ -594,22 +439,15 @@ namespace UAS_MES.OQC
                 GetBatch.PerformClick();
         }
 
-        private void WaitChooseDGV_CellValueChanged(object sender, DataGridViewCellEventArgs e)
+        private void BadGroupCode_SelectedIndexChanged(object sender, EventArgs e)
         {
-            try
-            {
-                if (e.ColumnIndex == 0)
-                {
-                    if (WaitChooseDGV.Rows[e.RowIndex].Cells[0].Tag != null)
-                    {
-                        if (WaitChooseDGV.Rows[e.RowIndex].Cells[0].Tag.ToString() == "SonRow")
-                            BaseUtil.GetExpandDGVCheckedRow(WaitChooseDGV, TempForBadGroup, e.RowIndex, 1);
-                    }
-                }
-            }
-            catch (Exception)
-            {
-            }
+            string bg_code = BadGroupCode.SelectedValue.ToString();
+            sql.Clear();
+            sql.Append("select 0 ChooseAll,bc_code,bc_name from badgroupdetail left join badgroup on bgd_bgcode=bg_code ");
+            sql.Append("left join badcode on bgd_badcode=bc_code where bg_code='" + ((bg_code != "" && bg_code != "System.Data.DataRowView") ? bg_code.ToString() : "") + "' and bg_code is not null ");
+            sql.Append(" order by bc_code");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            BaseUtil.FillDgvWithDataTable(WaitChooseDGV, dt);
         }
     }
 }

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.resx

@@ -258,13 +258,31 @@
   <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="or_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_code1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="bg_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="bc_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="bg_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="bc_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ChooseAll.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="bc_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="choose.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -273,6 +291,15 @@
   <metadata name="oi_itemcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="oi_checkkind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_sampleqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="oi_checkqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="oi_ng.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -285,9 +312,6 @@
   <metadata name="ois_status.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="ois_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <data name="ChooseedReject.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACUAAAAXCAYAAACMLIalAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6

UAS-MES/Login.cs

@@ -49,10 +49,10 @@ namespace UAS_MES
             {
                 DB.Text = DbComboxData.Rows[0]["ma_user"].ToString();
             }
-            //if (Properties.Settings.Default.LastLoginSob != null)
-            //{
-            //    DB.SelectedValue = Properties.Settings.Default.LastLoginSob;
-            //}
+            if (Properties.Settings.Default.LastLoginSob != null)
+            {
+                DB.SelectedValue = Properties.Settings.Default.LastLoginSob;
+            }
             //显示上次用户登录的用户名，将输入框定位到密码
             UserName.Text = Properties.Settings.Default.LastLoginUser;
             Source.Text = Properties.Settings.Default.LastLoginResource;

UAS-MES/Main.cs

@@ -105,6 +105,7 @@ namespace UAS_MES
             SetForm();
             //设置导航栏宽度
             SystemInf.NavWidth = Menu.Width;
+            SystemInf.HeadBarHeight = headBar1.Height;
         }
 
         private void RefreshDB(object sender, EventArgs e)

UAS-MES/PublicMethod/AutoSizeFormClass.cs

@@ -27,6 +27,7 @@ namespace UAS_MES.PublicMethod
         {
             controlRect cR;
             mForm.Width = Screen.PrimaryScreen.WorkingArea.Width - SystemInf.NavWidth-5;
+            LogManager.DoLog(SystemInf.HeadBarHeight.ToString());
             mForm.Height = Screen.PrimaryScreen.WorkingArea.Height - 100;
             cR.Left = mForm.Left; cR.Top = mForm.Top; cR.Width = mForm.Width; cR.Height = mForm.Height;
             oldCtrl.Add(cR);//第一个为"窗体本身",只加入一次即可

UAS-MES/PublicMethod/LogicHandler.cs

@@ -432,7 +432,7 @@ namespace UAS_MES.PublicMethod
             string[] param = new string[] { iCaller, iSourceCode, oErrorMessage };
             dh.CallProcedure("CS_CHECKSTEPATTRIBUTE", ref param);
             oErrorMessage = param[2];
-            if (oErrorMessage == "" || oErrorMessage == null|| oErrorMessage=="null")
+            if (oErrorMessage == "" || oErrorMessage == null || oErrorMessage == "null")
                 return true;
             else
                 return false;
@@ -760,17 +760,17 @@ namespace UAS_MES.PublicMethod
                             Form.Rows[0]["ob_projectcode"] = qualmethod;
                             pr_id = dh.getFieldDataByCondition("QUA_Project", "pr_id", "pr_code = '" + qualmethod + "'").ToString();
                             sql.Clear();
-                            sql.Append("select nvl(max(oi_id),0)oi_id, ci_kind,max(oi_sampleqty) from QUA_PROJECT left join ");
+                            sql.Append("select nvl(max(oi_id),0)oi_id, ci_kind,nvl(max(oi_sampleqty),0) oi_sampleqty from QUA_PROJECT left join ");
                             sql.Append(" QUA_ProjectDetail on pd_prid=pr_id  left join QUA_CheckItem on pd_ciid=ci_id ");
-                            sql.Append("left join OQCITEMS on oi_checkno ='"+iCheckNo+ "' and oi_projectcode='"+ qualmethod + "' ");
-                            sql.Append("and oi_projectcode = pr_code and oi_checkkind = ci_kind where  pr_code='"+ qualmethod + "'  group by ci_kind");
+                            sql.Append("left join OQCITEMS on oi_checkno ='" + iCheckNo + "' and oi_projectcode='" + qualmethod + "' ");
+                            sql.Append("and oi_projectcode = pr_code and oi_checkkind = ci_kind where  pr_code='" + qualmethod + "'  group by ci_kind");
                             Grid = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                         }
                         else
                             oErrorMessage = "只有待检验的批次才允许维护抽样计划";
                     }
                     else
-                        oErrorMessage = "抽检批次"+iCheckNo+"不存在";
+                        oErrorMessage = "抽检批次" + iCheckNo + "不存在";
                     break;
                 case "OQCDATACOLLECTION":
                     sql.Clear();
@@ -828,7 +828,7 @@ namespace UAS_MES.PublicMethod
             sql.Clear();
             sql.Append("insert into MakeProcess(mp_id,mp_makecode,mp_maid, mp_mscode,mp_sncode,mp_stepcode,mp_stepname,");
             sql.Append("mp_craftcode,mp_craftname,mp_kind,mp_result,mp_indate,mp_inman,mp_wccode,mp_linecode,mp_sourcecode,mp_snstatus,mp_sncheckno,mp_snoutboxcode)");
-            sql.Append("select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,'"+ CurrentStep + "','"+ CurrentStepName + "',");
+            sql.Append("select MakeProcess_seq.nextval, ma_code,ma_id,ms_code,ms_sncode,'" + CurrentStep + "','" + CurrentStepName + "',");
             sql.Append("ma_craftcode,ma_craftname,'" + iMPKind + "','" + result + "',sysdate,'" + iUserCode + "',ma_wccode,'" + LineCode + "','" + iSourceCode + "',");
             sql.Append("ms_status,ms_checkno,ms_outboxcode from make left join makeserial on ms_makecode=ma_code left join step on st_code=ms_stepcode ");
             sql.Append("where ms_sncode='" + iSnCode + "' and ma_code='" + iMakeCode + "' and st_code='" + CurrentStep + "'");
@@ -1006,17 +1006,19 @@ namespace UAS_MES.PublicMethod
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + iSnCode + "'");
             dh.BatchInsert(sql.ToString(), new string[] { "bc_code", "bg_code", "bc_remark" }, iBadCode, iBadGroupCode, iBadRemark);
             //更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
-            dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3,ms_badtimes=ms_badtimes+1", "ms_sncode='" + iSnCode + "'");
             //如果存在送检批号则进行删除
-            if (dh.CheckExist("oqcbatchdetail", "obd_sncode='"+iSnCode+"'"))
+            if (dh.CheckExist("oqcbatchdetail", "obd_sncode='" + iSnCode + "'"))
             {
-                string checkno = dh.getFieldDataByCondition("oqcbatchdetail", "obd_checkno", "obd_sncode='"+iSnCode+"'").ToString();
+                string checkno = dh.getFieldDataByCondition("oqcbatchdetail", "obd_checkno", "obd_sncode='" + iSnCode + "'").ToString();
                 dh.ExecuteSql("delete from oqcbatchdetail where obd_sncode='" + iSnCode + "'", "delete");
-                dh.ExecuteSql("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='"+ checkno + "'", "update");
+                dh.ExecuteSql("update oqcbatch set ob_nowcheckqty=ob_nowcheckqty-1 where ob_checkno='" + checkno + "'", "update");
             }
             //之前保存的不良就不再调用
             if (ms_status != "3")
+            {
+                dh.UpdateByCondition("makeserial", "ms_paststep = ms_paststep ||'," + StepCode + "',ms_status=3,ms_badtimes=ms_badtimes+1", "ms_sncode='" + iSnCode + "'");
                 SetStepFinish(iMakeCode, iSourceCode, iSnCode, "不良采集", iResult, iUserCode, out oErrorMessage);
+            }
             return true;
         }
 
@@ -1203,7 +1205,7 @@ namespace UAS_MES.PublicMethod
                 return false;
         }
 
-        public static bool UpdateOQCMessage(string iSnCode,string iCheckno, string iMakeCode, string iMPKind, string iSourceCode, string iUserCode, string iResult, out string oErrorMessage)
+        public static bool UpdateOQCMessage(string iSnCode, string iCheckno, string iMakeCode, string iMPKind, string iSourceCode, string iUserCode, string iResult, out string oErrorMessage)
         {
             oErrorMessage = "";
             string StepCode = "";
@@ -1216,7 +1218,7 @@ namespace UAS_MES.PublicMethod
             GetStepCodeAndNameAndLineBySource(iSourceCode, ref StepCode, ref StepName, ref LineCode);
             //查询批次和批数量
             int batchqty = 0;
-            DataTable dt = (DataTable)dh.ExecuteSql("select count(ms_checkno) count,ms_checkno from makeserial where ms_checkno='"+ iCheckno + "' group by ms_checkno", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select count(ms_checkno) count,ms_checkno from makeserial where ms_checkno='" + iCheckno + "' group by ms_checkno", "select");
             if (dt.Rows.Count > 0)
             {
                 batchqty = int.Parse(dt.Rows[0]["count"].ToString());
@@ -1227,14 +1229,14 @@ namespace UAS_MES.PublicMethod
                 //更新执行的数量
                 sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty+" + batchqty + ",mcd_outqty = mcd_outqty + " + batchqty + ",mcd_okqty = mcd_okqty + " + batchqty + " where mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "' ");
                 //更新makeSerial 的下一工序
-                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='" + StepCode + "',ms_nextstepcode='" + nextstepcode+ "' where ms_checkno='" + iCheckno + "'");
+                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='" + StepCode + "',ms_nextstepcode='" + nextstepcode + "' where ms_checkno='" + iCheckno + "'");
             }
             else
             {
                 //更新执行的数量
                 sqls.Add("update makecraftdetail set mcd_inqty=mcd_inqty+1,mcd_outqty = mcd_outqty + 1,mcd_okqty = mcd_okqty + 1 where mcd_macode='" + iMakeCode + "' and mcd_stepcode='" + StepCode + "' ");
                 //更新makeSerial 的下一工序
-                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='" + StepCode + "',ms_nextstepcode='" + nextstepcode + "' where ms_checkno='"+iCheckno+"'");
+                sqls.Add("update makeserial set ms_paststep = ms_paststep || '," + StepCode + "',ms_stepcode='" + StepCode + "',ms_nextstepcode='" + nextstepcode + "' where ms_checkno='" + iCheckno + "'");
             }
             //更新序列号已经采集的工序 ms_paststep 已采集数据，更新下一工序
             dh.ExecuteSQLTran(sqls.ToArray());