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

UAS-MES/DataOperate/DataHelper.cs

@@ -57,7 +57,6 @@ 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();
@@ -100,7 +99,6 @@ 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);
@@ -119,7 +117,6 @@ 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);
@@ -141,7 +138,6 @@ 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();
@@ -157,7 +153,6 @@ 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);
@@ -167,22 +162,6 @@ 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>
@@ -211,7 +190,6 @@ 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);
@@ -236,7 +214,6 @@ 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);
@@ -565,7 +542,6 @@ 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();
@@ -609,7 +585,6 @@ 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":
@@ -663,7 +638,6 @@ 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);
@@ -694,7 +668,6 @@ 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;
@@ -824,7 +797,6 @@ 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++)
@@ -935,7 +907,6 @@ 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();
@@ -979,7 +950,6 @@ namespace UAS_MES.DataOperate
                 {
                     if (!String.IsNullOrEmpty(sql))
                     {
-                        Console.WriteLine(sql);
                         command.CommandText = sql;
                         command.ExecuteNonQuery();
                     }

UAS-MES/DbFind.cs

@@ -215,8 +215,9 @@ namespace UAS_MES
                 }
                 MainControl.Focus();
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                LogManager.DoLog(ex.Message);
                 SuccessReturnData = false;
             }
             Dispose();

UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -61,34 +61,26 @@ namespace UAS_MES.Make
             string pr_code = dh.getFieldDataByCondition("makeserial", "ms_prodcode", "ms_sncode='" + sncode + "' and ms_makecode='" + macode + "'").ToString();
             sql.Clear();
             sql.Append("select bg_code,bg_name from product left join productkind  on pr_kind =pk_name ");
-            sql.Append("left join productbadgroup  on  pb_kindcode= pk_code left join badgroup on ");
+            sql.Append("left join productbadgroup on pb_kindcode= pk_code left join badgroup on ");
             sql.Append("bg_code=pb_badgroup  where pr_code='" + pr_code + "' and nvl(pb_kindcode,'')<>''");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //如果未查询到数据则获取全部的不良组别
             if (dt.Rows.Count == 0)
             {
                 sql.Clear();
-                sql.Append("select bg_code from badgroup where bg_statuscode='AUDITED'");
+                sql.Append("select bg_code,bg_name from badgroup where bg_statuscode='AUDITED'");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 badgroup.DataSource = dt;
-                badgroup.DisplayMember = "bg_code";
+                badgroup.DisplayMember = "bg_name";
                 badgroup.ValueMember = "bg_code";
+                LoadBadCodeListView();
             }
             else
             {
                 badgroup.DataSource = dt;
-                badgroup.DisplayMember = "bg_code";
+                badgroup.DisplayMember = "bg_name";
                 badgroup.ValueMember = "bg_code";
-                int rowCount = dt.Rows.Count;
-                string bg_code = "";
-                for (int i = 0; i < rowCount; i++)
-                {
-                    if (i == rowCount - 1)
-                        bg_code += "'" + dt.Rows[i]["bg_code"] + "'";
-                    else
-                        bg_code += "'" + dt.Rows[i]["bg_code"] + "',";
-                }
-                dt = (DataTable)dh.ExecuteSql("select bc_groupcode,bc_code,bc_name from badcode where bc_groupcode in(" + (bg_code == "" ? "''" : bg_code) + ")", "select");
+                LoadBadCodeListView();
             }
         }
 
@@ -202,7 +194,7 @@ namespace UAS_MES.Make
             sql.Append("select :id,ma_code,ms_code,ms_sncode,'" + User.UserName + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
             sql.Append("sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode where ms_sncode='" + sncode + "'");
-            dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "id", "bc_code", "bg_code"}, bccode, id, bccode, bgcode);
+            dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "id", "bc_code", "bg_code" }, bccode, id, bccode, bgcode);
             MessageBox.Show("保存成功");
             Close();
         }
