放大镜赋值事件判空

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -264,31 +264,34 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
 
         public void GetData()
         {
-                DataHelper dh = new DataHelper();
-                string sql;
-                //将查询到的结果返回界面
-                if (TextBox.Text != "") { 
-                 sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
-                }
-                else { 
-                 sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
-                }
-                if (condition != null)
-                {
-                    sql += " and " + condition;
-                }
-                try
-                {
-                    dt = (DataTable)dh.ExecuteSql(sql, "select");
-                    if (dt.Rows.Count > 0)
-                        ReturnDataToFrom();
-                }
-                catch(Exception e){
-                    LogManager.DoLog(e.Message);
-                }  
-                //不允许工单号为空的情况
-                LockCheckBox.Checked = true;
-            
+            DataHelper dh = new DataHelper();
+            string sql = "";
+            //将查询到的结果返回界面
+            if (TextBox.Text != "")
+            {
+                sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
+            }
+            else if (db != null)
+            {
+                sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
+            }
+            if (condition != null)
+            {
+                sql += " and " + condition;
+            }
+            try
+            {
+                dt = (DataTable)dh.ExecuteSql(sql, "select");
+                if (dt.Rows.Count > 0)
+                    ReturnDataToFrom();
+            }
+            catch (Exception e)
+            {
+                LogManager.DoLog(e.Message);
+            }
+            //不允许工单号为空的情况
+            LockCheckBox.Checked = true;
+
         }
 
         private void fillControl(int i, Control ct)

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -321,29 +321,31 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
 
         public void GetData()
         {
-                DataHelper dh = new DataHelper();
-                string sql;
-                //将查询到的结果返回界面
-                if (TextBox.Text != "")
-                {
-                     sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
-                }
-                else {
-                    sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
-                }
-                    if (condition != null)
-                {
-                    sql += " and " + condition;
-                }
-                try
-                {
-                    dt = (DataTable)dh.ExecuteSql(sql, "select");
-                    if (dt.Rows.Count > 0)
-                        ReturnDataToForm();
-                }
-                catch(Exception e){
-                    LogManager.DoLog(e.Message);
-                }                 
+            DataHelper dh = new DataHelper();
+            string sql = "";
+            //将查询到的结果返回界面
+            if (TextBox.Text != "")
+            {
+                sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + TextBox.Text + "'";
+            }
+            else if (db != null)
+            {
+                sql = "select " + BaseUtil.AddField(setValueField) + " from " + tableName + " where " + Name + "='" + db.TextBoxValue1 + "'";
+            }
+            if (condition != null)
+            {
+                sql += " and " + condition;
+            }
+            try
+            {
+                dt = (DataTable)dh.ExecuteSql(sql, "select");
+                if (dt.Rows.Count > 0)
+                    ReturnDataToForm();
+            }
+            catch (Exception e)
+            {
+                LogManager.DoLog(e.Message);
+            }
         }
     }
 }

UAS-MES/FunctionCode/Make/Make_Decompose.Designer.cs

@@ -35,18 +35,9 @@
             this.label3 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
-            this.LabelDataGridView = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
-            this.deccount = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pr_name = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.ms_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.ms_sncode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.Close = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.Decompose = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
+            this.LabelDataGridView = new UAS_MES.CustomControl.DataGrid_View.DataGridViewWithCheckBox();
             this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.Column1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.Choose2 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.cm_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mb_bgcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -55,6 +46,16 @@
             this.cm_soncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.cm_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.New_BarCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.qqqqq = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.deccount = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ms_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pr_name = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ms_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.ms_sncode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.Close = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.Decompose = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
+            this.sn_code = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
             // 
@@ -125,7 +126,7 @@
             this.LabelDataGridView.BackgroundColor = System.Drawing.SystemColors.ButtonFace;
             this.LabelDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Choose,
-            this.Column1,
+            this.Choose2,
             this.cm_id,
             this.pr_detail,
             this.mb_bgcode,
@@ -133,12 +134,90 @@
             this.AddBad,
             this.cm_soncode,
             this.cm_barcode,
-            this.New_BarCode});
+            this.New_BarCode,
+            this.qqqqq});
             this.LabelDataGridView.Location = new System.Drawing.Point(12, 105);
             this.LabelDataGridView.Name = "LabelDataGridView";
             this.LabelDataGridView.RowTemplate.Height = 23;
             this.LabelDataGridView.Size = new System.Drawing.Size(1027, 233);
             this.LabelDataGridView.TabIndex = 188;
