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

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -33,12 +33,12 @@ namespace UAS_MES.OQC
             ob_projectcode.SetValueField = new string[] { "ob_projectcode" };
             ob_projectcode.FormName = Name;
 
-            ob_aqlcode.TableName = "QUA_AQL";
-            ob_aqlcode.DBTitle = "抽样标准查询";
-            ob_aqlcode.SelectField = "AL_CODE  # 流水编号,AL_NAME # 检验标准名称";
-            ob_aqlcode.SetValueField = new string[] { "ob_aqlcode" };
-            ob_aqlcode.FormName = Name;
-            ob_aqlcode.Condition = "al_statuscode='AUDITED'";
+            al_code.TableName = "QUA_AQL";
+            al_code.DBTitle = "抽样标准查询";
+            al_code.SelectField = "AL_CODE  # 流水编号,AL_NAME # 检验标准名称";
+            al_code.SetValueField = new string[] { "ob_aqlcode" };
+            al_code.FormName = Name;
+            al_code.Condition = "al_statuscode='AUDITED'";
             ChooseAll.ChooseAll(CheckTypeDGV);
         }
 
@@ -73,8 +73,8 @@ namespace UAS_MES.OQC
                         ob_maxngacceptqty.Text = "";
                         BaseUtil.SetFormValue(Controls, dt[0]);
                         BaseUtil.FillDgvWithDataTable(CheckTypeDGV, dt[1]);
-                        ob_aqlcode.Text = "";
-                        ob_aqlcode.Text = dt[0].Rows[0]["ob_aqlcode"].ToString();
+                        al_code.Text = "";
+                        al_code.Text = dt[0].Rows[0]["ob_aqlcode"].ToString();
                     }
                     else
                     {
@@ -163,7 +163,7 @@ namespace UAS_MES.OQC
 
         private void Save_Click(object sender, EventArgs e)
         {
-            if (ob_aqlcode.Text != "" || ob_maxngacceptqty.Text != "")
+            if (al_code.Text != "" || ob_maxngacceptqty.Text != "")
             {
                 if (Checkob_maxngacceptqty())
                 {
@@ -185,7 +185,7 @@ namespace UAS_MES.OQC
             }
             else
             {
-                int result = (int)dh.ExecuteSql("update OQCBatch set ob_projectcode='" + ob_projectcode.Text + "',ob_remark = '" + ob_remark.Text + "',ob_aqlcode='" + ob_aqlcode.Text + "',ob_maxngacceptqty='" + ob_maxngacceptqty.Text + "',ob_actsampleqty='" + ob_sampleqty.Text + "' where ob_checkno='" + ob_checkno.Text + "' ", "update");
+                int result = (int)dh.ExecuteSql("update OQCBatch set ob_projectcode='" + ob_projectcode.Text + "',ob_remark = '" + ob_remark.Text + "',ob_aqlcode='" + al_code.Text + "',ob_maxngacceptqty='" + ob_maxngacceptqty.Text + "',ob_actsampleqty='" + ob_sampleqty.Text + "' where ob_checkno='" + ob_checkno.Text + "' ", "update");
                 return result > 0;
             }
         }
@@ -215,10 +215,10 @@ namespace UAS_MES.OQC
 
         private void ob_aqlcode_UserControlTextChanged(object sender, EventArgs e)
         {
-            if (ob_aqlcode.Text != "")
+            if (al_code.Text != "")
             {
                 bool Find = false;
-                dt = (DataTable)dh.ExecuteSql("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0)ad_maxngacceptqty,ad_qty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where al_code='" + ob_aqlcode.Text + "'", "select");
+                dt = (DataTable)dh.ExecuteSql("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0)ad_maxngacceptqty,ad_qty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where al_code='" + al_code.Text + "'", "select");
                 if (dt.Rows.Count > 0)
                 {
                     for (int i = 0; i < dt.Rows.Count; i++)

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

@@ -46,7 +46,7 @@
             this.ob_sampleqty = new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxNumOnly();
             this.ob_sampleqty_label = new System.Windows.Forms.Label();
             this.ob_remark = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.ob_aqlcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
+            this.al_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.pr_detail = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_projectcode = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.ob_status = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
@@ -213,7 +213,7 @@
             this.panel1.Controls.Add(this.ob_sampleqty_label);
             this.panel1.Controls.Add(this.ob_remark);
             this.panel1.Controls.Add(this.ob_remark_label);
-            this.panel1.Controls.Add(this.ob_aqlcode);
+            this.panel1.Controls.Add(this.al_code);
             this.panel1.Controls.Add(this.ob_aqlcode_label);
             this.panel1.Controls.Add(this.ob_maxacceptqty_label);
             this.panel1.Location = new System.Drawing.Point(33, 158);
@@ -275,25 +275,25 @@
             this.ob_remark.TabIndex = 173;
             this.ob_remark.Tag = "NoAuto";
             // 
-            // ob_aqlcode
-            // 
-            this.ob_aqlcode.AllPower = null;
-            this.ob_aqlcode.Caller = null;
-            this.ob_aqlcode.Condition = null;
-            this.ob_aqlcode.DBTitle = null;
-            this.ob_aqlcode.FormName = null;
-            this.ob_aqlcode.Location = new System.Drawing.Point(101, 25);
-            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.ob_aqlcode.Name = "ob_aqlcode";
-            this.ob_aqlcode.Power = null;
-            this.ob_aqlcode.SelectField = null;
-            this.ob_aqlcode.SetValueField = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(226, 26);
-            this.ob_aqlcode.TabIndex = 191;
-            this.ob_aqlcode.TableName = null;
-            this.ob_aqlcode.Tag = "AL_CODE";
-            this.ob_aqlcode.TextBoxEnable = false;
-            this.ob_aqlcode.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ob_aqlcode_UserControlTextChanged);
+            // al_code
+            // 
+            this.al_code.AllPower = null;
+            this.al_code.Caller = null;
+            this.al_code.Condition = null;
+            this.al_code.DBTitle = null;
+            this.al_code.FormName = null;
+            this.al_code.Location = new System.Drawing.Point(101, 25);
+            this.al_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.al_code.Name = "al_code";
+            this.al_code.Power = null;
+            this.al_code.SelectField = null;
+            this.al_code.SetValueField = null;
+            this.al_code.Size = new System.Drawing.Size(226, 26);
+            this.al_code.TabIndex = 191;
+            this.al_code.TableName = null;
+            this.al_code.Tag = "ob_aqlcode";
+            this.al_code.TextBoxEnable = false;
+            this.al_code.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox.OnTextChange(this.ob_aqlcode_UserControlTextChanged);
             // 
             // pr_detail
             // 
@@ -652,7 +652,7 @@
         private CustomControl.TextBoxWithIcon.SearchTextBox ob_projectcode;
         private System.Windows.Forms.Label pr_detail_label;
         private CustomControl.TextBoxWithIcon.EnterTextBox pr_detail;
-        private CustomControl.TextBoxWithIcon.SearchTextBox ob_aqlcode;
+        private CustomControl.TextBoxWithIcon.SearchTextBox al_code;
         private CustomControl.TextBoxWithIcon.EnterTextBox ob_status;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label ob_sampleqty_label;