@@ -217,9 +209,10 @@ namespace UAS_MES.Make
         /// </summary>
         private void LoadBadCodeListView()
         {
+            string bg_id = badgroup.SelectedValue.ToString();
             sql.Clear();
-            sql.Append("select bg_code,bg_name,bc_code,bc_name,bc_note from badcode left join badgroup on bc_groupcode=bg_code left join ");
-            sql.Append("badgroupdetail on bg_id=bgd_id and bgd_badcode=bc_code where bc_groupcode='" + badgroup.Text + "' and bg_code is not null ");
+            sql.Append("select bg_code,bg_name,bc_code,bc_name,bc_note from badgroupdetail left join badgroup on bgd_bgcode=bg_code ");
+            sql.Append("left join badcode on bgd_badcode=bc_code where bg_code='" + ((bg_id != "" && bg_id != "System.Data.DataRowView") ? bg_id.ToString() : "") + "' and bg_code is not null ");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //往listview中添加数据
             WaitRejectList.Items.Clear();

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -78,7 +78,7 @@ namespace UAS_MES.Make
             //加载不良原因组数据
             sql.Clear();
             sql.Append("select nrg_code,nrg_name from PRODUCTBADREASONGROUP left join ");
-            sql.Append("QUA_NGReasonGroup  on  nrg_code=pbr_brgcode where  pbr_kindcode='" + pk_code + "'");
+            sql.Append("QUA_NGReasonGroup  on  nrg_code=pbr_brgcode where  pbr_kindcode=" + pk_code + "'");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //未查询到则查询全部数据
             if (dt.Rows.Count == 0)
@@ -254,8 +254,9 @@ namespace UAS_MES.Make
                 nrg_code = nrg_name_lsv.SelectedItems[0].SubItems[0].Text;
             }
             sql.Clear();
-            sql.Append("select nr_code,nr_name,nr_group from QUA_NGReason where ");
-            sql.Append("nr_group in('" + (nrg_code == "" ? "''" : nrg_code) + "')");
+            sql.Append("select nr_code,nr_name,nr_group from QUA_NGREASONGROUPDET left join QUA_NGREASONGROUP ");
+            sql.Append("on nrgd_nrgid=nrg_id left join QUA_NGReason on nrgd_nrcode=nr_code where ");
+            sql.Append("nrg_code in('" + (nrg_code == "" ? "''" : nrg_code) + "')");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             AddDataToListView(nr_name_lsv, dt);
         }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -227,9 +227,9 @@ namespace UAS_MES.Make
         {
             object bg_code = bc_groupcode.SelectedValue;
             sql.Clear();
-            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_name ");
-            sql.Append("from badcode left join badgroup on bc_groupcode=bg_code  where ");
-            sql.Append("bc_groupcode='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
+            sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_name from badgroupdetail ");
+            sql.Append("left join badgroup on  bg_id=bgd_bgid left join badcode on bgd_badcode=bc_code where ");
+            sql.Append("bg_code='" + (bg_code != null ? bg_code.ToString() : "") + "' and bg_code is not null");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             //往listview中添加数据
             WaitRejectList.Items.Clear();
@@ -256,7 +256,7 @@ namespace UAS_MES.Make
         private void LoadChoosedBadListView()
         {
             sql.Clear();
-            sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,nvl(mb_badcode,bc_code) bc_code,mb_badremark from makebad  ");
+            sql.Append("select nvl(bg_code,mb_bgcode)||':'||nvl(bg_name,mb_badcode) bg_code,nvl(mb_badcode,bc_code) bc_code,bc_name from makebad  ");
             sql.Append("left join badgroup on mb_bgcode=bg_code left join badcode on mb_badcode=bc_code ");
             sql.Append(" where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "' and mb_status=0");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -39,6 +39,7 @@ namespace UAS_MES.OQC
             ob_aqlcode.SetValueField = new string[] { "ob_aqlcode" };
             ob_aqlcode.FormName = Name;
             ob_aqlcode.Condition = "al_statuscode='AUDITED'";
+            ChooseAll.ChooseAll(CheckTypeDGV);
         }
 
         private void 抽样计划维护_SizeChanged(object sender, EventArgs e)
@@ -227,5 +228,16 @@ namespace UAS_MES.OQC
                 CheckTypeDGV.Rows[i].Cells["oi_sampleqty"].Value = ad_qty.Text;
             }
         }
+
+        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(" 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");
+            DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(),"select");
+            BaseUtil.FillDgvWithDataTable(CheckTypeDGV, dt);
+        }
     }
 }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.designer.cs

