From 8f0d8222efa4e34f593f677680334a5b67f13e3a Mon Sep 17 00:00:00 2001 From: "ruoxing.wang" <88384874@qq.com> Date: Thu, 6 Mar 2025 13:39:56 +0800 Subject: [PATCH] 1111 --- PunchAssemble/PunchAndWeld/BusinessHelper.cs | 10 +- .../PunchAndWeld/DataSouce/ProScreenFunc.cs | 61 +++- PunchAssemble/PunchAndWeld/FrmDoorSill.cs | 57 ++-- PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs | 21 +- PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs | 11 + .../PunchAndWeld/FrmDoorSill_214_2.cs | 17 +- .../FrmDoorSill_214_3.Designer.cs | 299 ++++++++++-------- .../PunchAndWeld/FrmDoorSill_214_3.cs | 47 +-- PunchAssemble/PunchAndWeld/FrmHybridS.cs | 10 + .../PunchAndWeld/FrmInspection_WheelBrow.cs | 10 +- .../PunchAndWeld/FrmLaser.Designer.cs | 72 +++-- PunchAssemble/PunchAndWeld/FrmLaser.cs | 2 +- .../PunchAndWeld/FrmPreNoPlan.Designer.cs | 14 + PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs | 2 +- .../PunchAndWeld/FrmProScreen.Designer.cs | 17 +- PunchAssemble/PunchAndWeld/FrmProScreen.cs | 13 + .../PunchAndWeld/FrmProScreenBumperS.cs | 29 ++ PunchAssemble/PunchAndWeld/FrmProScreenS.cs | 31 ++ .../PunchAndWeld/FrmProScreen_WheelBrow.cs | 7 +- PunchAssemble/PunchAndWeld/Program.cs | 8 +- 20 files changed, 507 insertions(+), 231 deletions(-) diff --git a/PunchAssemble/PunchAndWeld/BusinessHelper.cs b/PunchAssemble/PunchAndWeld/BusinessHelper.cs index 6d60afe..88d4824 100644 --- a/PunchAssemble/PunchAndWeld/BusinessHelper.cs +++ b/PunchAssemble/PunchAndWeld/BusinessHelper.cs @@ -1,4 +1,5 @@ -using System; +using PunchAndWeld.DataSouce; +using System; using System.Collections.Generic; using System.Configuration; using System.Linq; @@ -44,5 +45,12 @@ namespace PunchAndWeld return; } } + + public static string GetQLevel(string part) + { + return ProScreenFunc.SearchQLevel("", part); + } + + } } diff --git a/PunchAssemble/PunchAndWeld/DataSouce/ProScreenFunc.cs b/PunchAssemble/PunchAndWeld/DataSouce/ProScreenFunc.cs index f760266..3ca60c3 100644 --- a/PunchAssemble/PunchAndWeld/DataSouce/ProScreenFunc.cs +++ b/PunchAssemble/PunchAndWeld/DataSouce/ProScreenFunc.cs @@ -10,6 +10,7 @@ using MESClassLibrary.BLL.Log; //using MESClassLibrary.EFModel; using System.Xml; using static System.Windows.Forms.AxHost; +using System.Configuration; namespace PunchAndWeld.DataSouce { @@ -405,6 +406,26 @@ namespace PunchAndWeld.DataSouce return res; } catch (Exception ex) + { + LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); + return res; + } + } + public static string SearchDevCheck(string conn, string stationNo) + { + string res = string.Empty; + try + { + string sql = $"select IsCheck from t_Device where StationNo='{stationNo}'"; + object aa = SqlHelper.ExecuteScalar(conn, CommandType.Text, sql, null); + if (aa != null) + { + res = aa.ToString(); + } + + return res; + } + catch (Exception ex) { LogHelper.WriteErrLogBase(ex.ToString(), MethodBase.GetCurrentMethod().Name); return res; @@ -3504,7 +3525,45 @@ order by CreateTime desc } } - + + public static string SearchQLevel(string stockNo, string partCode) + { + try + { + string wmsConn = ConfigurationManager.ConnectionStrings["WmsConnString"].ConnectionString; + string sql = string.Empty; + SqlParameter[] param = new SqlParameter[1]; + if (!string.IsNullOrEmpty(stockNo)) + { + sql = $"select QLevel from TA_PART where DrawingNumber=@DrawingNumber"; + + param[0] = new SqlParameter("@DrawingNumber", SqlDbType.VarChar); + param[0].Value = stockNo; + } + else + { + sql = $"select QLevel from TA_PART where PartCode=@PartCode"; + param[0] = new SqlParameter("@PartCode", SqlDbType.VarChar); + param[0].Value = partCode; + } + + + DataTable dt = SqlHelper.GetDataDateTable(wmsConn, CommandType.Text, sql, param); + if (dt.Rows.Count > 0) + { + return dt.Rows[0]["QLevel"].ToString(); + } + return null; + + } + catch (Exception ex) + { + LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod()); + return null; + + } + } + } public class OtherPart diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill.cs index 88772b6..e5f7249 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill.cs @@ -236,7 +236,7 @@ namespace PunchAndWeld zcPartName = ""; zcHigh = ""; - string[] codeSpecial = { "2200000057", "2200000058" }; + string[] codeSpecial = { "2200000057", "2200000058" }; //, "2200000158" //string[] codeSpecial = ProScreenFunc.GetSpecialStockNo(); string code = barcode.Substring(0, 10); if (codeSpecial.Contains(code)) @@ -246,25 +246,27 @@ namespace PunchAndWeld } else { - if (barcode.Substring(0, 2) != "22") + //if (barcode.Substring(0, 2) != "22") + //{ + string[] codeSpecial1 = ProScreenFunc.GetSpecialStockNo(); + string code1 = barcode.Substring(0, 10); + if (codeSpecial1.Contains(code1)) { - string[] codeSpecial1 = ProScreenFunc.GetSpecialStockNo(); - string code1 = barcode.Substring(0, 10); - if (codeSpecial1.Contains(code1)) - { - productID2 = ProScreenFunc.GetProductID(code, ""); - //AfterScanBarcode(barcode, productID2, productID1, this.Tag.ToString().Trim()); - } - else + //存货代码维护到特殊的表tb_SpcialStockNo,tb_PunchAndStation表ProductID2维护底漆零件ID + productID2 = ProScreenFunc.GetProductID(code, ""); + //AfterScanBarcode(barcode, productID2, productID1, this.Tag.ToString().Trim()); + } + else + { + //存货代码不在特殊的表中,tb_PunchAndStation表ProductID2维护半成品零件ID + productID2 = ProScreenFunc.GetProductID(barcode); + if (string.IsNullOrWhiteSpace(productID2)) { - productID2 = ProScreenFunc.GetProductID(barcode); - if (string.IsNullOrWhiteSpace(productID2)) - { - string stockNo = barcode.Substring(0, 10); - productID2 = ProScreenFunc.GetProductID(stockNo, ""); - } + string stockNo = barcode.Substring(0, 10); + productID2 = ProScreenFunc.GetProductID(stockNo, ""); } } + //} bool isScan = ProScreenFunc.IsScan(barcode); @@ -273,7 +275,7 @@ namespace PunchAndWeld { for (int i = 0; i < dt1.Rows.Count; i++) { - if (stationNo == "ZP75" ||stationNo == "ZP76") + if (stationNo == "ZP75" || stationNo == "ZP76") { if (isScan && dt1.Rows[i]["IsHigh"].ToString() == "1") { @@ -298,7 +300,7 @@ namespace PunchAndWeld zcPartName = dt1.Rows[i]["ProductName"].ToString(); } } - + } @@ -331,11 +333,11 @@ namespace PunchAndWeld planID = ProScreenFunc.GetPlanIDByOrderNo(textBox2.Text.Trim(), zcPartNo); if (ConfigurationManager.AppSettings["IsHaveVisual"] != "1") { - AfterScanBarcode(barcode, zcPartNo, productID2, productID1, planID,stationId); + AfterScanBarcode(barcode, zcPartNo, productID2, productID1, planID, stationId); } else { - ProScreenFunc.SavePartAndProduct(barcode, productID2, productID1, textBox2.Text.Trim(), textBox2.Text.Trim().Substring(0, 1) + "班", planID,stationId, ConfigurationManager.AppSettings["StationDescription"]); + ProScreenFunc.SavePartAndProduct(barcode, productID2, productID1, textBox2.Text.Trim(), textBox2.Text.Trim().Substring(0, 1) + "班", planID, stationId, ConfigurationManager.AppSettings["StationDescription"]); ProScreenFunc.SaveZcCode(barcode, zcPartNo); } } @@ -343,6 +345,7 @@ namespace PunchAndWeld } } + private void AfterScanBarcode(string barcode,string zcPartNo, string productID2, string productID1, string planID,string stationId) { if ((IsChangeBox == true && IsPass) || (IsChangeBox == false)) @@ -463,6 +466,9 @@ namespace PunchAndWeld Report.ParameterByName("oneBarCode").Value = oneBarCode; Report.ParameterByName("zcPartNo").Value = zcPartNo; Report.ParameterByName("zcName").Value = zcPartName; + + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + Report.ParameterByName("QLevel").Value = qlevel; //Report.ParameterByName("zcHigh").Value = zcHigh; 214门槛用 } @@ -504,6 +510,9 @@ namespace PunchAndWeld Report.ParameterByName("SerialNo").Value = sn; Report.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + time.ToString("yyyy/MM/dd"); Report.ParameterByName("oneBarCode").Value = barcode; + + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + Report.ParameterByName("QLevel").Value = qlevel; } catch (Exception e) { @@ -622,6 +631,10 @@ namespace PunchAndWeld Report2.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + tmp[1]; Report2.ParameterByName("oneBarCode").Value = barcode; Report2.ParameterByName("BatchNo").Value = tmp[1]; + + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report2.ParameterByName("QLevel").Value = qlevel; + Report2.Print(false); textBox4.SelectAll(); } @@ -637,6 +650,10 @@ namespace PunchAndWeld Report1.ParameterByName("zcPartNo").Value = zl.zcPartNo; Report1.ParameterByName("SerialNo").Value = zcSn; Report1.ParameterByName("zcName").Value = zl.zcName; + + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report1.ParameterByName("QLevel").Value = qlevel; + Report1.Print(false); textBox4.SelectAll(); } diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs b/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs index 32f2eea..16722bf 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSillNew.cs @@ -544,13 +544,15 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn; row["oneBarCode"] = barcode; row["zcPartNo"] = zcPartNo1; row["zcName"] = zcPartName1; row["zcState"] = ""; - + string qlevel = BusinessHelper.GetQLevel(zcPartNo1); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -683,12 +685,15 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn; row["oneBarCode"] = barcode; row["zcPartNo"] = zcPartNo1; row["zcName"] = zcPartName1; row["zcState"] = ""; + string qlevel = BusinessHelper.GetQLevel(zcPartNo1); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -764,6 +769,9 @@ namespace PunchAndWeld Report.ParameterByName("SerialNo").Value = sn; Report.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + time.ToString("yyyy/MM/dd"); Report.ParameterByName("oneBarCode").Value = barcode; + + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + Report.ParameterByName("QLevel").Value = qlevel; } /// @@ -831,6 +839,10 @@ namespace PunchAndWeld Report2.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + tmp[1]; Report2.ParameterByName("oneBarCode").Value = barcode; Report2.ParameterByName("BatchNo").Value = tmp[1]; + + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report2.ParameterByName("QLevel").Value = qlevel; + Report2.Print(false); textBox4.SelectAll(); } @@ -856,6 +868,7 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = zcSn; row["oneBarCode"] = barcode; @@ -863,6 +876,9 @@ namespace PunchAndWeld row["zcName"] = zl.zcName; row["zcState"] = dtHg.Rows[0]["ToVisual"].ToString() == "1" ? "" : "合格"; + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + row["QLevel"] = qlevel; + string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -1020,12 +1036,15 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn1; row["oneBarCode"] = barcode; row["zcPartNo"] = zcPartNo1; row["zcName"] = zcPartName1; row["zcState"] = "合格"; + string qlevel = BusinessHelper.GetQLevel(zcPartNo1); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs index a957a1c..7ec0926 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214.cs @@ -262,6 +262,7 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn; row["oneBarCode"] = barcode; @@ -270,6 +271,9 @@ namespace PunchAndWeld //row["zcState"] = "合格"; row["zcState"] = flag; + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + row["QLevel"] = qlevel; + string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -888,12 +892,15 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn; row["oneBarCode"] = barcode; row["zcPartNo"] = zcPartNo; row["zcName"] = zcPartName; row["zcState"] = ""; + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -1016,6 +1023,7 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = zcSn; row["oneBarCode"] = barcode; @@ -1024,6 +1032,9 @@ namespace PunchAndWeld //row["zcState"] = dtHg.Rows[0]["ToVisual"].ToString() == "1" ? "" : "合格"; row["zcState"] = dtHg.Rows[0]["Flag"].ToString() == "0" ? "不合格" : "合格"; + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + row["QLevel"] = qlevel; + string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs index 9f69738..aaea9fd 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_2.cs @@ -43,7 +43,7 @@ namespace PunchAndWeld private void FrmDoorSill_214_2_Load(object sender, EventArgs e) { - label5.Text = "当前版本：" +Assembly.GetExecutingAssembly().GetName().Version; + label5.Text = "当前版本：" +Assembly.GetExecutingAssembly().GetName().Version ; stationNo = ConfigurationManager.AppSettings["StationNo"].ToString(); stationId = ProScreenFunc.GetStationId(stationNo); @@ -242,6 +242,7 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn; row["oneBarCode"] = barcode; @@ -250,6 +251,9 @@ namespace PunchAndWeld //row["zcState"] = "合格"; row["zcState"] = flag; + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + row["QLevel"] = qlevel; + string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -893,12 +897,15 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn; row["oneBarCode"] = barcode; row["zcPartNo"] = zcPartNo; row["zcName"] = zcPartName; row["zcState"] = ""; + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -1099,6 +1106,7 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = zcSn; row["oneBarCode"] = barcode; @@ -1106,6 +1114,9 @@ namespace PunchAndWeld row["zcName"] = zl.zcName; //row["zcState"] = dtHg.Rows[0]["ToVisual"].ToString() == "1" ? "" : "合格"; row["zcState"] = dtHg.Rows[0]["Flag"].ToString() == "0" ? "不合格" : "合格"; + + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); @@ -1363,6 +1374,7 @@ namespace PunchAndWeld headTable.Columns.Add("zcPartNo"); headTable.Columns.Add("zcName"); headTable.Columns.Add("zcState"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["SerialNo"] = sn; row["oneBarCode"] = barcode; @@ -1371,6 +1383,9 @@ namespace PunchAndWeld //row["zcState"] = "合格"; row["zcState"] = flag; + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + row["QLevel"] = qlevel; + string reportName = ConfigurationManager.AppSettings["Printer1"]; headTable.Rows.Add(row); diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.Designer.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.Designer.cs index a352e5c..50fcc4a 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.Designer.cs @@ -29,8 +29,8 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panel1 = new System.Windows.Forms.Panel(); this.txtLastScanL = new System.Windows.Forms.TextBox(); @@ -77,6 +77,7 @@ this.label11 = new System.Windows.Forms.Label(); this.focusTimer = new System.Windows.Forms.Timer(this.components); this.dateTimer = new System.Windows.Forms.Timer(this.components); + this.lbCfg = new System.Windows.Forms.Label(); this.tableLayoutPanel1.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout(); @@ -102,18 +103,18 @@ this.tableLayoutPanel1.Controls.Add(this.panel4, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 8; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 4F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 160F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 60F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 100F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 140F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 6F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 224F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 140F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 84F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 140F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 70F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1707, 1100); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 98F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(2347, 1540); this.tableLayoutPanel1.TabIndex = 0; // // panel1 @@ -131,10 +132,10 @@ this.panel1.Controls.Add(this.btnSearch); this.panel1.Controls.Add(this.label1); this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(3, 106); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel1.Location = new System.Drawing.Point(4, 149); + this.panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1701, 156); + this.panel1.Size = new System.Drawing.Size(2339, 218); this.panel1.TabIndex = 0; // // txtLastScanL @@ -143,11 +144,11 @@ this.txtLastScanL.BorderStyle = System.Windows.Forms.BorderStyle.None; this.txtLastScanL.Font = new System.Drawing.Font("宋体", 22.2F, System.Drawing.FontStyle.Bold); this.txtLastScanL.ForeColor = System.Drawing.Color.White; - this.txtLastScanL.Location = new System.Drawing.Point(40, 79); - this.txtLastScanL.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtLastScanL.Location = new System.Drawing.Point(55, 111); + this.txtLastScanL.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.txtLastScanL.Name = "txtLastScanL"; this.txtLastScanL.ReadOnly = true; - this.txtLastScanL.Size = new System.Drawing.Size(457, 43); + this.txtLastScanL.Size = new System.Drawing.Size(628, 60); this.txtLastScanL.TabIndex = 11; // // txtLastScanR @@ -156,11 +157,11 @@ this.txtLastScanR.BorderStyle = System.Windows.Forms.BorderStyle.None; this.txtLastScanR.Font = new System.Drawing.Font("宋体", 22.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtLastScanR.ForeColor = System.Drawing.Color.White; - this.txtLastScanR.Location = new System.Drawing.Point(520, 79); - this.txtLastScanR.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtLastScanR.Location = new System.Drawing.Point(715, 111); + this.txtLastScanR.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.txtLastScanR.Name = "txtLastScanR"; this.txtLastScanR.ReadOnly = true; - this.txtLastScanR.Size = new System.Drawing.Size(457, 43); + this.txtLastScanR.Size = new System.Drawing.Size(628, 60); this.txtLastScanR.TabIndex = 10; // // txtProduceModel @@ -169,9 +170,10 @@ this.txtProduceModel.BackColor = System.Drawing.Color.Green; this.txtProduceModel.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); this.txtProduceModel.ForeColor = System.Drawing.Color.White; - this.txtProduceModel.Location = new System.Drawing.Point(1220, 29); + this.txtProduceModel.Location = new System.Drawing.Point(1678, 41); + this.txtProduceModel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txtProduceModel.Name = "txtProduceModel"; - this.txtProduceModel.Size = new System.Drawing.Size(75, 30); + this.txtProduceModel.Size = new System.Drawing.Size(104, 42); this.txtProduceModel.TabIndex = 9; this.txtProduceModel.Text = "左右"; // @@ -180,9 +182,10 @@ this.label7.AutoSize = true; this.label7.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); this.label7.ForeColor = System.Drawing.Color.White; - this.label7.Location = new System.Drawing.Point(1015, 29); + this.label7.Location = new System.Drawing.Point(1396, 41); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(199, 30); + this.label7.Size = new System.Drawing.Size(276, 42); this.label7.TabIndex = 8; this.label7.Text = "当前生产模式"; // @@ -192,9 +195,10 @@ this.txtConfig.BackColor = System.Drawing.Color.Green; this.txtConfig.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); this.txtConfig.ForeColor = System.Drawing.Color.White; - this.txtConfig.Location = new System.Drawing.Point(921, 29); + this.txtConfig.Location = new System.Drawing.Point(1266, 41); + this.txtConfig.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txtConfig.Name = "txtConfig"; - this.txtConfig.Size = new System.Drawing.Size(75, 30); + this.txtConfig.Size = new System.Drawing.Size(104, 42); this.txtConfig.TabIndex = 7; this.txtConfig.Text = "高配"; // @@ -203,9 +207,10 @@ this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); this.label5.ForeColor = System.Drawing.Color.White; - this.label5.Location = new System.Drawing.Point(716, 29); + this.label5.Location = new System.Drawing.Point(984, 41); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(199, 30); + this.label5.Size = new System.Drawing.Size(276, 42); this.label5.TabIndex = 6; this.label5.Text = "当前配置状态"; // @@ -215,9 +220,10 @@ this.lbScanState.BackColor = System.Drawing.Color.Green; this.lbScanState.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); this.lbScanState.ForeColor = System.Drawing.Color.White; - this.lbScanState.Location = new System.Drawing.Point(467, 29); + this.lbScanState.Location = new System.Drawing.Point(642, 41); + this.lbScanState.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbScanState.Name = "lbScanState"; - this.lbScanState.Size = new System.Drawing.Size(137, 30); + this.lbScanState.Size = new System.Drawing.Size(190, 42); this.lbScanState.TabIndex = 5; this.lbScanState.Text = "允许扫码"; // @@ -226,9 +232,10 @@ this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(323, 29); + this.label3.Location = new System.Drawing.Point(444, 41); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(137, 30); + this.label3.Size = new System.Drawing.Size(190, 42); this.label3.TabIndex = 4; this.label3.Text = "扫描状态"; // @@ -238,9 +245,10 @@ this.lbLinkState.BackColor = System.Drawing.Color.Green; this.lbLinkState.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold); this.lbLinkState.ForeColor = System.Drawing.Color.White; - this.lbLinkState.Location = new System.Drawing.Point(149, 29); + this.lbLinkState.Location = new System.Drawing.Point(205, 41); + this.lbLinkState.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbLinkState.Name = "lbLinkState"; - this.lbLinkState.Size = new System.Drawing.Size(137, 30); + this.lbLinkState.Size = new System.Drawing.Size(190, 42); this.lbLinkState.TabIndex = 3; this.lbLinkState.Text = "连接成功"; // @@ -249,10 +257,10 @@ this.btnOpenParamDialog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnOpenParamDialog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.btnOpenParamDialog.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOpenParamDialog.Location = new System.Drawing.Point(1485, 78); - this.btnOpenParamDialog.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnOpenParamDialog.Location = new System.Drawing.Point(2042, 109); + this.btnOpenParamDialog.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnOpenParamDialog.Name = "btnOpenParamDialog"; - this.btnOpenParamDialog.Size = new System.Drawing.Size(205, 69); + this.btnOpenParamDialog.Size = new System.Drawing.Size(282, 97); this.btnOpenParamDialog.TabIndex = 2; this.btnOpenParamDialog.Text = "返回选中窗口"; this.btnOpenParamDialog.UseVisualStyleBackColor = false; @@ -263,10 +271,10 @@ this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.btnSearch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(1275, 78); - this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.btnSearch.Location = new System.Drawing.Point(1753, 109); + this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(205, 69); + this.btnSearch.Size = new System.Drawing.Size(282, 97); this.btnSearch.TabIndex = 1; this.btnSearch.Text = "查询明细"; this.btnSearch.UseVisualStyleBackColor = false; @@ -277,27 +285,28 @@ this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(11, 29); + this.label1.Location = new System.Drawing.Point(15, 41); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(123, 30); + this.label1.Size = new System.Drawing.Size(170, 42); this.label1.TabIndex = 0; this.label1.Text = "PLC状态"; // // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 4; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 60F)); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 82F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.Controls.Add(this.txtLeftScan, 1, 0); this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 266); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tableLayoutPanel2.Location = new System.Drawing.Point(4, 373); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(1701, 96); + this.tableLayoutPanel2.Size = new System.Drawing.Size(2339, 134); this.tableLayoutPanel2.TabIndex = 1; // // txtLeftScan @@ -306,24 +315,24 @@ this.txtLeftScan.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); this.txtLeftScan.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtLeftScan.ForeColor = System.Drawing.Color.White; - this.txtLeftScan.Location = new System.Drawing.Point(63, 19); - this.txtLeftScan.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtLeftScan.Location = new System.Drawing.Point(86, 29); + this.txtLeftScan.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.txtLeftScan.Name = "txtLeftScan"; - this.txtLeftScan.Size = new System.Drawing.Size(784, 57); + this.txtLeftScan.Size = new System.Drawing.Size(1079, 76); this.txtLeftScan.TabIndex = 2; this.txtLeftScan.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtLeftScan_KeyDown); // // tableLayoutPanel3 // this.tableLayoutPanel3.ColumnCount = 9; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 120F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 110F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 165F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 110F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 165F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 110F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 165F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 110F)); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 165F)); this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel3.Controls.Add(this.txtLowQty, 7, 0); this.tableLayoutPanel3.Controls.Add(this.txtHighQty, 5, 0); @@ -335,12 +344,12 @@ this.tableLayoutPanel3.Controls.Add(this.label4, 4, 0); this.tableLayoutPanel3.Controls.Add(this.label8, 6, 0); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 426); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tableLayoutPanel3.Location = new System.Drawing.Point(4, 597); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1701, 96); + this.tableLayoutPanel3.Size = new System.Drawing.Size(2339, 134); this.tableLayoutPanel3.TabIndex = 3; // // txtLowQty @@ -351,9 +360,10 @@ this.txtLowQty.AutoSize = true; this.txtLowQty.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.txtLowQty.ForeColor = System.Drawing.Color.White; - this.txtLowQty.Location = new System.Drawing.Point(683, 0); + this.txtLowQty.Location = new System.Drawing.Point(939, 0); + this.txtLowQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txtLowQty.Name = "txtLowQty"; - this.txtLowQty.Size = new System.Drawing.Size(114, 96); + this.txtLowQty.Size = new System.Drawing.Size(157, 134); this.txtLowQty.TabIndex = 9; this.txtLowQty.Text = "0"; this.txtLowQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -366,9 +376,10 @@ this.txtHighQty.AutoSize = true; this.txtHighQty.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.txtHighQty.ForeColor = System.Drawing.Color.White; - this.txtHighQty.Location = new System.Drawing.Point(483, 0); + this.txtHighQty.Location = new System.Drawing.Point(664, 0); + this.txtHighQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txtHighQty.Name = "txtHighQty"; - this.txtHighQty.Size = new System.Drawing.Size(114, 96); + this.txtHighQty.Size = new System.Drawing.Size(157, 134); this.txtHighQty.TabIndex = 8; this.txtHighQty.Text = "0"; this.txtHighQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -381,9 +392,10 @@ this.txtRightQty.AutoSize = true; this.txtRightQty.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.txtRightQty.ForeColor = System.Drawing.Color.White; - this.txtRightQty.Location = new System.Drawing.Point(283, 0); + this.txtRightQty.Location = new System.Drawing.Point(389, 0); + this.txtRightQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txtRightQty.Name = "txtRightQty"; - this.txtRightQty.Size = new System.Drawing.Size(114, 96); + this.txtRightQty.Size = new System.Drawing.Size(157, 134); this.txtRightQty.TabIndex = 7; this.txtRightQty.Text = "0"; this.txtRightQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -396,9 +408,10 @@ this.txtLeftQty.AutoSize = true; this.txtLeftQty.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.txtLeftQty.ForeColor = System.Drawing.Color.White; - this.txtLeftQty.Location = new System.Drawing.Point(83, 0); + this.txtLeftQty.Location = new System.Drawing.Point(114, 0); + this.txtLeftQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txtLeftQty.Name = "txtLeftQty"; - this.txtLeftQty.Size = new System.Drawing.Size(114, 96); + this.txtLeftQty.Size = new System.Drawing.Size(157, 134); this.txtLeftQty.TabIndex = 6; this.txtLeftQty.Text = "0"; this.txtLeftQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -412,9 +425,10 @@ this.label13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); this.label13.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.label13.ForeColor = System.Drawing.Color.White; - this.label13.Location = new System.Drawing.Point(3, 0); + this.label13.Location = new System.Drawing.Point(4, 0); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(74, 96); + this.label13.Size = new System.Drawing.Size(102, 134); this.label13.TabIndex = 1; this.label13.Text = "左"; this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -428,9 +442,10 @@ this.label14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); this.label14.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.label14.ForeColor = System.Drawing.Color.White; - this.label14.Location = new System.Drawing.Point(203, 0); + this.label14.Location = new System.Drawing.Point(279, 0); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(74, 96); + this.label14.Size = new System.Drawing.Size(102, 134); this.label14.TabIndex = 2; this.label14.Text = "右"; this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -440,9 +455,10 @@ this.lbVer.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lbVer.AutoSize = true; this.lbVer.ForeColor = System.Drawing.Color.White; - this.lbVer.Location = new System.Drawing.Point(1659, 40); + this.lbVer.Location = new System.Drawing.Point(2281, 56); + this.lbVer.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbVer.Name = "lbVer"; - this.lbVer.Size = new System.Drawing.Size(39, 15); + this.lbVer.Size = new System.Drawing.Size(54, 21); this.lbVer.TabIndex = 10; this.lbVer.Text = " "; // @@ -455,9 +471,10 @@ this.label4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); this.label4.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.label4.ForeColor = System.Drawing.Color.White; - this.label4.Location = new System.Drawing.Point(403, 0); + this.label4.Location = new System.Drawing.Point(554, 0); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(74, 96); + this.label4.Size = new System.Drawing.Size(102, 134); this.label4.TabIndex = 11; this.label4.Text = "高"; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -471,9 +488,10 @@ this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); this.label8.Font = new System.Drawing.Font("宋体", 25.8F, System.Drawing.FontStyle.Bold); this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(603, 0); + this.label8.Location = new System.Drawing.Point(829, 0); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(74, 96); + this.label8.Size = new System.Drawing.Size(102, 134); this.label8.TabIndex = 12; this.label8.Text = "低"; this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -485,9 +503,10 @@ this.lbMsg.AutoSize = true; this.lbMsg.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbMsg.ForeColor = System.Drawing.Color.Red; - this.lbMsg.Location = new System.Drawing.Point(3, 1030); + this.lbMsg.Location = new System.Drawing.Point(4, 1442); + this.lbMsg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbMsg.Name = "lbMsg"; - this.lbMsg.Size = new System.Drawing.Size(146, 70); + this.lbMsg.Size = new System.Drawing.Size(201, 98); this.lbMsg.TabIndex = 5; this.lbMsg.Text = "异常信息 提示"; this.lbMsg.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -499,10 +518,10 @@ this.panel2.Controls.Add(this.lbBegin); this.panel2.Controls.Add(this.label2); this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(3, 366); - this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel2.Location = new System.Drawing.Point(4, 513); + this.panel2.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1701, 56); + this.panel2.Size = new System.Drawing.Size(2339, 78); this.panel2.TabIndex = 6; // // lbEnd @@ -510,9 +529,10 @@ this.lbEnd.AutoSize = true; this.lbEnd.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbEnd.ForeColor = System.Drawing.Color.White; - this.lbEnd.Location = new System.Drawing.Point(493, 10); + this.lbEnd.Location = new System.Drawing.Point(678, 14); + this.lbEnd.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbEnd.Name = "lbEnd"; - this.lbEnd.Size = new System.Drawing.Size(257, 24); + this.lbEnd.Size = new System.Drawing.Size(357, 33); this.lbEnd.TabIndex = 3; this.lbEnd.Text = "2024-06-01 23:59:59"; // @@ -521,9 +541,10 @@ this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.ForeColor = System.Drawing.Color.White; - this.label6.Location = new System.Drawing.Point(449, 10); + this.label6.Location = new System.Drawing.Point(617, 14); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(23, 24); + this.label6.Size = new System.Drawing.Size(33, 33); this.label6.TabIndex = 2; this.label6.Text = "-"; // @@ -532,9 +553,10 @@ this.lbBegin.AutoSize = true; this.lbBegin.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbBegin.ForeColor = System.Drawing.Color.White; - this.lbBegin.Location = new System.Drawing.Point(184, 10); + this.lbBegin.Location = new System.Drawing.Point(253, 14); + this.lbBegin.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbBegin.Name = "lbBegin"; - this.lbBegin.Size = new System.Drawing.Size(257, 24); + this.lbBegin.Size = new System.Drawing.Size(357, 33); this.lbBegin.TabIndex = 1; this.lbBegin.Text = "2024-06-01 00:00:00"; // @@ -543,9 +565,10 @@ this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.White; - this.label2.Location = new System.Drawing.Point(5, 10); + this.label2.Location = new System.Drawing.Point(7, 14); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(173, 24); + this.label2.Size = new System.Drawing.Size(237, 33); this.label2.TabIndex = 0; this.label2.Text = "当前生产数据:"; // @@ -557,27 +580,27 @@ this.tableLayoutPanel4.Controls.Add(this.dgridScanRecords, 1, 0); this.tableLayoutPanel4.Controls.Add(this.txtAllQty, 0, 0); this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 526); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.tableLayoutPanel4.Location = new System.Drawing.Point(4, 737); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.tableLayoutPanel4.Name = "tableLayoutPanel4"; this.tableLayoutPanel4.RowCount = 1; this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 501F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(1701, 502); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 703F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(2339, 702); this.tableLayoutPanel4.TabIndex = 7; // // dgridScanRecords // this.dgridScanRecords.AllowUserToAddRows = false; this.dgridScanRecords.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgridScanRecords.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgridScanRecords.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dgridScanRecords.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgridScanRecords.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.塑件唯一码, @@ -587,21 +610,21 @@ this.生产时间}); this.dgridScanRecords.Dock = System.Windows.Forms.DockStyle.Fill; this.dgridScanRecords.EnableHeadersVisualStyles = false; - this.dgridScanRecords.Location = new System.Drawing.Point(853, 2); - this.dgridScanRecords.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.dgridScanRecords.Location = new System.Drawing.Point(1173, 3); + this.dgridScanRecords.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.dgridScanRecords.Name = "dgridScanRecords"; this.dgridScanRecords.ReadOnly = true; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgridScanRecords.RowHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgridScanRecords.RowHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgridScanRecords.RowHeadersWidth = 51; this.dgridScanRecords.RowTemplate.Height = 27; - this.dgridScanRecords.Size = new System.Drawing.Size(845, 498); + this.dgridScanRecords.Size = new System.Drawing.Size(1162, 696); this.dgridScanRecords.TabIndex = 4; this.dgridScanRecords.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgridScanRecords_CellContentClick); // @@ -662,9 +685,10 @@ this.txtAllQty.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(38)))), ((int)(((byte)(46)))), ((int)(((byte)(64))))); this.txtAllQty.Font = new System.Drawing.Font("宋体", 220F, System.Drawing.FontStyle.Bold); this.txtAllQty.ForeColor = System.Drawing.Color.Yellow; - this.txtAllQty.Location = new System.Drawing.Point(3, 0); + this.txtAllQty.Location = new System.Drawing.Point(4, 0); + this.txtAllQty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.txtAllQty.Name = "txtAllQty"; - this.txtAllQty.Size = new System.Drawing.Size(844, 502); + this.txtAllQty.Size = new System.Drawing.Size(1161, 702); this.txtAllQty.TabIndex = 5; this.txtAllQty.Text = "0"; this.txtAllQty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -673,21 +697,22 @@ // this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(3, 102); - this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel3.Location = new System.Drawing.Point(4, 143); + this.panel3.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1701, 1); + this.panel3.Size = new System.Drawing.Size(2339, 1); this.panel3.TabIndex = 8; // // panel4 // + this.panel4.Controls.Add(this.lbCfg); this.panel4.Controls.Add(this.lbTime); this.panel4.Controls.Add(this.label11); this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(3, 2); - this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel4.Location = new System.Drawing.Point(4, 3); + this.panel4.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(1701, 96); + this.panel4.Size = new System.Drawing.Size(2339, 134); this.panel4.TabIndex = 9; // // lbTime @@ -695,9 +720,10 @@ this.lbTime.AutoSize = true; this.lbTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lbTime.ForeColor = System.Drawing.Color.Yellow; - this.lbTime.Location = new System.Drawing.Point(1275, 38); + this.lbTime.Location = new System.Drawing.Point(1753, 53); + this.lbTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbTime.Name = "lbTime"; - this.lbTime.Size = new System.Drawing.Size(397, 40); + this.lbTime.Size = new System.Drawing.Size(556, 56); this.lbTime.TabIndex = 1; this.lbTime.Text = "2024-10-10 12:23:32"; // @@ -706,9 +732,10 @@ this.label11.AutoSize = true; this.label11.Font = new System.Drawing.Font("宋体", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label11.ForeColor = System.Drawing.Color.Yellow; - this.label11.Location = new System.Drawing.Point(259, 19); + this.label11.Location = new System.Drawing.Point(356, 27); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(513, 60); + this.label11.Size = new System.Drawing.Size(715, 84); this.label11.TabIndex = 0; this.label11.Text = "北汽模塑生产看板"; // @@ -724,14 +751,25 @@ this.dateTimer.Interval = 500; this.dateTimer.Tick += new System.EventHandler(this.dateTimer_Tick); // + // lbCfg + // + this.lbCfg.AutoSize = true; + this.lbCfg.BackColor = System.Drawing.Color.Transparent; + this.lbCfg.ForeColor = System.Drawing.Color.White; + this.lbCfg.Location = new System.Drawing.Point(1, 6); + this.lbCfg.Name = "lbCfg"; + this.lbCfg.Size = new System.Drawing.Size(65, 21); + this.lbCfg.TabIndex = 23; + this.lbCfg.Text = " "; + // // FrmDoorSill_214_3 // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1707, 1100); + this.ClientSize = new System.Drawing.Size(2347, 1540); this.Controls.Add(this.tableLayoutPanel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.Name = "FrmDoorSill_214_3"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "214门槛冲孔"; @@ -803,5 +841,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn 位置; private System.Windows.Forms.DataGridViewTextBoxColumn 配置; private System.Windows.Forms.DataGridViewTextBoxColumn 生产时间; + private System.Windows.Forms.Label lbCfg; } } \ No newline at end of file diff --git a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs index 024527f..2bbb5cb 100644 --- a/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs +++ b/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs @@ -40,6 +40,7 @@ namespace PunchAndWeld private void FrmDoorSill_214_3_Load(object sender, EventArgs e) { + lbCfg.Text = Program.GetPageCfg(); _syncontext = SynchronizationContext.Current; lbVer.Text = "当前版本：" + Assembly.GetExecutingAssembly().GetName().Version; lbBegin.Text = DateTime.Now.ToShortDateString() + " 00:00:00"; @@ -99,54 +100,10 @@ namespace PunchAndWeld { if (string.IsNullOrEmpty(_produceModel)) return; - //if(_produceModel == "左") - //{ txtLeftScan.Focus(); txtLeftScan.SelectAll(); - //} - //else if (_produceModel == "右") - //{ - // txtRightScan.Focus(); - // txtRightScan.SelectAll(); - //} - //else if (_produceModel == "左右") - //{ - - //} } - //void LeftAndRightFocus() - //{ - // if(string.IsNullOrEmpty( _lastScan)) - // { - // txtLeftScan.Focus(); - // txtLeftScan.SelectAll(); - // } - // else if (_lastScan == "右") - // { - // txtLeftScan.Focus(); - // txtLeftScan.SelectAll(); - // } - // else - // { - // txtRightScan.Focus(); - // txtRightScan.SelectAll(); - // } - // //if (string.IsNullOrEmpty(txtLeftScan.Text)) - // //{ - // // txtLeftScan.Focus(); - // // txtLeftScan.SelectAll(); - // //} - // //else if (string.IsNullOrEmpty(txtRightScan.Text)) - // //{ - // // txtRightScan.Focus(); - // // txtRightScan.SelectAll(); - // //} - // //else - // //{ - // // txtLeftScan.Focus(); - // // txtLeftScan.SelectAll(); - // //} - //} + #endregion #region PLC diff --git a/PunchAssemble/PunchAndWeld/FrmHybridS.cs b/PunchAssemble/PunchAndWeld/FrmHybridS.cs index 7ce7ac1..f7ba1a5 100644 --- a/PunchAssemble/PunchAndWeld/FrmHybridS.cs +++ b/PunchAssemble/PunchAndWeld/FrmHybridS.cs @@ -655,8 +655,12 @@ namespace PunchAndWeld Report.ParameterByName("oneBarCode").Value = barcode; Report.ParameterByName("zcPartNo").Value = zcPartNo; Report.ParameterByName("zcName").Value = productName; + + string qlevel = BusinessHelper.GetQLevel(zcPartNo); + Report.ParameterByName("QLevel").Value = qlevel; } + private void button1_Click(object sender, EventArgs e) { if (this.Tag.ToString() == "") @@ -1017,6 +1021,9 @@ namespace PunchAndWeld Report2.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + tmp[1]; Report2.ParameterByName("oneBarCode").Value = barcode; Report2.ParameterByName("BatchNo").Value = tmp[1]; + + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report2.ParameterByName("QLevel").Value = qlevel; Report2.Print(false); textBox4.SelectAll(); } @@ -1030,6 +1037,9 @@ namespace PunchAndWeld Report1.ParameterByName("oneBarCode").Value = barcode; Report1.ParameterByName("zcPartNo").Value = zl.zcPartNo; Report1.ParameterByName("zcName").Value = zl.zcName; + + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report1.ParameterByName("QLevel").Value = qlevel; Report1.Print(false); textBox4.SelectAll(); } diff --git a/PunchAssemble/PunchAndWeld/FrmInspection_WheelBrow.cs b/PunchAssemble/PunchAndWeld/FrmInspection_WheelBrow.cs index 0ad813e..939fca3 100644 --- a/PunchAssemble/PunchAndWeld/FrmInspection_WheelBrow.cs +++ b/PunchAssemble/PunchAndWeld/FrmInspection_WheelBrow.cs @@ -119,12 +119,15 @@ namespace PunchAndWeld headTable.Columns.Add("PartNo"); headTable.Columns.Add("PartName"); headTable.Columns.Add("Batch"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["BoxNo"] = newBox; row["PartNo"] = partNo; row["PartName"] = partName; row["Batch"] = newBatch; + string qlevel = BusinessHelper.GetQLevel(partNo); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["PrinterName"]; headTable.Rows.Add(row); @@ -159,13 +162,15 @@ namespace PunchAndWeld headTable.Columns.Add("BoxNo"); headTable.Columns.Add("PartNo"); headTable.Columns.Add("PartName"); - headTable.Columns.Add("Batch"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["BoxNo"] = newBox; row["PartNo"] = partNo; row["PartName"] = partName; row["Batch"] = newBatch; + string qlevel = BusinessHelper.GetQLevel(partNo); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["PrinterName"]; headTable.Rows.Add(row); @@ -414,12 +419,15 @@ namespace PunchAndWeld headTable.Columns.Add("PartNo"); headTable.Columns.Add("PartName"); headTable.Columns.Add("Batch"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["BoxNo"] = textBox3.Text.Trim(); row["PartNo"] = partNo; row["PartName"] = partName; row["Batch"] = batchNo; + string qlevel = BusinessHelper.GetQLevel(partNo); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["PrinterName"]; headTable.Rows.Add(row); diff --git a/PunchAssemble/PunchAndWeld/FrmLaser.Designer.cs b/PunchAssemble/PunchAndWeld/FrmLaser.Designer.cs index 0ac8e7c..b07a73f 100644 --- a/PunchAssemble/PunchAndWeld/FrmLaser.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmLaser.Designer.cs @@ -40,6 +40,7 @@ this.textBox2 = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); + this.lbCfg = new System.Windows.Forms.Label(); 扫描时间 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.SuspendLayout(); // @@ -53,9 +54,10 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(52, 292); + this.label1.Location = new System.Drawing.Point(95, 511); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(298, 76); + this.label1.Size = new System.Drawing.Size(546, 133); this.label1.TabIndex = 1; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // @@ -65,11 +67,11 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.Font = new System.Drawing.Font("微软雅黑", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.textBox1.Location = new System.Drawing.Point(50, 531); - this.textBox1.Margin = new System.Windows.Forms.Padding(2); + this.textBox1.Location = new System.Drawing.Point(92, 929); + this.textBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(300, 84); + this.textBox1.Size = new System.Drawing.Size(547, 144); this.textBox1.TabIndex = 11; this.textBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyDown); // @@ -84,9 +86,11 @@ this.listView1.FullRowSelect = true; this.listView1.GridLines = true; this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable; - this.listView1.Location = new System.Drawing.Point(496, 320); + this.listView1.HideSelection = false; + this.listView1.Location = new System.Drawing.Point(909, 560); + this.listView1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.listView1.Name = "listView1"; - this.listView1.Size = new System.Drawing.Size(660, 522); + this.listView1.Size = new System.Drawing.Size(1207, 910); this.listView1.TabIndex = 12; this.listView1.UseCompatibleStateImageBehavior = false; this.listView1.View = System.Windows.Forms.View.Details; @@ -104,9 +108,10 @@ this.label2.BackColor = System.Drawing.Color.Transparent; this.label2.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(115)))), ((int)(((byte)(193))))); - this.label2.Location = new System.Drawing.Point(510, 231); + this.label2.Location = new System.Drawing.Point(935, 404); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(174, 76); + this.label2.Size = new System.Drawing.Size(319, 133); this.label2.TabIndex = 13; this.label2.Text = "已扫描记录"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -116,9 +121,10 @@ this.label9.BackColor = System.Drawing.Color.Transparent; this.label9.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label9.ForeColor = System.Drawing.Color.White; - this.label9.Location = new System.Drawing.Point(920, 7); + this.label9.Location = new System.Drawing.Point(1687, 12); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(338, 67); + this.label9.Size = new System.Drawing.Size(620, 117); this.label9.TabIndex = 14; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.label9.Click += new System.EventHandler(this.label9_Click); @@ -128,9 +134,10 @@ this.label3.BackColor = System.Drawing.Color.Transparent; this.label3.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(115)))), ((int)(((byte)(193))))); - this.label3.Location = new System.Drawing.Point(690, 231); + this.label3.Location = new System.Drawing.Point(1265, 404); + this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(174, 76); + this.label3.Size = new System.Drawing.Size(319, 133); this.label3.TabIndex = 15; this.label3.Text = "100"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -141,9 +148,10 @@ this.label4.BackColor = System.Drawing.Color.Transparent; this.label4.Font = new System.Drawing.Font("微软雅黑", 22F); this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(115)))), ((int)(((byte)(193))))); - this.label4.Location = new System.Drawing.Point(23, 723); + this.label4.Location = new System.Drawing.Point(42, 1265); + this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(191, 39); + this.label4.Size = new System.Drawing.Size(327, 67); this.label4.TabIndex = 16; this.label4.Text = "214设备状态"; // @@ -151,18 +159,20 @@ // this.textBox2.Enabled = false; this.textBox2.Font = new System.Drawing.Font("微软雅黑", 22F); - this.textBox2.Location = new System.Drawing.Point(220, 723); + this.textBox2.Location = new System.Drawing.Point(403, 1265); + this.textBox2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox2.Name = "textBox2"; - this.textBox2.Size = new System.Drawing.Size(212, 46); + this.textBox2.Size = new System.Drawing.Size(385, 75); this.textBox2.TabIndex = 17; // // textBox3 // this.textBox3.Enabled = false; this.textBox3.Font = new System.Drawing.Font("微软雅黑", 22F); - this.textBox3.Location = new System.Drawing.Point(220, 814); + this.textBox3.Location = new System.Drawing.Point(403, 1424); + this.textBox3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(212, 46); + this.textBox3.Size = new System.Drawing.Size(385, 75); this.textBox3.TabIndex = 19; // // label5 @@ -171,18 +181,31 @@ this.label5.BackColor = System.Drawing.Color.Transparent; this.label5.Font = new System.Drawing.Font("微软雅黑", 22F); this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(115)))), ((int)(((byte)(193))))); - this.label5.Location = new System.Drawing.Point(23, 814); + this.label5.Location = new System.Drawing.Point(42, 1424); + this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(191, 39); + this.label5.Size = new System.Drawing.Size(327, 67); this.label5.TabIndex = 18; this.label5.Text = "294设备状态"; // + // lbCfg + // + this.lbCfg.AutoSize = true; + this.lbCfg.BackColor = System.Drawing.Color.Transparent; + this.lbCfg.ForeColor = System.Drawing.Color.White; + this.lbCfg.Location = new System.Drawing.Point(11, 11); + this.lbCfg.Name = "lbCfg"; + this.lbCfg.Size = new System.Drawing.Size(65, 21); + this.lbCfg.TabIndex = 23; + this.lbCfg.Text = " "; + // // FrmLaser // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = global::PunchAndWeld.Properties.Resources.background; - this.ClientSize = new System.Drawing.Size(1280, 1024); + this.ClientSize = new System.Drawing.Size(2347, 1792); + this.Controls.Add(this.lbCfg); this.Controls.Add(this.textBox3); this.Controls.Add(this.label5); this.Controls.Add(this.textBox2); @@ -194,6 +217,7 @@ this.Controls.Add(this.textBox1); this.Controls.Add(this.label1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.Name = "FrmLaser"; this.Text = "激光切割"; this.Load += new System.EventHandler(this.FrmLaser_Load); @@ -215,6 +239,6 @@ private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.Label label5; - + private System.Windows.Forms.Label lbCfg; } } \ No newline at end of file diff --git a/PunchAssemble/PunchAndWeld/FrmLaser.cs b/PunchAssemble/PunchAndWeld/FrmLaser.cs index 4104bef..069a6fc 100644 --- a/PunchAssemble/PunchAndWeld/FrmLaser.cs +++ b/PunchAssemble/PunchAndWeld/FrmLaser.cs @@ -34,7 +34,7 @@ namespace PunchAndWeld string stationNo = ConfigurationManager.AppSettings["StationNo"]; label1.Text = ProScreenFunc.GetStation(stationNo); Control.CheckForIllegalCrossThreadCalls = false; - + lbCfg.Text = Program.GetPageCfg(); Thread t = new Thread(new ThreadStart(TimeGo)); t.Start(); textBox1.TabIndex = 0; diff --git a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs index d2b22d3..68dff06 100644 --- a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.Designer.cs @@ -42,6 +42,7 @@ this.状态 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.button3 = new System.Windows.Forms.Button(); this.label9 = new System.Windows.Forms.Label(); + this.lbCfg = new System.Windows.Forms.Label(); 零件号 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.SuspendLayout(); // @@ -185,12 +186,24 @@ this.label9.TabIndex = 27; this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // lbCfg + // + this.lbCfg.AutoSize = true; + this.lbCfg.BackColor = System.Drawing.Color.Transparent; + this.lbCfg.ForeColor = System.Drawing.Color.White; + this.lbCfg.Location = new System.Drawing.Point(12, 9); + this.lbCfg.Name = "lbCfg"; + this.lbCfg.Size = new System.Drawing.Size(65, 21); + this.lbCfg.TabIndex = 28; + this.lbCfg.Text = " "; + // // FrmPreNoPlan // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 21F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); this.ClientSize = new System.Drawing.Size(2317, 1724); + this.Controls.Add(this.lbCfg); this.Controls.Add(this.label9); this.Controls.Add(this.button3); this.Controls.Add(this.listView1); @@ -223,5 +236,6 @@ private System.Windows.Forms.ColumnHeader 状态; private System.Windows.Forms.Button button3; private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label lbCfg; } } \ No newline at end of file diff --git a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs index b13b7c5..15fa5d0 100644 --- a/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs +++ b/PunchAssemble/PunchAndWeld/FrmPreNoPlan.cs @@ -26,7 +26,7 @@ namespace PunchAndWeld string stationNo = ConfigurationManager.AppSettings["StationNo"]; label1.Text = ProScreenFunc.GetStation(stationNo); Control.CheckForIllegalCrossThreadCalls = false; - + lbCfg.Text = Program.GetPageCfg(); Thread t = new Thread(new ThreadStart(TimeGo)); t.Start(); diff --git a/PunchAssemble/PunchAndWeld/FrmProScreen.Designer.cs b/PunchAssemble/PunchAndWeld/FrmProScreen.Designer.cs index fc0de06..c606f71 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreen.Designer.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreen.Designer.cs @@ -51,6 +51,7 @@ this.label5 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.TextBox(); this.button7 = new System.Windows.Forms.Button(); + this.lbCfg = new System.Windows.Forms.Label(); this.SuspendLayout(); // // button1 @@ -67,7 +68,6 @@ this.button1.Click += new System.EventHandler(this.button1_Click); // // button2 - // this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.button2.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button2.Location = new System.Drawing.Point(1680, 678); @@ -80,7 +80,7 @@ this.button2.Click += new System.EventHandler(this.button2_Click); // // button3 - // + // this.button3.Font = new System.Drawing.Font("微软雅黑", 22F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button3.Location = new System.Drawing.Point(1450, 876); this.button3.Margin = new System.Windows.Forms.Padding(2); @@ -358,12 +358,24 @@ this.button7.UseVisualStyleBackColor = false; this.button7.Click += new System.EventHandler(this.button7_Click); // + // lbCfg + // + this.lbCfg.AutoSize = true; + this.lbCfg.BackColor = System.Drawing.Color.Transparent; + this.lbCfg.ForeColor = System.Drawing.Color.White; + this.lbCfg.Location = new System.Drawing.Point(29, 13); + this.lbCfg.Name = "lbCfg"; + this.lbCfg.Size = new System.Drawing.Size(65, 21); + this.lbCfg.TabIndex = 22; + this.lbCfg.Text = " "; + // // FrmProScreen // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = global::PunchAndWeld.Properties.Resources._20200428213144; this.ClientSize = new System.Drawing.Size(1920, 1080); + this.Controls.Add(this.lbCfg); this.Controls.Add(this.button7); this.Controls.Add(this.textBox4); this.Controls.Add(this.label5); @@ -420,5 +432,6 @@ private System.Windows.Forms.Label label5; private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.Button button7; + private System.Windows.Forms.Label lbCfg; } } \ No newline at end of file diff --git a/PunchAssemble/PunchAndWeld/FrmProScreen.cs b/PunchAssemble/PunchAndWeld/FrmProScreen.cs index 55dd8a1..d538154 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreen.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreen.cs @@ -533,6 +533,9 @@ namespace PunchAndWeld Report.ParameterByName("oneBarCode").Value = oneBarCode; Report.ParameterByName("zcPartNo").Value = label3.Text.Trim(); Report.ParameterByName("zcName").Value = label4.Text.Trim(); + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; } private void ReportInitialize1() @@ -571,6 +574,11 @@ namespace PunchAndWeld Report.ParameterByName("SerialNo").Value = sn; Report.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + time.ToString("yyyy/MM/dd"); Report.ParameterByName("oneBarCode").Value = barcode; + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; + + + //Report.ParameterByName("PartName").Value = label4.Text.Trim(); //Report.ParameterByName("BatchNo").Value = time.ToString("yyMMdd"); //string tmp = ProScreenFunc.SerialNo(label3.Text.Trim(), time.ToString("yyMMdd")); @@ -904,6 +912,9 @@ namespace PunchAndWeld Report2.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + tmp[1]; Report2.ParameterByName("oneBarCode").Value = barcode; Report2.ParameterByName("BatchNo").Value = tmp[1]; + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report2.ParameterByName("QLevel").Value = qlevel; Report2.Print(false); textBox4.SelectAll(); } @@ -917,6 +928,8 @@ namespace PunchAndWeld Report1.ParameterByName("oneBarCode").Value = barcode; Report1.ParameterByName("zcPartNo").Value = zl.zcPartNo; Report1.ParameterByName("zcName").Value = zl.zcName; + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report1.ParameterByName("QLevel").Value = qlevel; Report1.Print(false); textBox4.SelectAll(); } diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs b/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs index 33ee595..564574d 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreenBumperS.cs @@ -549,6 +549,19 @@ namespace PunchAndWeld } else { + if (ConfigurationManager.AppSettings["IsDeviceCheck"]?.ToString()?.Trim().ToLower() == "true") + { + string conn = ConfigurationManager.ConnectionStrings["DevConnString"].ConnectionString; + + string isCheck = ProScreenFunc.SearchDevCheck(conn, stationNo); + if (isCheck != "1") + { + MessageBox.Show($"工位[{stationNo}]设备未点检,无法进行扫码操作！"); + textBox1.SelectAll(); + return; + } + } + if (stationNo != "ZP61" && stationNo != "ZP67" && stationNo != "ZP69" && stationNo != "ZP87" && stationNo != "ZP88" && stationNo != "ZP89" && stationNo != "ZP90") { CheckPartAndProduct(); @@ -568,6 +581,7 @@ namespace PunchAndWeld + if (barcode.Contains(".")) { barcode = ProScreenFunc.UniteBarCodeToOne(barcode); @@ -1392,6 +1406,9 @@ namespace PunchAndWeld Report.ParameterByName("oneBarCode").Value = oneBarCode; Report.ParameterByName("zcPartNo").Value = label3.Text.Trim(); Report.ParameterByName("zcName").Value = label4.Text.Trim(); + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; } private void ReportInitialize_New() @@ -1399,6 +1416,9 @@ namespace PunchAndWeld Report.ParameterByName("oneBarCode").Value = oneBarCode; Report.ParameterByName("zcPartNo").Value = zcPartNo; Report.ParameterByName("zcName").Value = productName; + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; } private void ReportInitialize1() @@ -1437,6 +1457,10 @@ namespace PunchAndWeld Report.ParameterByName("SerialNo").Value = sn; Report.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + time.ToString("yyyy/MM/dd"); Report.ParameterByName("oneBarCode").Value = barcode; + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; + //Report.ParameterByName("PartName").Value = label4.Text.Trim(); //Report.ParameterByName("BatchNo").Value = time.ToString("yyMMdd"); //string tmp = ProScreenFunc.SerialNo(label3.Text.Trim(), time.ToString("yyMMdd")); @@ -2029,6 +2053,9 @@ namespace PunchAndWeld Report2.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + tmp[1]; Report2.ParameterByName("oneBarCode").Value = barcode; Report2.ParameterByName("BatchNo").Value = tmp[1]; + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report2.ParameterByName("QLevel").Value = qlevel; + Report2.Print(false); textBox4.SelectAll(); } @@ -2042,6 +2069,8 @@ namespace PunchAndWeld Report1.ParameterByName("oneBarCode").Value = barcode; Report1.ParameterByName("zcPartNo").Value = zl.zcPartNo; Report1.ParameterByName("zcName").Value = zl.zcName; + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report1.ParameterByName("QLevel").Value = qlevel; Report1.Print(false); textBox4.SelectAll(); } diff --git a/PunchAssemble/PunchAndWeld/FrmProScreenS.cs b/PunchAssemble/PunchAndWeld/FrmProScreenS.cs index cbbb68a..9bc445b 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreenS.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreenS.cs @@ -485,6 +485,9 @@ namespace PunchAndWeld Report.ParameterByName("oneBarCode").Value = oneBarCode; Report.ParameterByName("zcPartNo").Value = label3.Text.Trim(); Report.ParameterByName("zcName").Value = label4.Text.Trim(); + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; } catch (Exception ex) { @@ -529,6 +532,9 @@ namespace PunchAndWeld Report.ParameterByName("SerialNo").Value = sn; Report.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + time.ToString("yyyy/MM/dd"); Report.ParameterByName("oneBarCode").Value = barcode; + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; } private void ReportInitialize2() @@ -552,6 +558,9 @@ namespace PunchAndWeld Report.ParameterByName("BarCode").Value = sn; Report.ParameterByName("PartName").Value = label4.Text.Trim(); + + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + Report.ParameterByName("QLevel").Value = qlevel; } private void textBox1_KeyDown(object sender, KeyEventArgs e) @@ -579,6 +588,21 @@ namespace PunchAndWeld oneBarCode = barcode; } + //验证设备点检 + if (ConfigurationManager.AppSettings["IsDeviceCheck"]?.ToString()?.Trim().ToLower() == "true") + { + string conn = ConfigurationManager.ConnectionStrings["DevConnString"].ConnectionString; + + string isCheck = ProScreenFunc.SearchDevCheck(conn, stationNo); + if (isCheck != "1") + { + MessageBox.Show($"工位[{stationNo}]设备未点检,无法进行扫码操作！"); + textBox1.SelectAll(); + return; + } + } + + //if (ProScreenFunc.SjBarCodeIsInStockIn(barcode) == false) //{ // MessageBox.Show($"扫描条码[{barcode}]不存在喷涂下线记录，请更换其他油漆件重新操作!"); @@ -1107,6 +1131,9 @@ namespace PunchAndWeld Report2.ParameterByName("BarCode").Value = sn + ";24;2217;;.0;" + tmp[1]; Report2.ParameterByName("oneBarCode").Value = barcode; Report2.ParameterByName("BatchNo").Value = tmp[1]; + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report2.ParameterByName("QLevel").Value = qlevel; + Report2.Print(false); textBox4.SelectAll(); } @@ -1120,6 +1147,8 @@ namespace PunchAndWeld Report3.ParameterByName("BarCode").Value = dtHg.Rows[0]["SerialNo"].ToString(); Report3.ParameterByName("PartName").Value = zl.zcName; + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report3.ParameterByName("QLevel").Value = qlevel; Report3.Print(false); textBox4.SelectAll(); } @@ -1134,6 +1163,8 @@ namespace PunchAndWeld Report1.ParameterByName("zcName").Value = zl.zcName; Report1.ParameterByName("zcPartNo").Value = zl.zcPartNo; Report1.ParameterByName("SerialNo").Value = dtHg.Rows[0]["SerialNo"].ToString(); + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + Report1.ParameterByName("QLevel").Value = qlevel; Report1.Print(false); textBox4.SelectAll(); } diff --git a/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs b/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs index e890533..8e73859 100644 --- a/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs +++ b/PunchAssemble/PunchAndWeld/FrmProScreen_WheelBrow.cs @@ -363,6 +363,7 @@ namespace PunchAndWeld headTable.Columns.Add("oneBarCode"); headTable.Columns.Add("SerialNo"); headTable.Columns.Add("BatchNo"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["zcPartNo"] = label3.Text.Trim(); @@ -370,6 +371,8 @@ namespace PunchAndWeld row["BatchNo"] = time.ToString("yyMMdd"); row["oneBarCode"] = barcode; row["SerialNo"] = sn; + string qlevel = BusinessHelper.GetQLevel(label3.Text.Trim()); + row["QLevel"] = qlevel; reportName = ConfigurationManager.AppSettings["PrinterName"]; headTable.Rows.Add(row); @@ -529,6 +532,7 @@ namespace PunchAndWeld headTable.Columns.Add("oneBarCode"); headTable.Columns.Add("SerialNo"); headTable.Columns.Add("BatchNo"); + headTable.Columns.Add("QLevel"); DataRow row = headTable.NewRow(); row["zcPartNo"] = zl.zcPartNo; @@ -538,7 +542,8 @@ namespace PunchAndWeld row["BatchNo"] = tmp[1]; row["oneBarCode"] = barcode; row["SerialNo"] = dtHg.Rows[0]["SerialNo"].ToString(); ; - + string qlevel = BusinessHelper.GetQLevel(zl.zcPartNo); + row["QLevel"] = qlevel; string reportName = ConfigurationManager.AppSettings["PrinterName"]; headTable.Rows.Add(row); diff --git a/PunchAssemble/PunchAndWeld/Program.cs b/PunchAssemble/PunchAndWeld/Program.cs index 1477a22..b2c728c 100644 --- a/PunchAssemble/PunchAndWeld/Program.cs +++ b/PunchAssemble/PunchAndWeld/Program.cs @@ -48,7 +48,7 @@ namespace PunchAndWeld Application.Run(new FrmProScreen_WheelBrow()); break; case "7": - Application.Run(new FrmInspection_WheelBrow()); + Application.Run(new FrmInspection_WheelBrow());// break; case "8": Application.Run(new FrmLaser());//PLC @@ -57,7 +57,7 @@ namespace PunchAndWeld Application.Run(new FrmDoorSill()); break; case "10": - Application.Run(new FrmPrintOrder()); + Application.Run(new FrmPrintOrder());// break; case "11": Application.Run(new FrmPreNoPlan()); @@ -83,5 +83,9 @@ namespace PunchAndWeld MessageBox.Show("程序已启动!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information); } } + public static string GetPageCfg() + { + return ConfigurationManager.AppSettings["StationNo"] + "." + ConfigurationManager.AppSettings["ProScreenMode"].ToString(); + } } }