修改放大镜，OQC默认保存AQL的最大不合格允许通过数

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.cs

@@ -276,30 +276,31 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                         fields.Add(field[i]);
                 }
                 //将查询到的结果返回界面
-                string sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Tag + "='" + TextBox.Text.ToUpper() + "'";
+                string sql = "select " + BaseUtil.AddField(fields.ToArray()) + " from " + tableName + " where " + Name + "='" + TextBox.Text.ToUpper() + "'";
                 if (condition != null)
                 {
                     sql += " and " + condition;
                 }
-                 dt = (DataTable)dh.ExecuteSql(sql, "select");
-                FormCollection fmCollection = Application.OpenForms;
-                ControlCollection controls = (ControlCollection)fmCollection[FormName].Controls;
-                if (dt.Rows.Count > 0)
-                {
-                    for (int i = 0; i < dt.Columns.Count; i++)
-                    {
-                        fillControl( i, fmCollection[FormName]);
-                    }
-                    LeaveFindData = true;
-                }
-                else
-                    LeaveFindData = false;
+                dt = (DataTable)dh.ExecuteSql(sql, "select");
+                ReturnDataToFrom();
+                //FormCollection fmCollection = Application.OpenForms;
+                //ControlCollection controls = (ControlCollection)fmCollection[FormName].Controls;
+                //if (dt.Rows.Count > 0)
+                //{
+                //    for (int i = 0; i < dt.Columns.Count; i++)
+                //    {
+                //        fillControl(i, fmCollection[FormName]);
+                //    }
+                //    LeaveFindData = true;
+                //}
+                //else
+                //    LeaveFindData = false;
                 //不允许工单号为空的情况
                 LockCheckBox.Checked = true;
             }
         }
 
-        private void fillControl( int i, Control ct)
+        private void fillControl(int i, Control ct)
         {
             for (int j = 0; j < setValueField.Length; j++)
             {
@@ -308,7 +309,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                     Control.ControlCollection controls = ct.Controls;
                     for (int k = 0; k < ct.Controls.Count; k++)
                     {
-                        fillControl( i, controls[k]);
+                        fillControl(i, controls[k]);
                     }
                 }
                 else
@@ -323,7 +324,6 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         {
             SearchIconClick?.Invoke(sender, new EventArgs());
             db = new DbFind(Name, tableName, selectField, setValueField, caller, formName, condition);
-            db.FormClosing += Db_FormClosing;
             db.Text = DBTitle1;
             LogManager.DoLog("DbFind查询,发起窗口【" + formName + "】,查询表【" + tableName + "】,字段" + selectField + ",条件" + condition);
             if (db.IsAbleDbFind1)
@@ -336,10 +336,10 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             }
         }
 
-        private void Db_FormClosing(object sender, FormClosingEventArgs e)
+        private void ReturnDataToFrom()
         {
             ReturnData1 = dt;
-            DbChange?.Invoke(sender, new EventArgs());
+            DbChange?.Invoke(new object(), new EventArgs());
         }
 
         public void TextBox_Leave(object sender, EventArgs e)
@@ -358,7 +358,5 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         {
             TextBox.Width = this.Width - Search_Icon.Width - 3;
         }
-
-    
     }
 }

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -261,7 +261,6 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             SearchIconClick?.Invoke(sender, new EventArgs());
             DbFind db = new DbFind(Name, tableName, selectField, setValueField, caller, formName, condition);
             db.Text = DBTitle1;
-            db.FormClosing += Db_FormClosing;
             LogManager.DoLog("DbFind查询,发起窗口【" + formName + "】,查询表【" + tableName + "】,字段" + selectField + ",条件" + condition);
             if (db.IsAbleDbFind1)
             {
@@ -278,10 +277,10 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        public void Db_FormClosing(object sender, FormClosingEventArgs e)
+        public void ReturnDataToForm()
         {
             returnData = dt;
-            DbChange?.Invoke(sender, new EventArgs());
+            DbChange?.Invoke(new object(), new EventArgs());
         }
 
         private void TextBox_Enter(object sender, EventArgs e)
@@ -318,8 +317,6 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             TextBox.Width = this.Width - Search_Icon.Width - 3;
         }
 
-
-
         private void fillControl(int i, Control ct)
         {
             for (int j = 0; j < setValueField.Length; j++)
@@ -333,7 +330,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                     }
                 }
                 else
-                {               
+                {
                     if ((setValueField[j] == dt.Columns[i].Caption.ToLower() || setValueField[j] == dt.Columns[i].ColumnName.ToLower() || setValueField[j].Contains(dt.Columns[i].Caption.ToLower()) || (ct != null && ct.Tag != null && ct.Tag.ToString() == dt.Columns[i].Caption.ToLower())) && ct.Name.ToString() == setValueField[j])
                         ct.Text = dt.Rows[0][dt.Columns[i].ColumnName].ToString();
                 }
@@ -360,7 +357,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                     sql += " and " + condition;
                 }
                 dt = (DataTable)dh.ExecuteSql(sql, "select");
-                returnData = dt;
+                ReturnDataToForm();
                 //先判断DataTable里面是否有这个字段，然后从打开的窗口里面去获取到这个Form，从Form中的指定Panel获取到指定字段的控件
                 //if (dt.Rows.Count > 0)
                 //{

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -73,7 +73,7 @@ namespace UAS_MES.Make
         private void Ma_code_DbChange(object sender, EventArgs e)
         {
             Dbfind = ma_code.ReturnData;
-            BaseUtil.SetFormValue(this.Controls,Dbfind);
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
         }
 
         /// <summary>
@@ -517,7 +517,7 @@ namespace UAS_MES.Make
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             if (dt.Rows.Count > 0)
             {
-                ob_sendqty.Text = dh.getFieldDataByCondition("oqcbatch", "sum(ob_nowcheckqty)","ob_makecode='"+ma_code.Text+"' and  ob_status<>'ENTERING'").ToString();
+                ob_sendqty.Text = dh.getFieldDataByCondition("oqcbatch", "sum(ob_nowcheckqty)", "ob_makecode='" + ma_code.Text + "' and  ob_status<>'ENTERING'").ToString();
                 ob_batchqty.Text = dt.Rows[0]["ob_batchqty"].ToString();
                 ob_nowcheckqty.Text = dt.Rows[0]["ob_nowcheckqty"].ToString();
                 ob_checkno.Text = dt.Rows[0]["ob_checkno"].ToString();
@@ -526,7 +526,7 @@ namespace UAS_MES.Make
                 if (nowcheckqty == batchqty)
                 {
                     ob_nowcheckqty.ForeColor = Color.Red;
-                    OperateResult.AppendText(">>当前采集数量已达到送检数量\n",Color.Red);
+                    OperateResult.AppendText(">>当前采集数量已达到送检数量\n", Color.Red);
                 }
             }
             else
@@ -599,11 +599,18 @@ namespace UAS_MES.Make
             }
         }
 
+        /// <summary>
+        /// 工单变化修改数量
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void ma_code_UserControlTextChanged(object sender, EventArgs e)
         {
-            //加载不良信息
-            LoadCollectedNum();
-            LoadCheckQTY();
+            if (ma_code.Text.Length > 4)
+            {
+                LoadCollectedNum();
+                LoadCheckQTY();
+            }
         }
     }
 }

UAS-MES/FunctionCode/OQC/OQC_BatchResultJudge.cs

@@ -148,8 +148,8 @@ namespace UAS_MES.OQC
                     OperateResult.AppendText(">>判退批成功\n", Color.Green);
                     if (ReworkRequire.Checked)
                     {
-                        dh.UpdateByCondition("oqcbatch", "ob_reworkcode='"+ReworkCode+"'", "ob_checkno='"+ob_checkno.Text+"'");
-                        OperateResult.AppendText(">>生成返工需求单"+ReworkCode+"\n", Color.Green);
+                        dh.UpdateByCondition("oqcbatch", "ob_reworkcode='" + ReworkCode + "'", "ob_checkno='" + ob_checkno.Text + "'");
+                        OperateResult.AppendText(">>生成返工需求单" + ReworkCode + "\n", Color.Green);
                     }
                     GetBatch.PerformClick();
                 }
@@ -270,23 +270,18 @@ namespace UAS_MES.OQC
                 if (ob_maxngacceptqty.Text == "")
                 {
                     if (ob_aqlcode.Text == "")
-                        OperateResult.AppendText(">>最大不合格允许通过数为空的时候必须填写维护AQL标准\n", Color.Red);
+                        OperateResult.AppendText(">>AQL标准为空的时候必须填写最大不合格允许通过数\n", Color.Red);
                     else
                     {
-                        dt = (DataTable)dh.ExecuteSql("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0)ad_maxngacceptqty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where al_code='" + ob_aqlcode.Text + "'", "select");
+                        sql.Clear();
+                        sql.Append("select nvl(ad_minqty,0)ad_minqty,nvl(ad_maxqty,0)ad_maxqty,nvl(ad_maxngacceptqty,0) ");
+                        sql.Append("ad_maxngacceptqty from QUA_Aql left join qua_aqldetail on ad_alid=al_id where ");
+                        sql.Append("al_code='" + ob_aqlcode.Text + "' and ad_minqty<='" + ob_nowcheckqty.Text + "' and ad_maxqty>='" + ob_nowcheckqty.Text + "'");
+                        dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                         if (dt.Rows.Count > 0)
                         {
-                            for (int i = 0; i < dt.Rows.Count; i++)
-                            {
-                                int batchqty = int.Parse(ob_nowcheckqty.Text == "" ? "0" : ob_nowcheckqty.Text);
-                                int minqty = int.Parse(dt.Rows[i]["ad_minqty"].ToString());
-                                int maxqty = int.Parse(dt.Rows[i]["ad_maxqty"].ToString());
-                                if (batchqty > minqty && batchqty <= maxqty)
-                                {
-                                    ob_maxngacceptqty.Text = dt.Rows[i]["ad_maxngacceptqty"].ToString();
-                                    return true;
-                                }
-                            }
+                            ob_maxngacceptqty.Text = dt.Rows[0]["ad_maxngacceptqty"].ToString();
+                            return true;
                         }
                     }
                 }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -17,7 +17,7 @@ namespace UAS_MES.OQC
         DataTable dt;
         DataHelper dh;
         string ErrorMessage = "";
-
+        DataTable Dbfind;
         public OQC_PlanMaintain()
         {
             InitializeComponent();
@@ -32,6 +32,7 @@ namespace UAS_MES.OQC
             pr_code.SelectField = "pr_code # 方案编号,pr_name # 方案名称,pr_class # 检验单类型,pr_standard # 方案标准,pr_startdate # 生效日期,pr_enddate #失效日期 ,pr_status # 状态";
             pr_code.SetValueField = new string[] { "ob_projectcode" };
             pr_code.FormName = Name;
+            pr_code.DbChange += Pr_code_DbChange;
 
             al_code.TableName = "QUA_AQL";
             al_code.DBTitle = "抽样标准查询";
@@ -39,9 +40,22 @@ namespace UAS_MES.OQC
             al_code.SetValueField = new string[] { "ob_aqlcode" };
             al_code.FormName = Name;
             al_code.Condition = "al_statuscode='AUDITED'";
+            al_code.DbChange += Al_code_DbChange;
             ChooseAll.ChooseAll(CheckTypeDGV);
         }
 
+        private void Al_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = al_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+        }
+
+        private void Pr_code_DbChange(object sender, EventArgs e)
+        {
+            Dbfind = pr_code.ReturnData;
+            BaseUtil.SetFormValue(this.Controls, Dbfind);
+        }
+
         private void 抽样计划维护_SizeChanged(object sender, EventArgs e)
         {
             asc.controlAutoSize(this);
@@ -185,6 +199,10 @@ namespace UAS_MES.OQC
             }
             else
             {
+                if (ob_maxngacceptqty.Text == "")
+                {
+                    ob_maxngacceptqty.Text = dh.getFieldDataByCondition("QUA_Aql left join qua_aqldetail on ad_alid=al_id", "nvl(ad_maxngacceptqty,0)", "al_code='" + al_code.Text + "' and ad_minqty<='" + ob_nowcheckqty.Text + "' and ad_maxqty>='" + ob_nowcheckqty.Text + "'").ToString();
+                }
                 int result = (int)dh.ExecuteSql("update OQCBatch set ob_projectcode='" + pr_code.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;
             }