@@ -324,6 +324,7 @@
             this.ob_projectcode.TableName = null;
             this.ob_projectcode.Tag = "pr_code";
             this.ob_projectcode.TextBoxEnable = false;
+            this.ob_projectcode.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ob_projectcode_UserControlTextChanged);
             // 
             // ob_status
             // 

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -526,19 +526,4 @@
   <metadata name="oi_sampleqty.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">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ci_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ci_kind.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>
 </root>

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 dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = 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,9 +55,6 @@
             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.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.DataGridViewExpand();
             this.Column3 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.bg_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -90,6 +87,9 @@
             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();
             ((System.ComponentModel.ISupportInitialize)(this.ChoosedDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.WaitChooseDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -440,29 +440,6 @@
             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 = "bg_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 = "bg_name";
-            this.bc_name1.HeaderText = "不良原因";
-            this.bc_name1.Name = "bc_name1";
-            this.bc_name1.ReadOnly = true;
-            // 
             // WaitChooseDGV
             // 
             this.WaitChooseDGV.AllowUserToAddRows = false;
@@ -584,8 +561,8 @@
             // 
             this.oi_ng.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
             this.oi_ng.DataPropertyName = "oi_count";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.oi_ng.DefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.oi_ng.DefaultCellStyle = dataGridViewCellStyle1;
             this.oi_ng.HeaderText = "样本数量";
             this.oi_ng.Name = "oi_ng";
             this.oi_ng.Width = 96;
@@ -875,6 +852,29 @@
             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;
+            // 
+            // 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;
+            // 
             // OQC_SamplingDataCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
@@ -986,9 +986,6 @@
         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.DataGridViewTextBoxColumn or_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_code1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn bc_name1;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn bg_code;
         private System.Windows.Forms.DataGridViewTextBoxColumn bg_name;
@@ -999,5 +996,8 @@
         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

@@ -87,7 +87,7 @@ namespace UAS_MES.OQC
                 {
                     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");
                     BaseUtil.FillDgvWithDataTable(ChoosedDGV, dt);
-                    GetBatchTypeGridData();
+                    GetBatchTypeGridData(); 
                 }
             }
         }
@@ -493,7 +493,7 @@ namespace UAS_MES.OQC
                 headerRow.Cells.Add(textcell);
 
                 textcell = new DataGridViewTextBoxCell();
-                textcell.Value = "不良原因";
+                textcell.Value = "不良名称";
                 headerRow.Cells.Add(textcell);
 
                 headerRow.ReadOnly = true;

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.resx

@@ -258,24 +258,6 @@
   <metadata name="bc_name1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <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="Column3.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">
-    <value>True</value>
-  </metadata>
-  <metadata name="bg_name.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">
     <value>True</value>
   </metadata>
@@ -306,27 +288,6 @@
   <metadata name="ois_id.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">
-    <value>True</value>
-  </metadata>
-  <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_ng.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="oi_leveldefect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="ois_remark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <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/FunctionCode/Query/Query_ExeProgress.cs

@@ -61,8 +61,8 @@ namespace UAS_MES.Query
                 }
                 //查询执行过的步骤
                 sql.Clear();
-                sql.Append("select CD_DETNO,CD_STEPCODE from craft left join craftdetail  on cd_crid = cr_id  left join makeserial ");
-                sql.Append("on ms_craftcode=cr_code and ms_prodcode=cr_prodcode where ms_sncode='"+sn_code.Text+"'");
+                sql.Append("select CD_DETNO,CD_STEPCODE from craft left join craftdetail on cd_crid = cr_id  left join makeserial ");
+                sql.Append("on ms_craftcode=cr_code and ms_prodcode=cr_prodcode where ms_sncode='"+sn_code.Text+"' order by cd_detno");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 Step = new Dictionary<int, string>();
                 PastStep = dh.getFieldDataByCondition("makeserial", "ms_paststep", "ms_sncode='" + sn_code.Text + "'").ToString();
