修改界面大小，OQC提示语

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -40,9 +40,9 @@ namespace UAS_MES.Make
         private void Make_ColorBoxLabelPrint_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
-            lbl = new ApplicationClass();
             sncode.Focus();
             asc.controllInitializeSize(this);
+            lbl = new ApplicationClass();
         }
         private void sn_code_KeyDown(object sender, KeyEventArgs e)
         {

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -49,9 +49,9 @@ namespace UAS_MES.Make
         private void 标签打印_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
-            lbl = new ApplicationClass();
             code.Focus();
             asc.controllInitializeSize(this);
+            lbl = new ApplicationClass();
         }
 
         private void sn_code_KeyDown(object sender, KeyEventArgs e)

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

@@ -663,17 +663,17 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.彩盒称重_FormClosing);
             this.Load += new System.EventHandler(this.彩盒上料打印_Load);
             this.SizeChanged += new System.EventHandler(this.彩盒称重_SizeChanged);
-            this.panel6.ResumeLayout(false);
+            this.panel6.ResumeLayout(true);
             this.panel6.PerformLayout();
-            this.panel4.ResumeLayout(false);
+            this.panel4.ResumeLayout(true);
             this.panel4.PerformLayout();
-            this.panel3.ResumeLayout(false);
+            this.panel3.ResumeLayout(true);
             this.panel3.PerformLayout();
-            this.panel2.ResumeLayout(false);
+            this.panel2.ResumeLayout(true);
             this.panel2.PerformLayout();
-            this.panel1.ResumeLayout(false);
+            this.panel1.ResumeLayout(true);
             this.panel1.PerformLayout();
-            this.ResumeLayout(false);
+            this.ResumeLayout(true);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_FuselageLabelPrint.cs

@@ -51,9 +51,9 @@ namespace UAS_MES.Make
         private void Make_FuselageLabelPrint_Load(object sender, EventArgs e)
         {
             dh = new DataHelper();
-            lbl = new ApplicationClass();
             sncode.Focus();
             asc.controllInitializeSize(this);
+            lbl = new ApplicationClass();
         }
 
         private void sn_code_KeyDown(object sender, KeyEventArgs e)

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

@@ -563,7 +563,6 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSize = true;
             this.ClientSize = new System.Drawing.Size(1359, 760);
             this.Controls.Add(this.pa_code);
             this.Controls.Add(this.label2);

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

@@ -190,7 +190,7 @@
             this.bc_name_label.AutoSize = true;
             this.bc_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_name_label.ForeColor = System.Drawing.Color.Black;
-            this.bc_name_label.Location = new System.Drawing.Point(534, 191);
+            this.bc_name_label.Location = new System.Drawing.Point(541, 190);
             this.bc_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_name_label.Name = "bc_name_label";
             this.bc_name_label.Size = new System.Drawing.Size(92, 27);
@@ -251,7 +251,7 @@
             this.nr_name_label.AutoSize = true;
             this.nr_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_name_label.ForeColor = System.Drawing.Color.Black;
-            this.nr_name_label.Location = new System.Drawing.Point(534, 244);
+            this.nr_name_label.Location = new System.Drawing.Point(541, 243);
             this.nr_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.nr_name_label.Name = "nr_name_label";
             this.nr_name_label.Size = new System.Drawing.Size(92, 27);
@@ -287,7 +287,7 @@
             this.mbr_solution_label.AutoSize = true;
             this.mbr_solution_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_solution_label.ForeColor = System.Drawing.Color.Black;
-            this.mbr_solution_label.Location = new System.Drawing.Point(534, 298);
+            this.mbr_solution_label.Location = new System.Drawing.Point(541, 297);
             this.mbr_solution_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mbr_solution_label.Name = "mbr_solution_label";
             this.mbr_solution_label.Size = new System.Drawing.Size(92, 27);
@@ -551,7 +551,7 @@
             this.NewRepairInf.Name = "NewRepairInf";
             this.NewRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewRepairInf.NormalImage")));
             this.NewRepairInf.Power = null;