+            this.LabelDataGridView.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellClick);
+            this.LabelDataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelDataGridView_CellContentClick);
+            // 
+            // Choose
+            // 
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "拆解更料";
+            this.Choose.Name = "Choose";
+            this.Choose.Width = 60;
+            // 
+            // Choose2
+            // 
+            this.Choose2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose2.HeaderText = "拆解";
+            this.Choose2.Name = "Choose2";
+            this.Choose2.Width = 40;
+            // 
+            // cm_id
+            // 
+            this.cm_id.DataPropertyName = "cm_id";
+            this.cm_id.HeaderText = "cm_id";
+            this.cm_id.Name = "cm_id";
+            this.cm_id.Visible = false;
+            this.cm_id.Width = 5;
+            // 
+            // pr_detail
+            // 
+            this.pr_detail.DataPropertyName = "pr_detail";
+            this.pr_detail.HeaderText = "pr_detail";
+            this.pr_detail.Name = "pr_detail";
+            this.pr_detail.Visible = false;
+            this.pr_detail.Width = 80;
+            // 
+            // mb_bgcode
+            // 
+            this.mb_bgcode.HeaderText = "不良代码组编号";
+            this.mb_bgcode.Name = "mb_bgcode";
+            this.mb_bgcode.Visible = false;
+            this.mb_bgcode.Width = 80;
+            // 
+            // mb_badcode
+            // 
+            this.mb_badcode.HeaderText = "不良代码编号";
+            this.mb_badcode.Name = "mb_badcode";
+            this.mb_badcode.Width = 80;
+            // 
+            // AddBad
+            // 
+            this.AddBad.HeaderText = "";
+            this.AddBad.Image = global::UAS_MES.Properties.Resources.plus;
+            this.AddBad.Name = "AddBad";
+            this.AddBad.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.AddBad.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.AddBad.Width = 20;
+            // 
+            // cm_soncode
+            // 
+            this.cm_soncode.DataPropertyName = "cm_soncode";
+            this.cm_soncode.HeaderText = "子件编号";
+            this.cm_soncode.Name = "cm_soncode";
+            // 
+            // cm_barcode
+            // 
+            this.cm_barcode.DataPropertyName = "cm_barcode";
+            this.cm_barcode.HeaderText = "物料批号";
+            this.cm_barcode.Name = "cm_barcode";
+            // 
+            // New_BarCode
+            // 
+            this.New_BarCode.HeaderText = "新批号";
+            this.New_BarCode.Name = "New_BarCode";
+            // 
+            // qqqqq
+            // 
+            this.qqqqq.HeaderText = "";
+            this.qqqqq.Name = "qqqqq";
+            this.qqqqq.Width = 5;
             // 
             // deccount
             // 
@@ -258,70 +337,6 @@
             this.OperateResult.TabIndex = 172;
             this.OperateResult.Text = "";
             // 
-            // Choose
-            // 
-            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose.HeaderText = "拆解更料";
-            this.Choose.Name = "Choose";
-            this.Choose.Width = 60;
-            // 
-            // Column1
-            // 
-            this.Column1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Column1.HeaderText = "拆解";
-            this.Column1.Name = "Column1";
-            this.Column1.Width = 40;
-            // 
-            // cm_id
-            // 
-            this.cm_id.DataPropertyName = "cm_id";
-            this.cm_id.HeaderText = "cm_id";
-            this.cm_id.Name = "cm_id";
-            this.cm_id.Width = 80;
-            // 
-            // pr_detail
-            // 
-            this.pr_detail.DataPropertyName = "pr_detail";
-            this.pr_detail.HeaderText = "pr_detail";
-            this.pr_detail.Name = "pr_detail";
-            this.pr_detail.Width = 80;
-            // 
-            // mb_bgcode
-            // 
-            this.mb_bgcode.HeaderText = "不良代码组编号";
-            this.mb_bgcode.Name = "mb_bgcode";
-            // 
-            // mb_badcode
-            // 
-            this.mb_badcode.HeaderText = "不良代码编号";
-            this.mb_badcode.Name = "mb_badcode";
-            // 
-            // AddBad
-            // 
-            this.AddBad.HeaderText = "";
-            this.AddBad.Image = global::UAS_MES.Properties.Resources.plus;
-            this.AddBad.Name = "AddBad";
-            this.AddBad.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.AddBad.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.AddBad.Width = 20;
-            // 
-            // cm_soncode
-            // 
-            this.cm_soncode.DataPropertyName = "cm_soncode";
-            this.cm_soncode.HeaderText = "子件编号";
-            this.cm_soncode.Name = "cm_soncode";
-            // 
-            // cm_barcode
-            // 
-            this.cm_barcode.DataPropertyName = "cm_barcode";
-            this.cm_barcode.HeaderText = "物料批号";
-            this.cm_barcode.Name = "cm_barcode";
-            // 
-            // New_BarCode
-            // 
-            this.New_BarCode.HeaderText = "新批号";
-            this.New_BarCode.Name = "New_BarCode";
-            // 
             // Make_Decompose
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -372,9 +387,9 @@
         private CustomControl.ValueLabel.ValueLabel pr_name;
         private CustomControl.ValueLabel.ValueLabel ms_makecode;
         private CustomControl.ValueLabel.ValueLabel deccount;
-        private CustomControl.DataGrid_View.DataGridViewWithSerialNum LabelDataGridView;
+        private CustomControl.DataGrid_View.DataGridViewWithCheckBox LabelDataGridView;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
-        private System.Windows.Forms.DataGridViewCheckBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn Choose2;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
         private System.Windows.Forms.DataGridViewTextBoxColumn mb_bgcode;
@@ -383,5 +398,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_soncode;
         private System.Windows.Forms.DataGridViewTextBoxColumn cm_barcode;
         private System.Windows.Forms.DataGridViewTextBoxColumn New_BarCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn qqqqq;
     }
 }

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -56,12 +56,11 @@ namespace UAS_MES.Make
                     sql.Append("select ms_id,ms_status,ms_makecode,ms_prodcode,pr_detail ||',' || pr_spec pr_name ,ms_sncode from makeserial left join product on pr_code=ms_prodcode where ms_id='" + ms_id + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     BaseUtil.SetFormValue(this.Controls, dt);
-                    sql.Clear();
-                    sql.Append("");
+                    LoadData();
                 }
                 else {
                     ms_id = null;
-                    OperateResult.AppendText(">>序列号不存在\n",Color.Red);
+                    OperateResult.AppendText(">>序列号"+ms_sncode.Text+"不存在\n",Color.Red);
                     sn_code.Text = "";
                     BaseUtil.CleanForm(this);
                     sn_code.Focus();
@@ -74,12 +73,17 @@ namespace UAS_MES.Make
         private void LoadData()
         {
            //如果没有任何筛选条件直接选取productlabel的数据
-           sql.Clear();
-           sql.Append("select la_id,pl_labelname,pl_labelurl,pl_labeltype,pl_isdefault,pl_prodcode,pl_id,pl_labelcode,pl_detno,pl_labelsoft,pr_detail,pr_spec,");
-           sql.Append("pr_code from productlabel left join product on pl_prodcode=pr_code left join label on pl_labelcode=la_code");
-           dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");         
-           BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt);
-           string Field = BaseUtil.GetGridViewSelectContent(LabelDataGridView);
+            sql.Clear();
+            sql.Append("select cm_sncode,cm_maprodcode,cm_id,cm_soncode,cm_barcode,pr_detail from craftmaterial left join product on pr_code=cm_soncode where");
+            sql.Append(" cm_sncode='" + ms_sncode.Text + "' and cm_maprodcode='" + ms_prodcode.Text + "' and  nvl(cm_status,0)='0'");
+            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+            if (dt.Rows.Count > 0)
+            {
+                BaseUtil.FillDgvWithDataTable(LabelDataGridView, dt);
+            }
+            else {
+                OperateResult.AppendText(">>序列号"+sn_code.Text+"无上料数据\n", Color.Red);              
+            }
         }
 
 
@@ -88,6 +92,45 @@ namespace UAS_MES.Make
             asc.controlAutoSize(this);
         }
 
-     
+        private void LabelDataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+          
+        }
+
+        private void LabelDataGridView_CellClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (LabelDataGridView.Columns[e.ColumnIndex].HeaderText == "拆解更料")
+            {
+                if (LabelDataGridView.Rows[e.RowIndex].Cells["Choose2"].Value != null)
+                {
+                    if (LabelDataGridView.Rows[e.RowIndex].Cells["Choose2"].Value is Boolean)
+                    {
+                        LabelDataGridView.Rows[e.RowIndex].Cells["Choose2"].Value = 1;
+                    }
+                    if (LabelDataGridView.Rows[e.RowIndex].Cells["Choose2"].Value is int)
+                    {
+                        LabelDataGridView.Rows[e.RowIndex].Cells["Choose2"].Value = 0;
+                    }
+                }
+            }
+            else if (LabelDataGridView.Columns[e.ColumnIndex].HeaderText == "拆解")
+            {
+                if (LabelDataGridView.Rows[e.RowIndex].Cells["Choose"].Value != null)
+                {
+                    if (LabelDataGridView.Rows[e.RowIndex].Cells["Choose"].Value is Boolean)
+                    {
+                        LabelDataGridView.Rows[e.RowIndex].Cells["Choose"].Value = 1;
+                    }
+                    if (LabelDataGridView.Rows[e.RowIndex].Cells["Choose"].Value is int)
+                    {
+                        LabelDataGridView.Rows[e.RowIndex].Cells["Choose"].Value = 0;
+                    }
+                }
+            }
+            else if (LabelDataGridView.Columns[e.ColumnIndex].Name == "AddBad")
+            {
+                MessageBox.Show("点击");
+            }
+        }
     }
 }

UAS-MES/FunctionCode/Make/Make_Decompose.resx

@@ -117,7 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="Choose2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="cm_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -144,6 +144,9 @@
   <metadata name="New_BarCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="qqqqq.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Close.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>