@@ -132,7 +132,7 @@ namespace UAS_MES.Query
                             }
                             else
                             {
-                                if (Step[j].Contains("开始") || Step[j].Contains("结束"))
+                                if (Step[j].Contains("开始"))
                                     g.FillEllipse(Brushes.Green, r);
                                 else
                                     g.FillRectangle(Brushes.White, r);
@@ -168,7 +168,7 @@ namespace UAS_MES.Query
                             }
                             else
                             {
-                                if (Step[j].Contains("开始") || Step[j].Contains("结束"))
+                                if (Step[j].Contains("开始"))
                                 {
                                     g.FillEllipse(Brushes.Green, r);
                                 }

UAS-MES/Login.cs

@@ -37,8 +37,6 @@ namespace UAS_MES
         private void Login_Load(object sender, EventArgs e)
         {
             ftpOperater ftp = new ftpOperater();
-            //从FTP的配置文件读取的数据库信息，并且进行解密
-            //SystemInf.DefaultDB = Encryption.DecryptStr((ftp.GetFileContent("db.config")));
             //设置默认数据库
             SystemInf.DefaultDB = Properties.Settings.Default.Properties["MES"].DefaultValue.ToString();
             dh = new DataHelper();

UAS-MES/Program.cs

@@ -41,7 +41,6 @@ namespace UAS_MES
                     Directory.CreateDirectory(sysdisc + @":\Log");
                 FileStream fs = new FileStream(sysdisc + @":\Log\" + DateTime.Now.ToString("yyyy-MM-dd") + ".txt", FileMode.OpenOrCreate, FileAccess.ReadWrite);
                 fs.Close();
-                LogManager.DoLog(Application.StartupPath);
                 if (principal.IsInRole(WindowsBuiltInRole.Administrator))
                     Application.Run(new Login());
                 else

UAS-MES/PublicMethod/LogicHandler.cs

@@ -751,11 +751,6 @@ namespace UAS_MES.PublicMethod
                             {
                                 //判读第二原则送检方案为空
                                 string pr_qualmethod = dh.getFieldDataByCondition("product left join productkind on pr_kind=pk_name", "pk_qualmethod", "pr_code='" + Form.Rows[0]["ob_prodcode"] + "'").ToString();
-                                if (pr_qualmethod == "" || pr_qualmethod == null)
-                                    oErrorMessage = "该物料或者物料种类未维护检验方案，物料号：" + Form.Rows[0]["ob_prodcode"] + "，请先维护检验方案";
-                                //判读第二原则送检方案为空
-                                else
-                                    qualmethod = pr_qualmethod;
                             }
                             //第一原则送检方案不为空
                             else
@@ -765,16 +760,11 @@ 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) Choose,nvl(max(oi_id),0)oi_id,ci_kind,nvl(max(oi_sampleqty),0) oi_sampleqty from ");
-                            sql.Append("QUA_PROJECT left join QUA_ProjectDetail on pd_prid=pr_id left join QUA_CheckItem ");
-                            sql.Append("on pd_ciid=ci_id left join OQCITEMS on oi_checkno='" + iCheckNo + "' and ");
-                            sql.Append("oi_projectcode='" + qualmethod + "'and oi_projectcode = pr_code and oi_checkkind = ci_kind ");
-                            sql.Append("where pr_code='" + qualmethod + "' group by ci_kind ");
+                            sql.Append("select nvl(max(oi_id),0)oi_id, ci_kind,max(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");
                             Grid = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                            if (Grid.Rows.Count == 0)
-                            {
-                                oErrorMessage = "检验方案:" + qualmethod + "无检验项目";
-                            }
                         }
                         else
                             oErrorMessage = "只有待检验的批次才允许维护抽样计划";