-            this.NewRepairInf.Size = new System.Drawing.Size(131, 30);
+            this.NewRepairInf.Size = new System.Drawing.Size(115, 30);
             this.NewRepairInf.TabIndex = 112;
             this.NewRepairInf.Tag = "IfWrite";
             this.NewRepairInf.Text = "新增维修信息";
@@ -571,7 +571,7 @@
             this.SaveRepairInf.Name = "SaveRepairInf";
             this.SaveRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("SaveRepairInf.NormalImage")));
             this.SaveRepairInf.Power = null;
-            this.SaveRepairInf.Size = new System.Drawing.Size(131, 30);
+            this.SaveRepairInf.Size = new System.Drawing.Size(115, 30);
             this.SaveRepairInf.TabIndex = 111;
             this.SaveRepairInf.Tag = "IfWrite";
             this.SaveRepairInf.Text = "保存维修信息";
@@ -591,7 +591,7 @@
             this.DeleteRepairInf.Name = "DeleteRepairInf";
             this.DeleteRepairInf.NormalImage = ((System.Drawing.Image)(resources.GetObject("DeleteRepairInf.NormalImage")));
             this.DeleteRepairInf.Power = null;
-            this.DeleteRepairInf.Size = new System.Drawing.Size(91, 30);
+            this.DeleteRepairInf.Size = new System.Drawing.Size(76, 30);
             this.DeleteRepairInf.TabIndex = 110;
             this.DeleteRepairInf.Tag = "IfWrite";
             this.DeleteRepairInf.Text = "删除";
@@ -605,7 +605,7 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.mbl_loc.BackColor = System.Drawing.Color.White;
             this.mbl_loc.ID = null;
-            this.mbl_loc.Location = new System.Drawing.Point(337, 373);
+            this.mbl_loc.Location = new System.Drawing.Point(349, 373);
             this.mbl_loc.Margin = new System.Windows.Forms.Padding(4);
             this.mbl_loc.Name = "mbl_loc";
             this.mbl_loc.Power = null;
@@ -645,7 +645,7 @@
             this.mbc_component.BackColor = System.Drawing.Color.White;
             this.mbc_component.Enabled = false;
             this.mbc_component.ID = null;
-            this.mbc_component.Location = new System.Drawing.Point(337, 299);
+            this.mbc_component.Location = new System.Drawing.Point(350, 299);
             this.mbc_component.Margin = new System.Windows.Forms.Padding(4);
             this.mbc_component.Name = "mbc_component";
             this.mbc_component.Power = null;
@@ -703,7 +703,7 @@
             this.nrg_name.BackColor = System.Drawing.Color.White;
             this.nrg_name.Enabled = false;
             this.nrg_name.ID = null;
-            this.nrg_name.Location = new System.Drawing.Point(337, 248);
+            this.nrg_name.Location = new System.Drawing.Point(350, 248);
             this.nrg_name.Margin = new System.Windows.Forms.Padding(4);
             this.nrg_name.Name = "nrg_name";
             this.nrg_name.Power = null;
@@ -742,7 +742,7 @@
             this.bg_name.Enabled = false;
             this.bg_name.ForeColor = System.Drawing.Color.Red;
             this.bg_name.ID = null;
-            this.bg_name.Location = new System.Drawing.Point(337, 192);
+            this.bg_name.Location = new System.Drawing.Point(350, 192);
             this.bg_name.Margin = new System.Windows.Forms.Padding(4);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
@@ -875,7 +875,7 @@
             this.NewBadCode.Name = "NewBadCode";
             this.NewBadCode.NormalImage = ((System.Drawing.Image)(resources.GetObject("NewBadCode.NormalImage")));
             this.NewBadCode.Power = null;
-            this.NewBadCode.Size = new System.Drawing.Size(131, 30);
+            this.NewBadCode.Size = new System.Drawing.Size(115, 30);
             this.NewBadCode.TabIndex = 60;
             this.NewBadCode.Tag = "IfWrite";
             this.NewBadCode.Text = "新增不良代码";
