From d2ad7d7d13486180b7c023cd6f1a8cbe721fe194 Mon Sep 17 00:00:00 2001 From: a88359121 <34059079@qq.com> Date: Wed, 30 Jul 2025 08:00:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JinYuan.ControlCenter/ControlCenter.cs | 2 +- JinYuan.ControlCenter/ControlCenter_Plc.cs | 199 ++++++++++++++++----- JinYuan.MES/MesDataProcess.cs | 6 +- JinYuan.MES/Models/ManyCellOutStation.cs | 42 ++++- LargeSquareOne/Config/Configure.ini | 4 +- LargeSquareOne/FrmLoginMes.Designer.cs | 52 +++--- LargeSquareOne/LargeSquareOne.csproj.user | 4 +- 7 files changed, 235 insertions(+), 74 deletions(-) diff --git a/JinYuan.ControlCenter/ControlCenter.cs b/JinYuan.ControlCenter/ControlCenter.cs index 7dfff3f..e85db2c 100644 --- a/JinYuan.ControlCenter/ControlCenter.cs +++ b/JinYuan.ControlCenter/ControlCenter.cs @@ -140,7 +140,7 @@ namespace JinYuan.ControlCenters DicStationFunction.Add("电芯进站", FeedingStation); //DicStationFunction.Add("NG出站", NGStation); - //DicStationFunction.Add("外观检测出站", BlankingStation); + DicStationFunction.Add("电芯出站", BlankingStation); for (int i = 0; i < CommonMethods.ChatLineCount; i++) { diff --git a/JinYuan.ControlCenter/ControlCenter_Plc.cs b/JinYuan.ControlCenter/ControlCenter_Plc.cs index be6e2ea..0b74589 100644 --- a/JinYuan.ControlCenter/ControlCenter_Plc.cs +++ b/JinYuan.ControlCenter/ControlCenter_Plc.cs @@ -50,6 +50,115 @@ namespace JinYuan.ControlCenters /// /// 判断总结果 /// + //private int JudgmentResult(int A, int B, int C, int D, int E, int F, int G, int H, int I, int J, int K, int L, int M, int N) + //{ + // //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包铜焊印位置， + // //芯包正面极耳撕裂H，芯包背面极耳撕裂，芯包正面极耳翻折J，芯包背面极耳翻折,测厚压力结果, + // //焊前CCD检测结果,铝焊印位置判定结果 + + // //目前先判断条码，芯包重量，芯包侧厚，芯包CCD极性检测，芯包正面极耳撕裂，芯包正面极耳翻折 + // int Result = 0; + // OK_NG = "OK"; + // if (A == 2 || B == 2 || C == 2 || D == 2 || H == 2 || J == 2) + // { + // //ed + // Result = 2; + // OK_NG = "NG"; + // } + // else if (A == 1 && B == 1 && C == 1 && D == 1 && H == 1 && J == 1) + // { + // Result = 1; + // OK_NG = "OK"; + // } + // else + // { + // Result = 1; + // OK_NG = "OK"; + // } + + // if (A == 2) + // { + // NG_Type += "无条码_"; + // Result = 2; + // } + // if (B == 2) + // { + // NG_Type += "芯包重量1NG_"; + // //return 2; + // Result = 2; + // } + // if (C == 2) + // { + // NG_Type += "芯包侧厚NG_"; + // //return 2; + // Result = 2; + // } + // if (D == 2) + // { + // NG_Type += "芯包CCD极性检测NG_"; + // //return 2; + // Result = 2; + // } + + // //if (E == 2) + // //{ + // // NG_Type += "电芯裁切粘连NG_"; + // // //return 2; + // //} + // //if (F == 2) + // //{ + // // NG_Type += "电芯裁切毛刺NG_"; + // // //return 2; + // //} + // //if (G == 2) + // //{ + // // NG_Type += "芯包铜焊印位置判定NG_"; + // // //return 2; + // //} + // if (H == 2) + // { + // NG_Type += "芯包正面极耳撕裂NG_"; + // //return 2; + // } + // //if (I == 2) + // //{ + // // NG_Type += "芯包背面极耳撕裂NG_"; + // // //return 2; + // //} + // if (J == 2) + // { + // NG_Type += "芯包正面极耳翻折NG_"; + // //return 2; + // } + // //if (K == 2) + // //{ + // // NG_Type += "芯包背面极耳翻折NG_"; + // // //return 2; + // //} + // if (L == 2) + // { + // NG_Type += "测厚压力NG_"; + // //return 2; + // } + // if (M == 2) + // { + // NG_Type += "焊前CCD检测NG_"; + // //return 2; + // } + // if (N == 2) + // { + // NG_Type += "铝焊印位置判定NG_"; + // //return 2; + // } + // if (Result == 1) + // { + // NG_Type += "OK_"; + // } + // return Result; + //} + /// + /// 判断总结果 + /// private int JudgmentResult(int A, int B, int C, int D, int E, int F, int G, int H, int I, int J, int K, int L, int M, int N) { //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包铜焊印位置， @@ -156,7 +265,6 @@ namespace JinYuan.ControlCenters } return Result; } - #region 上料工位(数据处理) /// /// 上料工位 @@ -195,9 +303,9 @@ namespace JinYuan.ControlCenters //listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 240, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); //listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 280, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); //listBarCode[3] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 320, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); //listBarCode[0] = "TEST"; //listBarCode[1] = "TEST"; @@ -1626,9 +1734,9 @@ namespace JinYuan.ControlCenters //反馈结果 #region 电芯解析 //电芯解析 从3200 开始 - listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); - listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bArrays.Content, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[0] = StringLib.GetStringFromByteArrayByEncoding(bytes, 0, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[1] = StringLib.GetStringFromByteArrayByEncoding(bytes, 40, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); + listBarCode[2] = StringLib.GetStringFromByteArrayByEncoding(bytes, 80, 40, System.Text.Encoding.ASCII).Replace('\0', ' ').Replace('\r', ' ').Replace(" ", "").Trim(); #region 上传MES //D3200起 for (int i = 0; i < 3; i++) @@ -1705,33 +1813,33 @@ namespace JinYuan.ControlCenters //电芯CCD判定结果 #region //电芯CCD判定结果 - m.CCDResult1 = m.CCD_Data[i, 0] == 1 ? "OK" : (m.CCD_Data[i, 0] == 2 ? "NG" : "缺图"); - m.CCDResult2 = m.CCD_Data[i, 1] == 1 ? "OK" : (m.CCD_Data[i, 1] == 2 ? "NG" : "缺图"); - m.CCDResult3 = m.CCD_Data[i, 2] == 1 ? "OK" : (m.CCD_Data[i, 2] == 2 ? "NG" : "缺图"); - m.CCDResult4 = m.CCD_Data[i, 3] == 1 ? "OK" : (m.CCD_Data[i, 3] == 2 ? "NG" : "缺图"); - m.CCDResult5 = m.CCD_Data[i, 4] == 1 ? "OK" : (m.CCD_Data[i, 4] == 2 ? "NG" : "缺图"); - m.CCDResult6 = m.CCD_Data[i, 5] == 1 ? "OK" : (m.CCD_Data[i, 5] == 2 ? "NG" : "缺图"); - m.CCDResult7 = m.CCD_Data[i, 6] == 1 ? "OK" : (m.CCD_Data[i, 6] == 2 ? "NG" : "缺图"); - m.CCDResult8 = m.CCD_Data[i, 7] == 1 ? "OK" : (m.CCD_Data[i, 7] == 2 ? "NG" : "缺图"); - m.CCDResult9 = m.CCD_Data[i, 8] == 1 ? "OK" : (m.CCD_Data[i, 8] == 2 ? "NG" : "缺图"); - m.CCDResult10 = m.CCD_Data[i, 9] == 1 ? "OK" : (m.CCD_Data[i, 9] == 2 ? "NG" : "缺图"); - m.CCDResult11 = m.CCD_Data[i, 10] == 1 ? "OK" : (m.CCD_Data[i, 10] == 2 ? "NG" : "缺图"); - m.CCDResult12 = m.CCD_Data[i, 11] == 1 ? "OK" : (m.CCD_Data[i, 11] == 2 ? "NG" : "缺图"); - m.CCDResult13 = m.CCD_Data[i, 12] == 1 ? "OK" : (m.CCD_Data[i, 12] == 2 ? "NG" : "缺图"); - m.CCDResult14 = m.CCD_Data[i, 13] == 1 ? "OK" : (m.CCD_Data[i, 13] == 2 ? "NG" : "缺图"); - m.CCDResult15 = m.CCD_Data[i, 14] == 1 ? "OK" : (m.CCD_Data[i, 14] == 2 ? "NG" : "缺图"); - m.CCDResult16 = m.CCD_Data[i, 15] == 1 ? "OK" : (m.CCD_Data[i, 15] == 2 ? "NG" : "缺图"); - m.CCDResult17 = m.CCD_Data[i, 16] == 1 ? "OK" : (m.CCD_Data[i, 16] == 2 ? "NG" : "缺图"); - m.CCDResult18 = m.CCD_Data[i, 17] == 1 ? "OK" : (m.CCD_Data[i, 17] == 2 ? "NG" : "缺图"); - m.CCDResult19 = m.CCD_Data[i, 18] == 1 ? "OK" : (m.CCD_Data[i, 18] == 2 ? "NG" : "缺图"); - m.CCDResult20 = m.CCD_Data[i, 19] == 1 ? "OK" : (m.CCD_Data[i, 19] == 2 ? "NG" : "缺图"); - m.CCDResult21 = m.CCD_Data[i, 20] == 1 ? "OK" : (m.CCD_Data[i, 20] == 2 ? "NG" : "缺图"); - m.CCDResult22 = m.CCD_Data[i, 21] == 1 ? "OK" : (m.CCD_Data[i, 21] == 2 ? "NG" : "缺图"); - m.CCDResult23 = m.CCD_Data[i, 22] == 1 ? "OK" : (m.CCD_Data[i, 22] == 2 ? "NG" : "缺图"); - m.CCDResult24 = m.CCD_Data[i, 23] == 1 ? "OK" : (m.CCD_Data[i, 23] == 2 ? "NG" : "缺图"); - m.CCDResult25 = m.CCD_Data[i, 24] == 1 ? "OK" : (m.CCD_Data[i, 24] == 2 ? "NG" : "缺图"); - m.CCDResult26 = m.CCD_Data[i, 25] == 1 ? "OK" : (m.CCD_Data[i, 25] == 2 ? "NG" : "缺图"); - m.CCDResult27 = m.CCD_Data[i, 26] == 1 ? "OK" : (m.CCD_Data[i, 26] == 2 ? "NG" : "缺图"); + m.CCDResult1 = m.CCD_Data[i, 0] == 0 ? "OK" : (m.CCD_Data[i, 0] == 1 ? "NG" : "缺图"); + m.CCDResult2 = m.CCD_Data[i, 1] == 0 ? "OK" : (m.CCD_Data[i, 1] == 1 ? "NG" : "缺图"); + m.CCDResult3 = m.CCD_Data[i, 2] == 0 ? "OK" : (m.CCD_Data[i, 2] == 1 ? "NG" : "缺图"); + m.CCDResult4 = m.CCD_Data[i, 3] == 0 ? "OK" : (m.CCD_Data[i, 3] == 1 ? "NG" : "缺图"); + m.CCDResult5 = m.CCD_Data[i, 4] == 0 ? "OK" : (m.CCD_Data[i, 4] == 1 ? "NG" : "缺图"); + m.CCDResult6 = m.CCD_Data[i, 5] == 0 ? "OK" : (m.CCD_Data[i, 5] == 1 ? "NG" : "缺图"); + m.CCDResult7 = m.CCD_Data[i, 6] == 0 ? "OK" : (m.CCD_Data[i, 6] == 1 ? "NG" : "缺图"); + m.CCDResult8 = m.CCD_Data[i, 7] == 0 ? "OK" : (m.CCD_Data[i, 7] == 1 ? "NG" : "缺图"); + m.CCDResult9 = m.CCD_Data[i, 8] == 0 ? "OK" : (m.CCD_Data[i, 8] == 1 ? "NG" : "缺图"); + m.CCDResult10 = m.CCD_Data[i, 9] == 0 ? "OK" : (m.CCD_Data[i, 9] == 1 ? "NG" : "缺图"); + m.CCDResult11 = m.CCD_Data[i, 10] == 0 ? "OK" : (m.CCD_Data[i, 10] == 1 ? "NG" : "缺图"); + m.CCDResult12 = m.CCD_Data[i, 11] == 0 ? "OK" : (m.CCD_Data[i, 11] == 1 ? "NG" : "缺图"); + m.CCDResult13 = m.CCD_Data[i, 12] == 0 ? "OK" : (m.CCD_Data[i, 12] == 1 ? "NG" : "缺图"); + m.CCDResult14 = m.CCD_Data[i, 13] == 0 ? "OK" : (m.CCD_Data[i, 13] == 1 ? "NG" : "缺图"); + m.CCDResult15 = m.CCD_Data[i, 14] == 0 ? "OK" : (m.CCD_Data[i, 14] == 1 ? "NG" : "缺图"); + m.CCDResult16 = m.CCD_Data[i, 15] == 0 ? "OK" : (m.CCD_Data[i, 15] == 1 ? "NG" : "缺图"); + m.CCDResult17 = m.CCD_Data[i, 16] == 0 ? "OK" : (m.CCD_Data[i, 16] == 1 ? "NG" : "缺图"); + m.CCDResult18 = m.CCD_Data[i, 17] == 0 ? "OK" : (m.CCD_Data[i, 17] == 1 ? "NG" : "缺图"); + m.CCDResult19 = m.CCD_Data[i, 18] == 0 ? "OK" : (m.CCD_Data[i, 18] == 1 ? "NG" : "缺图"); + m.CCDResult20 = m.CCD_Data[i, 19] == 0 ? "OK" : (m.CCD_Data[i, 19] == 1 ? "NG" : "缺图"); + m.CCDResult21 = m.CCD_Data[i, 20] == 0 ? "OK" : (m.CCD_Data[i, 20] == 1 ? "NG" : "缺图"); + m.CCDResult22 = m.CCD_Data[i, 21] == 0 ? "OK" : (m.CCD_Data[i, 21] == 1 ? "NG" : "缺图"); + m.CCDResult23 = m.CCD_Data[i, 22] == 0 ? "OK" : (m.CCD_Data[i, 22] == 1 ? "NG" : "缺图"); + m.CCDResult24 = m.CCD_Data[i, 23] == 0 ? "OK" : (m.CCD_Data[i, 23] == 1 ? "NG" : "缺图"); + m.CCDResult25 = m.CCD_Data[i, 24] == 0 ? "OK" : (m.CCD_Data[i, 24] == 1 ? "NG" : "缺图"); + m.CCDResult26 = m.CCD_Data[i, 25] == 0 ? "OK" : (m.CCD_Data[i, 25] == 1 ? "NG" : "缺图"); + m.CCDResult27 = m.CCD_Data[i, 26] == 0 ? "OK" : (m.CCD_Data[i, 26] == 1 ? "NG" : "缺图"); #endregion m.CSBYHASCANNINGTIME = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); @@ -1742,14 +1850,25 @@ namespace JinYuan.ControlCenters m.Thickness1 = SaveTwoNum(m.Thickness_Data[i, 0]); m.Thickness2 = SaveTwoNum(m.Thickness_Data[i, 1]); - m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]); - + m.Thickness3 = SaveTwoNum(m.Thickness_Data[i, 2]); + //条码，芯包重量，芯包侧厚，芯包CCD极性检测，电芯裁切粘连，电芯裁切毛刺，芯包焊印位置， //芯包正面极耳撕裂，芯包背面极耳撕裂，芯包正面极耳翻折，芯包背面极耳翻折 - MyRes[i] = JudgmentResult(Code_NG, m.list_Data1[i, 10], m.list_Data1[i, 11], - m.list_Data1[i, 12], m.list_Data1[i, 13], m.list_Data1[i, 14], m.list_Data1[i, 15], - m.list_Data1[i, 16], m.list_Data1[i, 17], m.list_Data1[i, 18], m.list_Data1[i, 19], - m.list_Data1[i, 23], m.list_Data1[i, 24], m.list_Data1[i, 25]); + if (Code_NG == 1) + { + for (int ii = 0; ii < 27; ii++) + { + if (m.CCD_Data[i, ii] != 0) + { + MyRes[i] = m.CCD_Data[i, ii]; + break; + } + + } + } + else + MyRes[i] = 1; + //MyRes[i] = JudgmentResult(Code_NG, m.CCD_Data); m.Result = MyRes[i]; diff --git a/JinYuan.MES/MesDataProcess.cs b/JinYuan.MES/MesDataProcess.cs index df838d9..1a896a2 100644 --- a/JinYuan.MES/MesDataProcess.cs +++ b/JinYuan.MES/MesDataProcess.cs @@ -246,7 +246,7 @@ namespace JinYuan.MES materialCode = materialCode, userName = userName, identification = BarCode, - productType = "OK" + productType = "MB56" }; @@ -734,9 +734,9 @@ namespace JinYuan.MES for (int i = 0; i < 1; i++) { //先给mes 传OK - model.identiftyList = new List() + model.assembleLineList = new List() { - new identiftyList() + new assembleLineList() { identification=listBar.CSBYHCODEA, qualityStatus = listBar.CSBYHOUTSTATIONJUDGMENTRESULT, diff --git a/JinYuan.MES/Models/ManyCellOutStation.cs b/JinYuan.MES/Models/ManyCellOutStation.cs index 982bf7f..066ab71 100644 --- a/JinYuan.MES/Models/ManyCellOutStation.cs +++ b/JinYuan.MES/Models/ManyCellOutStation.cs @@ -49,10 +49,48 @@ namespace JinYuan.MES.Models /// public int type { get; set; } - public List identiftyList { get; set; } + // public List identiftyList { get; set; } + public List assembleLineList { get; set; } } - + + public class assembleLineList + { + + /// + /// 产品条码 + /// + public string identification { get; set; } + /// + /// 原材料信息 + /// + public List materialLotList = new List(); + /// + /// 原材料条码 + /// + public string materialLotCode { get; set; } + /// + /// 原材料上料位置 + /// + public string materialLotCodeLocator { get; set; } + /// + /// 质量状态 + /// + public string qualityStatus { get; set; } + /// + /// 关联条码 + /// + public string qrCode { get; set; } + /// + /// NG编码 + /// + public List ngCode = new List(); + /// + /// NG错误信息 + /// + public string ngMessage = ""; + + } public class identiftyList { diff --git a/LargeSquareOne/Config/Configure.ini b/LargeSquareOne/Config/Configure.ini index 48e5e1b..b982b35 100644 --- a/LargeSquareOne/Config/Configure.ini +++ b/LargeSquareOne/Config/Configure.ini @@ -26,10 +26,10 @@ MES ԱȨУ=http://10.22.160.141/core/api/public/equipment/base/user/login/verify 豸趨ֵ=http://10.22.160.141/core/api/public/param/setting/request 豸趨ֵ=http://10.22.160.141/core/api/public/param/setting/change -Ʒվ=http://10.22.160.141/core/api/public/in/station/process/currency +Ʒվ=http://10.22.160.141/core/api/public/formation/section/arrival/bz Ʒ̼ӹ=http://10.22.160.141/core/api/public/product/process/param/new/process Ʒӹ=http://10.22.160.141/core/api/public/product/process/param/new/result -Ʒվ=http://10.22.160.141/core/api/public/out/station/process/turn/equip +Ʒվ=http://10.22.160.141/core/api/public/eve/pm/formation-section/bz 豸=http://10.22.160.141/core/api/public/equipment/alarm/currency 豸״̬=http://10.22.160.141/core/api/public/eve/pm/eqm/run/status/operation ܺ=http://10.22.160.141/core/api/public/eve/pm/energy/consumption/collection/submit diff --git a/LargeSquareOne/FrmLoginMes.Designer.cs b/LargeSquareOne/FrmLoginMes.Designer.cs index 94e236a..5825cc2 100644 --- a/LargeSquareOne/FrmLoginMes.Designer.cs +++ b/LargeSquareOne/FrmLoginMes.Designer.cs @@ -48,11 +48,11 @@ this.txt_LoginMesPwd.BorderStyle = System.Windows.Forms.BorderStyle.None; this.txt_LoginMesPwd.Font = new System.Drawing.Font("微软雅黑", 15F); this.txt_LoginMesPwd.ForeColor = System.Drawing.Color.Black; - this.txt_LoginMesPwd.Location = new System.Drawing.Point(215, 161); - this.txt_LoginMesPwd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_LoginMesPwd.Location = new System.Drawing.Point(322, 242); + this.txt_LoginMesPwd.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.txt_LoginMesPwd.Name = "txt_LoginMesPwd"; this.txt_LoginMesPwd.PasswordChar = '*'; - this.txt_LoginMesPwd.Size = new System.Drawing.Size(164, 27); + this.txt_LoginMesPwd.Size = new System.Drawing.Size(246, 40); this.txt_LoginMesPwd.TabIndex = 17; this.txt_LoginMesPwd.Text = "123456"; // @@ -62,12 +62,12 @@ this.txt_LoginMesName.BorderStyle = System.Windows.Forms.BorderStyle.None; this.txt_LoginMesName.Font = new System.Drawing.Font("微软雅黑", 15F); this.txt_LoginMesName.ForeColor = System.Drawing.Color.Black; - this.txt_LoginMesName.Location = new System.Drawing.Point(215, 101); - this.txt_LoginMesName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_LoginMesName.Location = new System.Drawing.Point(322, 152); + this.txt_LoginMesName.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.txt_LoginMesName.Name = "txt_LoginMesName"; - this.txt_LoginMesName.Size = new System.Drawing.Size(164, 27); + this.txt_LoginMesName.Size = new System.Drawing.Size(246, 40); this.txt_LoginMesName.TabIndex = 16; - this.txt_LoginMesName.Text = "test_zz"; + this.txt_LoginMesName.Text = "admin"; this.txt_LoginMesName.DoubleClick += new System.EventHandler(this.txt_LoginMesName_DoubleClick); this.txt_LoginMesName.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txt_LoginMesName_KeyDown); // @@ -79,10 +79,10 @@ this.btn_LoginMes.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_LoginMes.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btn_LoginMes.ForeColor = System.Drawing.Color.White; - this.btn_LoginMes.Location = new System.Drawing.Point(215, 212); - this.btn_LoginMes.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.btn_LoginMes.Location = new System.Drawing.Point(322, 318); + this.btn_LoginMes.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.btn_LoginMes.Name = "btn_LoginMes"; - this.btn_LoginMes.Size = new System.Drawing.Size(144, 43); + this.btn_LoginMes.Size = new System.Drawing.Size(216, 64); this.btn_LoginMes.TabIndex = 15; this.btn_LoginMes.Text = "登 录"; this.btn_LoginMes.UseVisualStyleBackColor = false; @@ -92,10 +92,10 @@ // this.pictureBox2.BackColor = System.Drawing.Color.Transparent; this.pictureBox2.Image = global::LargeSquareOne.Properties.Resources._25_密码; - this.pictureBox2.Location = new System.Drawing.Point(171, 152); - this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pictureBox2.Location = new System.Drawing.Point(256, 228); + this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(34, 37); + this.pictureBox2.Size = new System.Drawing.Size(51, 56); this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox2.TabIndex = 19; this.pictureBox2.TabStop = false; @@ -104,10 +104,10 @@ // this.pictureBox1.BackColor = System.Drawing.Color.Transparent; this.pictureBox1.Image = global::LargeSquareOne.Properties.Resources.用户; - this.pictureBox1.Location = new System.Drawing.Point(171, 92); - this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.pictureBox1.Location = new System.Drawing.Point(256, 138); + this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 8, 6, 8); this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(34, 36); + this.pictureBox1.Size = new System.Drawing.Size(51, 54); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.TabIndex = 18; this.pictureBox1.TabStop = false; @@ -121,9 +121,10 @@ this.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_Close.Font = new System.Drawing.Font("微软雅黑", 14F); this.btn_Close.ForeColor = System.Drawing.Color.Black; - this.btn_Close.Location = new System.Drawing.Point(409, 3); + this.btn_Close.Location = new System.Drawing.Point(614, 4); + this.btn_Close.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btn_Close.Name = "btn_Close"; - this.btn_Close.Size = new System.Drawing.Size(32, 34); + this.btn_Close.Size = new System.Drawing.Size(48, 51); this.btn_Close.TabIndex = 21; this.btn_Close.Text = "X"; this.btn_Close.UseVisualStyleBackColor = false; @@ -133,9 +134,10 @@ // this.pictureBox3.BackColor = System.Drawing.Color.Transparent; this.pictureBox3.Image = global::LargeSquareOne.Properties.Resources.yiweidongli; - this.pictureBox3.Location = new System.Drawing.Point(0, 3); + this.pictureBox3.Location = new System.Drawing.Point(0, 4); + this.pictureBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.pictureBox3.Name = "pictureBox3"; - this.pictureBox3.Size = new System.Drawing.Size(153, 34); + this.pictureBox3.Size = new System.Drawing.Size(230, 51); this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox3.TabIndex = 22; this.pictureBox3.TabStop = false; @@ -146,18 +148,19 @@ this.label1.BackColor = System.Drawing.Color.Transparent; this.label1.Font = new System.Drawing.Font("微软雅黑", 26.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); - this.label1.Location = new System.Drawing.Point(269, 33); + this.label1.Location = new System.Drawing.Point(404, 50); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(97, 46); + this.label1.Size = new System.Drawing.Size(147, 70); this.label1.TabIndex = 23; this.label1.Text = "MES"; // // FrmLoginMes // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = global::LargeSquareOne.Properties.Resources.Login1; - this.ClientSize = new System.Drawing.Size(444, 317); + this.ClientSize = new System.Drawing.Size(666, 476); this.Controls.Add(this.label1); this.Controls.Add(this.pictureBox3); this.Controls.Add(this.btn_Close); @@ -168,6 +171,7 @@ this.Controls.Add(this.btn_LoginMes); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FrmLoginMes"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "FrmLoginMes"; diff --git a/LargeSquareOne/LargeSquareOne.csproj.user b/LargeSquareOne/LargeSquareOne.csproj.user index cebb4cf..78c201e 100644 --- a/LargeSquareOne/LargeSquareOne.csproj.user +++ b/LargeSquareOne/LargeSquareOne.csproj.user @@ -1,7 +1,7 @@ - + - ProjectFiles + ShowAllFiles publish\