修改权限内容，放大镜赋值问题

UAS-MES/CustomControl/AccordionMenu/AccordionMenu.cs

@@ -100,7 +100,8 @@ namespace UAS_MES.CustomControl.AccordionMenu
             for (int i = 0; i < dt.Rows.Count; i++)
             {
                 //在这个Caller范围内的是用户可见的导航
-                Callers += "'" + dt.Rows[i]["ugp_caller"].ToString() + "',";
+           
+                    Callers += "'" + dt.Rows[i]["ugp_caller"].ToString() + "',";
                 //用一个数组记录所有的模块
                 Module[i] = dt.Rows[i]["sn_module"].ToString();
                 if (!Modules.Contains(dt.Rows[i]["sn_module"].ToString()))
@@ -301,7 +302,7 @@ namespace UAS_MES.CustomControl.AccordionMenu
             }
             //如果窗体已存在展示该窗体
             else
-                 tc.SelectTab(item.Name);
+                tc.SelectTab(item.Name);
         }
     }
 }

UAS-MES/CustomControl/TextBoxWithIcon/SearchTextBox.cs

@@ -328,7 +328,6 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
                                 }
                             }
                         }
-                        break;
                     }
                 }
                 if (!groupcontains)

UAS-MES/DbFind.cs

@@ -167,7 +167,6 @@ namespace UAS_MES
                 //先判断DataTable里面是否有这个字段，然后从打开的窗口里面去获取到这个Form，从Form中的指定Panel获取到指定字段的控件
                 FormCollection fmCollection = Application.OpenForms;
                 ControlCollection controls = (ControlCollection)fmCollection[FormName].Controls;
-                MainControl = fmCollection[FormName].Controls[MainField];
                 for (int i = 0; i < dt.Columns.Count; i++)
                 {
                     for (int k = 0; k < controls.Count; k++)
@@ -187,7 +186,6 @@ namespace UAS_MES
                                 }
                             }
                         }
-                        break;
                     }
                 }
                 if (!groupcontains)

UAS-MES/FunctionCode/Make/Make_CollectBTMAC.cs

@@ -33,7 +33,7 @@ namespace UAS_MES.Make
         //判断是否输入BT
         Boolean isMAC = false;
         //打印计数
-        int printcount = 0;
+        int printcount ;
 
         public Make_CollectBTMAC()
         {
@@ -45,6 +45,8 @@ namespace UAS_MES.Make
             sncode.Focus();
             dh = new DataHelper();
             asc.controllInitializeSize(this);
+            printcount = 0;
+          
         }
 
         private void Make_CollectBTMAC_Activated(object sender, EventArgs e)
@@ -64,9 +66,62 @@ namespace UAS_MES.Make
 
         private void deleteButton1_Click(object sender, EventArgs e)
         {
+            isBT = false;
+            isMAC = false;
+            BaseUtil.CleanForm(this);
+            mcd_okqty.Text = printcount + "";
+            mcd_remainqty.Text = 0 + "";
+            OperateResult.AppendText(">>清除完成,请输入SN号\n", Color.Green);
+            sncode.Focus();
+        }
 
+        /// <summary>
+        /// 获取序列号输入，并给界面控件赋值
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void getSocode(object sender,EventArgs e) {
+            string ErrorMessage2;
+            string oMakeCode;
+            //由序列号获取数据
+            if (sncode.Text == "")
+            {
+                OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
+                return;
+            }
+            OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
+            // 获取工单归属工单下一工序是否正确
+            if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
+            {
+                sql.Clear();
+                sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
+                sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
+                sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
+                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                if (dt.Rows.Count > 0)
+                {
+                    BaseUtil.SetFormValue(this.Controls, dt);
+                    dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
+                    OperateResult.AppendText(">>请输入BT\n", Color.Green);
+                    sn_code = sncode.Text;
+                    sncode.Text = "";
+                    isBT = true;
+                    return;
+                }
+                else
+                {
+                    sncode.Text = "";
+                    OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
+                }
+            }
+            else
+            {
+                sncode.Text = "";
+                OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
+            }
         }
 
+
         private void sncode_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
@@ -75,45 +130,7 @@ namespace UAS_MES.Make
                 {
                     if (!isBT)
                     {
-                        //由序列号获取数据
-                        if (sncode.Text == "")
-                        {
-                            OperateResult.AppendText(">>序列号不能为空\n", Color.Red);
-                            return;
-                        }
-                        OperateResult.AppendText("<<" + sncode.Text + "\n", Color.Green);
-                        string ErrorMessage2;
-                        string oMakeCode;
-                        // 获取工单归属工单下一工序是否正确
-                        if (LogicHandler.CheckStepSNAndMacode(ms_makecode.Text, User.UserSourceCode, sncode.Text, User.UserCode, out oMakeCode, out oMsID, out ErrorMessage2))
-                        {
-                            sql.Clear();
-                            sql.Append("select ma_code as ms_makecode,nvl(mcd_okqty,0),ma_prodcode,pr_detail,");
-                            sql.Append("pr_spec,ma_qty - nvl(mcd_inqty, 0) mcd_remainqty from make left join makecraftdetail on ");
-                            sql.Append("mcd_maid=ma_id left join product on pr_code=ma_prodcode where ma_code='" + oMakeCode + "' and mcd_stepcode='" + User.CurrentStepCode + "'");
-                            dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                            if (dt.Rows.Count > 0)
-                            {
-                                BaseUtil.SetFormValue(this.Controls, dt);
-                                dh.UpdateByCondition("makeserial", "ms_currentstepcode = '" + User.CurrentStepCode + "'", "ms_id = '" + oMsID + "'");
-                                OperateResult.AppendText(">>请输入BT\n", Color.Green);
-                                sn_code = sncode.Text;
-                                sncode.Text = "";
-                                isBT = true;
-                                return;
-                            }
-                            else
-                            {
-                                sncode.Text = "";
-                                OperateResult.AppendText(">>序列号" + sncode.Text + "没有对应工序\n", Color.Red);
-                            }
-                        }
-                        else
-                        {
-                            sncode.Text = "";
-                            OperateResult.AppendText("错误" + ErrorMessage2 + "\n", Color.Red);
-                        }
-
+                        getSocode(sender,e);
                     }
                     else
                     //采集BT
@@ -143,9 +160,9 @@ namespace UAS_MES.Make
                             isBT = false;
                             isMAC = true;
                             sncode.Text = "";
-                            sncode.Focus(); 
+                            sncode.Focus();
+                            return;
                         }
-
                     }
                 }
                 else
@@ -175,8 +192,8 @@ namespace UAS_MES.Make
                             dh.UpdateByCondition("makeserial", "ms_mac = '" + sncode.Text + "' ," + "ms_bt = '" + ms_bt + "'", "ms_id = '" + oMsID + "'");
                             ErrorMessage = "BT/MAC采集完成,执行更新";
                             OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
-                            BaseUtil.CleanForm(this);
                             printcount++;
+                            BaseUtil.CleanForm(this);
                             mcd_okqty.Text = printcount + "";
                             mcd_remainqty.Text = 0 + "";
                             isMAC = false;

UAS-MES/FunctionCode/Make/Make_CollectNetCode.cs

@@ -153,6 +153,7 @@ namespace UAS_MES.Make
                 mcd_remainqty.Text = 0 + "";
                 OperateResult.AppendText(">>清除完成，清重新输入SN号\n", Color.Green);
                 isnetcode = false;
+                sncode.Focus();
             }
         }
     }

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -136,7 +136,7 @@ namespace UAS_MES.Make
             ftpOperater ftp = new ftpOperater();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                ftp.Download(dt.Rows[i]["pl_labelname"].ToString());
+                BaseUtil.GetPrintLabel(dt.Rows[i]["pl_labelname"].ToString(), dt.Rows[i]["pl_labelurl"].ToString(), dt.Rows[i]["pl_indate"].ToString());
             }
         }
         private void Make_ColorBoxLabelPrint_Activated(object sender, EventArgs e)

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.cs

@@ -38,8 +38,6 @@ 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)

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

@@ -65,6 +65,7 @@
             this.obd_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ob_checkno = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.ms_sncode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.ChooseAll = new UAS_MES.CustomControl.ButtonUtil.ChooseAllButton();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.CheckTypeDGV)).BeginInit();
@@ -561,11 +562,21 @@
             this.ms_sncode.Tag = "NoAuto";
             this.ms_sncode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.ms_sncode_KeyDown);
             // 
+            // ChooseAll
+            // 
+            this.ChooseAll.Location = new System.Drawing.Point(33, 289);
+            this.ChooseAll.Name = "ChooseAll";
+            this.ChooseAll.Size = new System.Drawing.Size(75, 23);
+            this.ChooseAll.TabIndex = 194;
+            this.ChooseAll.Text = "全选";
+            this.ChooseAll.UseVisualStyleBackColor = true;
+            // 
             // OQC_PlanMaintain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1363, 781);
+            this.Controls.Add(this.ChooseAll);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.pr_detail);
             this.Controls.Add(this.pr_detail_label);
@@ -643,5 +654,6 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn ci_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn ci_kind;
         private System.Windows.Forms.DataGridViewTextBoxColumn oi_sampleqty;
+        private CustomControl.ButtonUtil.ChooseAllButton ChooseAll;
     }
 }

UAS-MES/FunctionCode/OQC/OQC_PlanMaintain.resx

@@ -526,4 +526,19 @@
   <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.cs

@@ -260,6 +260,7 @@ namespace UAS_MES.OQC
                         sncode.Text = "";
                         TempForCheckType.Clear();
                         TempForBadGroup.Clear();
+                        sncode.Focus();
                     }
                     else OperateResult.AppendText(">>含有未通过项请勾选不良明细\n", Color.Red);
                 }

UAS-MES/UAS-MES.csproj

@@ -40,7 +40,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>266</ApplicationRevision>
+    <ApplicationRevision>267</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>