@@ -890,7 +890,7 @@
             this.SaveBadLocation.Enabled = false;
             this.SaveBadLocation.Image = null;
             this.SaveBadLocation.IsShowBorder = true;
-            this.SaveBadLocation.Location = new System.Drawing.Point(510, 371);
+            this.SaveBadLocation.Location = new System.Drawing.Point(513, 371);
             this.SaveBadLocation.Margin = new System.Windows.Forms.Padding(4);
             this.SaveBadLocation.MoveImage = ((System.Drawing.Image)(resources.GetObject("SaveBadLocation.MoveImage")));
             this.SaveBadLocation.Name = "SaveBadLocation";
@@ -1009,14 +1009,14 @@
             this.Text = "维修作业";
             this.Load += new System.EventHandler(this.维修作业_Load);
             this.SizeChanged += new System.EventHandler(this.Make_Repair_SizeChanged);
-            this.panel2.ResumeLayout(true);
+            this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LocationSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.ComponentSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbp_partdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mbl_locdgv)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.RefreshTreeView)).EndInit();
-            this.ResumeLayout(true);
+            this.ResumeLayout(false);
             this.PerformLayout();
 
         }

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -310,9 +310,9 @@ namespace UAS_MES.Make
             if (ms_sncode.Text != "")
             {
                 //判断是否有无法维修的记录
-                int ScrapNum = int.Parse(dh.getFieldDataByCondition("makebad", "count(0) cn", "mb_sncode='" + ms_sncode.Text + "'").ToString());
+                int ScrapNum = int.Parse(dh.getFieldDataByCondition("makebadreason left join makebad on mb_id=mbr_mbid", "count(0) cn", "mb_sncode='" + ms_sncode.Text + "'").ToString());
                 if (ScrapNum == 0)
-                    OperatResult.AppendText(">>" + ms_sncode.Text + "存在无法维修的记录才允许报废\n", Color.Red);
+                    OperatResult.AppendText(">>" + ms_sncode.Text + "报废必须维护不良原因\n", Color.Red);
                 else
                 {
                     string confirm = MessageBox.Show(this.ParentForm, "此操作不可撤销，是否确认报废", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Asterisk).ToString();

UAS-MES/FunctionCode/Make/Make_Repair.resx

@@ -126,6 +126,12 @@
   <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="mbp_part1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="mbl_loc1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

UAS-MES/FunctionCode/OQC/OQC_SamplingDataCollection.cs

@@ -281,7 +281,7 @@ namespace UAS_MES.OQC
                     //记录操作日志
                     LogicHandler.InsertMakeProcess(ms_sncode.Text, ob_makecode.Text, User.UserSourceCode, "批结果判定", "批次通过", User.UserName);
                     GetBatch.PerformClick();
-                    OperateResult.AppendText(">>通过批成功\n", Color.Green);
+                    OperateResult.AppendText(">>"+ob_checkno.Text+"通过批成功\n", Color.Green);
                 }
                 else
                     OperateResult.AppendText(">>当前批次不合格数为" + ob_ngqty.Text + ",大于最大不合格允通过数" + ob_maxngacceptqty.Text + "\n", Color.Red);

UAS-MES/Main.Designer.cs

@@ -87,7 +87,7 @@
             this.name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.name_label.AutoSize = true;
             this.name_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.name_label.Location = new System.Drawing.Point(8, 8);
+            this.name_label.Location = new System.Drawing.Point(8, 10);
             this.name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.name_label.Name = "name_label";
             this.name_label.Size = new System.Drawing.Size(43, 20);
@@ -141,7 +141,7 @@
             this.inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_name.AutoSize = true;
             this.inf_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_name.Location = new System.Drawing.Point(85, 8);
+            this.inf_name.Location = new System.Drawing.Point(85, 10);
             this.inf_name.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_name.Name = "inf_name";
             this.inf_name.Size = new System.Drawing.Size(0, 20);
@@ -152,7 +152,7 @@
             this.Inf_linecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode.AutoSize = true;
             this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode.Location = new System.Drawing.Point(542, 9);
+            this.Inf_linecode.Location = new System.Drawing.Point(542, 10);
             this.Inf_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode.Name = "Inf_linecode";
             this.Inf_linecode.Size = new System.Drawing.Size(0, 20);
@@ -163,7 +163,7 @@
             this.inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_source.AutoSize = true;
             this.inf_source.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_source.Location = new System.Drawing.Point(753, 9);
+            this.inf_source.Location = new System.Drawing.Point(753, 10);
             this.inf_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_source.Name = "inf_source";
             this.inf_source.Size = new System.Drawing.Size(0, 20);
@@ -174,7 +174,7 @@
             this.inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_db.AutoSize = true;
             this.inf_db.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_db.Location = new System.Drawing.Point(1030, 9);
+            this.inf_db.Location = new System.Drawing.Point(1030, 10);
             this.inf_db.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_db.Name = "inf_db";
             this.inf_db.Size = new System.Drawing.Size(0, 20);
@@ -185,7 +185,7 @@
             this.Inf_linecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode_label.AutoSize = true;
             this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode_label.Location = new System.Drawing.Point(461, 9);
+            this.Inf_linecode_label.Location = new System.Drawing.Point(461, 10);
             this.Inf_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode_label.Name = "Inf_linecode_label";
             this.Inf_linecode_label.Size = new System.Drawing.Size(43, 20);
@@ -197,7 +197,7 @@
             this.db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.db_label.AutoSize = true;
             this.db_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.db_label.Location = new System.Drawing.Point(935, 9);
+            this.db_label.Location = new System.Drawing.Point(935, 10);
             this.db_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.db_label.Name = "db_label";
             this.db_label.Size = new System.Drawing.Size(58, 20);
@@ -209,7 +209,7 @@
             this.Inf_source_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source_label.AutoSize = true;
             this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source_label.Location = new System.Drawing.Point(673, 9);
+            this.Inf_source_label.Location = new System.Drawing.Point(673, 10);
             this.Inf_source_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_source_label.Name = "Inf_source_label";
             this.Inf_source_label.Size = new System.Drawing.Size(43, 20);

UAS-MES/PublicMethod/LogicHandler.cs

@@ -725,7 +725,7 @@ namespace UAS_MES.PublicMethod
                         }
                         else oErrorMessage = "自动生成的抽检批次号不允许在该页面操作,或者该抽检批次号不是在录入状态";
                     }
-                    else oErrorMessage = "该送检批次不存在";
+                    else oErrorMessage = "抽检批次" + iCheckNo + "不存在";
                     break;
                 case "OQCPLANMAINTAIN":
                     sql.Clear();
@@ -776,7 +776,7 @@ namespace UAS_MES.PublicMethod
                             oErrorMessage = "只有待检验的批次才允许维护抽样计划";
                     }
                     else
-                        oErrorMessage = "该抽检批次不存在";
+                        oErrorMessage = "抽检批次"+iCheckNo+"不存在";
                     break;
                 case "OQCDATACOLLECTION":
                     sql.Clear();
@@ -792,7 +792,7 @@ namespace UAS_MES.PublicMethod
                     }
                     else
                     {
-                        oErrorMessage = "抽检批次不存在";
+                        oErrorMessage = "抽检批次" + iCheckNo + "不存在";
                     }
                     break;
                 case "OQCRESULTDETERMINE":
@@ -808,7 +808,7 @@ namespace UAS_MES.PublicMethod
                     Form = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
                     if (Form.Rows.Count == 0)
                     {
-                        oErrorMessage = "该抽检批次不存在";
+                        oErrorMessage = "抽检批次" + iCheckNo + "不存在";
                     }
                     break;
                 default: