web报表换成了永红报表. 注塑打印,解决了跨天不关系统,第一个注塑码重复问题. 门槛分左右的打印程序换成了新的.

SjMes/BBMPT.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
+# Visual Studio Version 16
-VisualStudioVersion = 17.8.34330.188
+VisualStudioVersion = 16.0.29728.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MESWebSite", "MESWebSite\MESWebSite.csproj", "{B1DEC82C-3F33-4FC9-A37B-9527315E2C5E}"
 EndProject
@@ -53,8 +53,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Updater", "Updater\Updater.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PurchingMistakeNew", "PurchingMistakeNew\PurchingMistakeNew.csproj", "{D41C0724-818F-495C-84AF-945D6C9AE693}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AndonAssembly", "AndonAssembly\AndonAssembly.csproj", "{1BD4E2B2-0FE4-4022-8DE0-C55A467BE201}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -143,12 +141,6 @@ Global
 		{D41C0724-818F-495C-84AF-945D6C9AE693}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D41C0724-818F-495C-84AF-945D6C9AE693}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D41C0724-818F-495C-84AF-945D6C9AE693}.Release|x86.ActiveCfg = Release|Any CPU
-		{1BD4E2B2-0FE4-4022-8DE0-C55A467BE201}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BD4E2B2-0FE4-4022-8DE0-C55A467BE201}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BD4E2B2-0FE4-4022-8DE0-C55A467BE201}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1BD4E2B2-0FE4-4022-8DE0-C55A467BE201}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BD4E2B2-0FE4-4022-8DE0-C55A467BE201}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1BD4E2B2-0FE4-4022-8DE0-C55A467BE201}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

SjMes/InjectionPC/App.config

@@ -3,13 +3,14 @@
   <connectionStrings>
     <!--<add name="SqlConnString" connectionString="Persist Security Info=true;Initial Catalog=BBMPT;Data Source=39.97.227.79;User ID=sa;Password=a1+"/>-->
 	  <add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>
+	  <!--<add name="SqlConnString" connectionString="DATA SOURCE = 10.60.101.9;USER ID = sa;PASSWORD = a1+;INITIAL CATALOG = BBMPT"/>-->
 	  <!--<add name="report" connectionString="Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=PC201904081405E;Use Encryption for Data=False;Tag with column collation when possible=False"/>-->
     <add name="report" connectionString="Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=39.97.227.79;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=PC201904081405E;Use Encryption for Data=False;Tag with column collation when possible=False"/>
 
   </connectionStrings>
   <appSettings>
     <!--<add key="SqlConnString" value="Persist Security Info=true;Initial Catalog=BBMPT;Data Source=60.205.186.180;User ID=sa;Password=ran1+"/>-->
-    <add key="Station" value="IM02"/>
+    <add key="Station" value="IM03"/>
 
     <add key="InterVal" value="5000"/>
     <!--<add key="IP" value="10.60.52.96"/>-->
@@ -22,6 +23,8 @@
     <add key="WeightPsw" value="1"/>-->
     <!--<add key="IP" value="172.16.142.243"/>-->
     <add key="IP" value="192.168.1.100"/>
+	  <!--测试时将称重离线设置为true-->
+	  <!--<add key="WeightOutLine" value="false"/>-->
 	  <add key="WeightFolder" value="aa"/>
     <add key="WeightFile" value="111.xlsx"/>
     <add key="WeightUser" value="fangfang wang"/>

SjMes/InjectionPC/FrmBarCode.cs

@@ -33,7 +33,7 @@ namespace InjectionPC
         {
             InitializeComponent();
         }
-
+        private bool _weightOutLine = false;
         public string oldTime = "", newTime = "",tempTime="";
         public static bool IsStart = true;
         public string planID = "";
@@ -177,6 +177,7 @@ namespace InjectionPC
             Ping p1 = new Ping();
             bool status = false;
             string code = "",OneCode="";
+            //NewOneCode 左门槛   NewOneCode1右门槛
             string newcode = "", newcode1 = "", NewOneCode = "", NewOneCode1 = "", printerName = "", rfilename = "", reportName="";
             string[] part=new string[3];
             GridppReport report = new GridppReport();
@@ -238,10 +239,17 @@ namespace InjectionPC
             {
                 PingReply reply = p1.Send(Program.IP); //发送主机名或Ip地址
                 StringBuilder sbuilder;
-                if (reply.Status == IPStatus.Success)
+                if (reply.Status == IPStatus.Success || Program.WeightOutLine==true)
                 {
                     //读取称重文件
+                    if(Program.WeightOutLine == true)
+                    {
+                        status = true;
+                    }
+                    else
+                    {
                         status = Upload.DoConnComputer(Program.IP, Program.WeightFolder, Program.WeightUser, Program.WeightPsw);
+                    }
                     if (status)
                     {
                         //DirectoryInfo theFolder = new DirectoryInfo(@"\\192.168.1.16\aa");
@@ -249,7 +257,11 @@ namespace InjectionPC
                         DirectoryInfo theFolder = new DirectoryInfo(@"\\" + Program.IP + "\\" + Program.WeightFolder);
                         //string filename = theFolder.ToString() + "\\ProdHisFile.csv";
                         string filename = theFolder.ToString() + "\\" + Program.WeightFile;
-
+                        if (Program.WeightOutLine == true)
+                        {
+                            filename = Application.StartupPath + "\\Report\\称重.xlsx";
+                            oldTime = "2024-06-24 13:22:08";
+                        }
                         FileInfo fl = new FileInfo(filename);
                         
 
@@ -295,6 +307,7 @@ namespace InjectionPC
                                             }
                                             else
                                             {
+                                                ReloadProduceDate();
                                                 //按照二维码的生成规则
                                                 newcode = dt.Rows[0]["PartNo"].ToString().Trim() + "." + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "." + "0001";
                                                 NewOneCode = dt.Rows[0]["StockNo"].ToString().Trim() + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
@@ -392,9 +405,14 @@ namespace InjectionPC
                                                         reportName = ConfigurationManager.AppSettings["Printer1"];
                                                         headTable.Rows.Add(row);
 
-                                                        ReportHelper rp = new ReportHelper(filename, headTable, null,
+                                                        //ReportHelper rp = new ReportHelper(filename, headTable, null,
-                                                            (int)GRPaperOrientation.grpoDefault, 1, reportName);
+                                                        //    (int)GRPaperOrientation.grpoDefault, 1, reportName);
-                                                        rp.Report.Print(false);
+                                                        //rp.Report.Print(false);
+
+                                                        //string filename_label = Application.StartupPath + "\\Report\\111 - 副本.grf";
+                                                        MyReport report2 = new MyReport(filename, headTable, null, reportName);
+                                                        report2.Report.Printer.PrinterName = reportName;
+                                                        report2.Report.Print(false);
 
                                                         #endregion
 
@@ -458,9 +476,13 @@ namespace InjectionPC
                                                         reportName = ConfigurationManager.AppSettings["Printer2"];
                                                         headTable1.Rows.Add(row1);
 
-                                                        ReportHelper rp1 = new ReportHelper(filename, headTable1, null,
+                                                        //ReportHelper rp1 = new ReportHelper(filename, headTable1, null,
-                                                            (int)GRPaperOrientation.grpoDefault, 1, reportName);
+                                                        //    (int)GRPaperOrientation.grpoDefault, 1, reportName);
-                                                        rp1.Report.Print(false);
+                                                        //rp1.Report.Print(false);
+
+                                                        MyReport report2 = new MyReport(filename, headTable1, null, reportName);
+                                                        report2.Report.Printer.PrinterName = reportName;
+                                                        report2.Report.Print(false);
 
                                                         #endregion
 
@@ -502,6 +524,7 @@ namespace InjectionPC
                                                     }
                                                     else
                                                     {
+                                                        ReloadProduceDate();
                                                         //按照二维码的生成规则
                                                         newcode1 = prdt.Rows[0]["PartNo"].ToString().Trim() + "." + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "." + "0001";
                                                         NewOneCode1 = prdt.Rows[0]["StockNo"].ToString().Trim() + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
@@ -570,10 +593,13 @@ namespace InjectionPC
                                                         reportName = ConfigurationManager.AppSettings["Printer2"];
                                                         headTable.Rows.Add(row);
 
-                                                        ReportHelper rp = new ReportHelper(filename, headTable, null,
+                                                        //ReportHelper rp = new ReportHelper(filename, headTable, null,
-                                                            (int)GRPaperOrientation.grpoDefault, 1, reportName);
+                                                        //    (int)GRPaperOrientation.grpoDefault, 1, reportName);
-                                                        rp.Report.Print(false);
+                                                        //rp.Report.Print(false);
 
+                                                        MyReport report2 = new MyReport(filename, headTable, null, reportName);
+                                                        report2.Report.Printer.PrinterName = reportName;
+                                                        report2.Report.Print(false);
                                                         #endregion
 
                                                         LogHelper.WriteLog("打印时间:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + ";" + NewOneCode);
@@ -636,10 +662,13 @@ namespace InjectionPC
                                                         reportName = ConfigurationManager.AppSettings["Printer1"];
                                                         headTable1.Rows.Add(row1);
 
-                                                        ReportHelper rp1 = new ReportHelper(filename, headTable1, null,
+                                                        //ReportHelper rp1 = new ReportHelper(filename, headTable1, null,
-                                                            (int)GRPaperOrientation.grpoDefault, 1, reportName);
+                                                        //    (int)GRPaperOrientation.grpoDefault, 1, reportName);
-                                                        rp1.Report.Print(false);
+                                                        //rp1.Report.Print(false);
 
+                                                        MyReport report2 = new MyReport(filename, headTable1, null, reportName);
+                                                        report2.Report.Printer.PrinterName = reportName;
+                                                        report2.Report.Print(false);
                                                         #endregion
 
                                                         LogHelper.WriteLog("打印时间:" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + ";" + NewOneCode1);
@@ -676,6 +705,7 @@ namespace InjectionPC
                                             }
                                             else
                                             {
+                                                ReloadProduceDate();
                                                 //按照二维码的生成规则
                                                 newcode = dt.Rows[0]["PartNo"].ToString().Trim() + "." + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "." + "0001";
                                                 NewOneCode = dt.Rows[0]["StockNo"].ToString().Trim() + Program.ProductDate.Substring(2, 2) + Program.ProductDate.Substring(5, 2) + Program.ProductDate.Substring(8, 2) + "0001";
@@ -784,7 +814,13 @@ namespace InjectionPC
             timer1.Interval = Program.interVal;
             timer1.Start();
         }
-
+        void ReloadProduceDate()
+        {
+            if (DateTime.Parse(Program.ProductDate).ToString("yyyy-MM-dd") != DateTime.Now.ToString("yyyy-MM-dd"))
+            {
+                FrmLogin.SetProductDate();
+            }
+        }
 
         private void label12_Click(object sender, EventArgs e)
         {

SjMes/InjectionPC/FrmLogin.cs

@@ -35,21 +35,28 @@ namespace InjectionPC
             Program.WeightUser = ConfigurationManager.AppSettings["WeightUser"].ToString();
             Program.WeightPsw = ConfigurationManager.AppSettings["WeightPsw"].ToString();
           
-            Program.interVal = Convert.ToInt32(ConfigurationManager.AppSettings["InterVal"].ToString());
+            string wol = ConfigurationManager.AppSettings["WeightOutLine"]?.ToString();
-            if (DateTime.Now.Hour >= 8 && DateTime.Now.Hour < 20)
+            if( wol== "true")
-            {
+            {
-                Program.Shift = "A班";
+                Program.WeightOutLine = true;
-                Program.ProductDate = DateTime.Now.ToString("yyyy-MM-dd");
+            }
-            }
+
-            else
+            SetProductDate();
-            {
+            //Program.interVal = Convert.ToInt32(ConfigurationManager.AppSettings["InterVal"].ToString());
-                Program.Shift = "B班";
+            //if (DateTime.Now.Hour >= 8 && DateTime.Now.Hour < 20)
-                if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 8)
+            //{
-                {
+            //    Program.Shift = "A班";
-                    Program.ProductDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+            //    Program.ProductDate = DateTime.Now.ToString("yyyy-MM-dd");
-                }
+            //}
-                Program.ProductDate = DateTime.Now.ToString("yyyy-MM-dd");
+            //else
-            }
+            //{
+            //    Program.Shift = "B班";
+            //    if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 8)
+            //    {
+            //        Program.ProductDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+            //    }
+            //    Program.ProductDate = DateTime.Now.ToString("yyyy-MM-dd");
+            //}
 
             OpenDb();
             string stationID="";
@@ -85,8 +92,8 @@ namespace InjectionPC
             if (dt!=null && dt.Rows.Count >0)
             {
                 this.Visible = false;
-                //Form fr=new FrmBarCode();
+                Form fr=new FrmBarCode();
-                Form fr = new FrmQuality();
+                //Form fr = new FrmQuality();
                 fr.Show();
                 
             }
@@ -96,7 +103,24 @@ namespace InjectionPC
             }
             dt.Dispose();
         }
-
+        public static void SetProductDate()
+        {
+            Program.interVal = Convert.ToInt32(ConfigurationManager.AppSettings["InterVal"].ToString());
+            if (DateTime.Now.Hour >= 8 && DateTime.Now.Hour < 20)
+            {
+                Program.Shift = "A班";
+                Program.ProductDate = DateTime.Now.ToString("yyyy-MM-dd");
+            }
+            else
+            {
+                Program.Shift = "B班";
+                if (DateTime.Now.Hour >= 0 && DateTime.Now.Hour < 8)
+                {
+                    Program.ProductDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
+                }
+                Program.ProductDate = DateTime.Now.ToString("yyyy-MM-dd");
+            }
+        }
         private bool OpenDb()
         {
             bool OpenDb = false;

SjMes/InjectionPC/InjectionPC.csproj

@@ -114,6 +114,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReportHelper.cs" />
+    <Compile Include="Report\MyReport.cs" />
     <Compile Include="Upload.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
@@ -152,6 +153,12 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <None Include="Report\111 - 副本2.grf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Report\称重.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
@@ -201,7 +208,7 @@
       <Lcid>0</Lcid>
       <WrapperTool>tlbimp</WrapperTool>
       <Isolated>False</Isolated>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </COMReference>
     <COMReference Include="stdole">
       <Guid>{00020430-0000-0000-C000-000000000046}</Guid>

SjMes/InjectionPC/Program.cs

@@ -27,6 +27,9 @@ namespace InjectionPC
         public static string WeightUser;
         public static string WeightPsw;
 
+        //true 注塑机离线. 用于测试
+        public static bool WeightOutLine=false;
+
         public static int interVal;
 
         [STAThread]

SjMes/InjectionPC/Report/MyReport.cs

@@ -0,0 +1,118 @@
+using System;
+using System.Data;
+using grproLib;
+
+namespace InjectionPC
+{
+	public class MyReport
+	{
+		// Token: 0x0600010A RID: 266 RVA: 0x000097A8 File Offset: 0x000079A8
+		public MyReport(string filename, DataTable _dtDataHead, DataTable _dtDataDetail,string printerName)
+		{
+			this.dtDataHead = _dtDataHead;
+			this.dtDataDetail = _dtDataDetail;
+			this.Report = new GridppReportClass();
+			this.Report.LoadFromFile(filename);
+			//this.Report.FetchRecord += new _IGridppReportEvents_FetchRecordEventHandler(this, (UIntPtr)ldftn(Report_FetchRecord));
+			this.Report.FetchRecord += Report_FetchRecord;
+			this.Report.Printer.PrinterName = printerName;
+			this.FillParameters();
+		}
+
+
+
+		// Token: 0x0600010B RID: 267 RVA: 0x00009833 File Offset: 0x00007A33
+		public void Print()
+		{
+			this.Report.Print(true);
+		}
+
+		// Token: 0x0600010C RID: 268 RVA: 0x00009843 File Offset: 0x00007A43
+		public void PrintPreview()
+		{
+			this.Report.PrintPreview(true);
+		}
+
+		// Token: 0x0600010D RID: 269 RVA: 0x00009854 File Offset: 0x00007A54
+		public void Report_FetchRecord()
+		{
+			if (this.dtDataDetail != null)
+			{
+				this.FillRecordToReport(this.Report, this.dtDataDetail);
+			}
+		}
+
+		// Token: 0x0600010E RID: 270 RVA: 0x00009884 File Offset: 0x00007A84
+		public void FillRecordToReport(IGridppReport _Report, DataTable dt)
+		{
+			MyReport.MatchFieldPairType[] array = new MyReport.MatchFieldPairType[Math.Min(_Report.DetailGrid.Recordset.Fields.Count, dt.Columns.Count)];
+			int num = 0;
+			for (int i = 0; i < dt.Columns.Count; i++)
+			{
+				foreach (object obj in _Report.DetailGrid.Recordset.Fields)
+				{
+					IGRField igrfield = (IGRField)obj;
+					if (string.Compare(igrfield.Name, dt.Columns[i].ColumnName, true) == 0)
+					{
+						array[num].grField = igrfield;
+						array[num].MatchColumnIndex = i;
+						num++;
+						break;
+					}
+				}
+			}
+			foreach (object obj2 in dt.Rows)
+			{
+				DataRow dataRow = (DataRow)obj2;
+				_Report.DetailGrid.Recordset.Append();
+				for (int i = 0; i < num; i++)
+				{
+					if (!dataRow.IsNull(array[i].MatchColumnIndex))
+					{
+						array[i].grField.Value = dataRow[array[i].MatchColumnIndex];
+					}
+				}
+				_Report.DetailGrid.Recordset.Post();
+			}
+		}
+
+		// Token: 0x0600010F RID: 271 RVA: 0x00009A68 File Offset: 0x00007C68
+		public void FillParameters()
+		{
+			if (this.dtDataHead.Rows.Count != 0)
+			{
+				for (int i = 0; i < this.dtDataHead.Columns.Count; i++)
+				{
+					foreach (object obj in this.Report.Parameters)
+					{
+						IGRParameter igrparameter = (IGRParameter)obj;
+						if (string.Compare(igrparameter.Name, this.dtDataHead.Columns[i].ColumnName, true) == 0)
+						{
+							igrparameter.Value = this.dtDataHead.Rows[0][this.dtDataHead.Columns[i].ColumnName];
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		// Token: 0x04000078 RID: 120
+		public GridppReport Report = null;
+
+		// Token: 0x04000079 RID: 121
+		public DataTable dtDataHead = null;
+
+		// Token: 0x0400007A RID: 122
+		public DataTable dtDataDetail = null;
+
+		// Token: 0x02000033 RID: 51
+		private struct MatchFieldPairType
+		{
+			// Token: 0x0400007B RID: 123
+			public IGRField grField;
+
+			// Token: 0x0400007C RID: 124
+			public int MatchColumnIndex;
+		}
+	}
+}

SjMes/MESWebSite/Manage/PaintBarCodeSearch.aspx

@@ -10,7 +10,12 @@
 <body>
     <form id="form1" runat="server">
         <div>
-            <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=WorkBook11.cpt&op=write" width="100%" height="800px"></iframe>
+<%--            <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=WorkBook11.cpt&op=write" width="100%" height="800px"></iframe>--%>
+
+             <script  type="text/javascript">
+                 var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!55b7!!6d82!!8865!!6253!!6761!!7801!!67e5!!8be2!.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
         </div>
     </form>
 </body>

SjMes/MESWebSite/Manage/PaintBarCodeSearch.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class PaintBarCodeSearch {
+    public partial class PaintBarCodeSearch
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/PlatingInspectionNew.aspx

@@ -7,8 +7,148 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title></title>
 </head>
+   
 <body>
 <form id="form1" runat="server" >
-    <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportE.cpt&op=write" width="100%" height="800px"></iframe>
+
+<%--    <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportE.cpt&op=write" width="100%" height="800px"></iframe>--%>
+<%--    <iframe id="reportFrame"  width="100%" height="800px" sandbox="allow-scripts allow-same-origin allow-top-navigation" src="http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!55b7!!6d82!!68c0!!6d4b!!8bb0!!5f55!.db&platform=PC&au_act=login&adminv=MES&passv=123"></iframe>--%>
+<%-- <iframe id="reportFrame"   width="100%" height="800px"> </iframe>--%>
+   <div>
+       <script type="text/javascript">
+           alert("dff33f");
+           window.onload = function () {
+               alert("dfff");
+               //if (window != top) {
+               this.location.href = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!55b7!!6d82!!68c0!!6d4b!!8bb0!!5f55!.db&platform=PC&au_act=login&adminv=MES&passv=123";
+               //}
+           }
+    </script>
+
+   </div>
+
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!55b7!!6d82!!68c0!!6d4b!!8bb0!!5f55!.db&platform=PC&au_act=login&adminv=MES&passv=123";
+         //let targetWindow = window.open(url, "_self");
+
+         //let targetWindow = window.open(url, "_blank");
+
+         //Response.redirect(url);
+
+        // Server.Transfer(url);
+        // Server.redirect(url);
+         //window.location.href = url;
+
+         //$.url(url)
+
+       
+         
+
+         //   targetWindow.postMessage("1", "*"); 
+
+         //function sendPost() {
+         //    var iframeWin = document.getElementById("reportFrame").contentWindow;
+         //    // 向该窗口发送消息        
+         //    iframeWin.postMessage(document.getElementById("message").value,
+         //        url);   
+         //}
+
+         // window.open(url, "_parent");
+        
+
+
+
+
+         //    window.onload = function () {
+         //        var iframe = document.getElementById("reportFrame");
+         //        var data = {
+         //            db: "WMS!5e93!!5b58!!6c47!!603b!!62a5!!8868!!2f!MFA!8f66!!95f4!!2f!MFA!4fdd!!9669!!6760!!6c47!!603b!!62a5!!8868!.db",
+         //            au_act: "login",
+         //            adminv: "MES",
+         //            passv: "123",
+
+         //        };
+         //        alert("ggg");
+         //        iframe.contentWindow.postMessage(JSON.stringify(data), "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer");
+         //};
+         //window.addEventListener("message", function (e) {
+         //    alert("我接收到数据" + e.data);
+         //}, false);
+        
+
+
+         //window.onload = function () {
+         //    var iframeWin = document.getElementById("reportFrame");
+         //    alert("aaaaa");
+            
+
+               
+
+         //    string jsonStr = "{'action':'OpenDB','db':'http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&db=WMS!5e93!!5b58!!6c47!!603b!!62a5!!8868!!2f!MFA!8f66!!95f4!!2f!MFA!4fdd!!9669!!6760!!6c47!!603b!!62a5!!8868!.db&au_act=login&adminv=MES&passv=123'}";
+            
+
+
+         //    entWindow.postMessage(jsonStr, "*");
+         //    alert(a.data);
+
+         //    iframeWin.contentWindow.postMessage(
+
+         //        JSON.stringify({
+
+         //            action: "OpenDB",
+         //            //url: "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer",
+         //            db: url,
+         //            //db: "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer",
+
+                     
+         //            //db: "WMS!5e93!!5b58!!6c47!!603b!!62a5!!8868!!2f!MFA!8f66!!95f4!!2f!MFA!4fdd!!9669!!6760!!6c47!!603b!!62a5!!8868!.db",
+         //            //au_act: "login",
+         //            //adminv: "MES",
+         //            //passv: "123",    
+
+         //        }),
+
+         //        "*",
+
+         //    );
+         //  //  this.document.body.appendChild(iframeWin);
+
+         //    var id = "";
+         //    window.addEventListener("message", (event) => {
+
+         //        const data = event.data ? JSON.parse(event.data) : null;
+
+         //        alert(data.action);
+
+         //        if (data && data.action == "OpenedDBID") {
+
+         //            console.log('Opened DB id: ', data.id);
+
+
+         //            iframeWin.contentWindow.postMessage(
+
+         //                JSON.stringify({
+
+         //                    action: "RefreshDB",
+
+         //                    id: data.id
+
+         //                }),
+
+         //                "*",
+
+         //            );
+
+
+         //        }
+
+         //    });
+
+
+         //}
+
+
+
+        </script>
 </form>
 </body>

SjMes/MESWebSite/Manage/PlatingInspectionNew.aspx.cs

@@ -3,15 +3,28 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web;
 using System.Web.UI;
+using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 
 namespace MESWebSite.Manage
 {
     public partial class PlatingInspectionNew : System.Web.UI.Page
     {
+      
         protected void Page_Load(object sender, EventArgs e)
         {
               
+
+            //Response.Redirect("http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&db=WMS!5e93!!5b58!!6c47!!603b!!62a5!!8868!!2f!MFA!8f66!!95f4!!2f!MFA!4fdd!!9669!!6760!!6c47!!603b!!62a5!!8868!.db&au_act=login&adminv=MES&passv=123");
+            // webbrowser.Src = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!55b7!!6d82!!68c0!!6d4b!!8bb0!!5f55!.db&platform=PC&au_act=login&adminv=MES&passv=123";
+
+            //HtmlIframe iframe = form2.FindControl("webbrowser") as HtmlIframe;
+            //if (iframe != null)
+            //{
+            //    // 设置iframe的src属性为你想要加载的页面
+            //    iframe.Src = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!55b7!!6d82!!68c0!!6d4b!!8bb0!!5f55!.db&platform=PC&au_act=login&adminv=MES&passv=123";
+            //}
+
         }
     }
 }

SjMes/MESWebSite/Manage/PlatingInspectionNew.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class PlatingInspectionNew {
+    public partial class PlatingInspectionNew
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportA.aspx

@@ -9,7 +9,13 @@
 </head>
 <body>
     <form id="form1" runat="server" >
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportF1.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportF1.cpt&op=write" width="100%" height="800px"></iframe>--%>
+   
+          <script  type="text/javascript">
+              var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5206!!9879!!76ee!!4e00!!6b21!!5408!!683c!!7387!.db&platform=PC&browserType=chrome&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
+    
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportA.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportA {
+    public partial class ReportA
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportA_H.aspx

@@ -10,8 +10,12 @@
 <body>
     <form id="form1" runat="server">
     <div>
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportF2.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportF2.cpt&op=write" width="100%" height="800px"></iframe>--%>
     </div>
+
+        <script  type="text/javascript">
+            var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5206!!9879!!76ee!!4e00!!6b21!!5408!!683c!!7387!H.db&platform=PC&browserType=chromehttp://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5206!!9879!!76ee!!4e00!!6b21!!5408!!683c!!7387!H.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
 </form>
 </body>
-</html>

SjMes/MESWebSite/Manage/ReportA_H.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportA_H {
+    public partial class ReportA_H
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportB.aspx

@@ -9,7 +9,12 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportG1.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportG1.cpt&op=write" width="100%" height="800px"></iframe>--%>
+    
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5206!!578b!!53f7!!6216!!652f!!67b6!!4e00!!6b21!!5408!!683c!!7387!!53ca!!629b!!5149!.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportB.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportB {
+    public partial class ReportB
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportB_H.aspx

@@ -9,7 +9,12 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportG2.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportG2.cpt&op=write" width="100%" height="800px"></iframe>--%>
+   
+         <script  type="text/javascript">
+             var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5206!!578b!!53f7!!6216!!652f!!67b6!!4e00!!6b21!!5408!!683c!!7387!H.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportB_H.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportB_H {
+    public partial class ReportB_H
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportBaofei.aspx

@@ -9,7 +9,11 @@
 </head>
 <body>
 <form id="form1" runat="server">
-    <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=WorkBook14.cpt&op=write" width="100%" height="800px"></iframe>
+<%--    <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=WorkBook14.cpt&op=write" width="100%" height="800px"></iframe>--%>
 </form>
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!62a5!!5e9f!!7edf!!8ba1!!8868!.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportBaofei.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportBaofei {
+    public partial class ReportBaofei
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportC.aspx

@@ -9,7 +9,11 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportH1.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportH1.cpt&op=write" width="100%" height="800px"></iframe>--%>
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5404!!578b!!53f7!!5206!!989c!!8272!!6216!!652f!!67b6!!4e00!!6b21!!5408!!683c!!7387!.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportC.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportC {
+    public partial class ReportC
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportC_H.aspx

@@ -9,7 +9,12 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportH2.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportH2.cpt&op=write" width="100%" height="800px"></iframe>--%>
+    
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5404!!578b!!53f7!!5206!!989c!!8272!!6216!!652f!!67b6!!4e00!!6b21!!5408!!683c!!7387!H.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportC_H.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportC_H {
+    public partial class ReportC_H
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportJ.aspx

@@ -9,7 +9,12 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportJ.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportJ.cpt&op=write" width="100%" height="800px"></iframe>--%>
     </form>
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5206!!9879!!76ee!!5408!!683c!!7387!!62a5!!5e9f!TOP5.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
+
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportJ.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportJ {
+    public partial class ReportJ
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportJ_H.aspx

@@ -9,7 +9,12 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportJ1.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportJ1.cpt&op=write" width="100%" height="800px"></iframe>--%>
     </form>
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!5206!!9879!!76ee!!5408!!683c!!7387!!62a5!!5e9f!TOP5H.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
+
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportJ_H.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportJ_H {
+    public partial class ReportJ_H
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportK.aspx

@@ -9,7 +9,13 @@
 </head>
 <body>
 <form id="form1" runat="server">
-    <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportK.cpt&op=write" width="100%" height="800px"></iframe>
+<%--    <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportK.cpt&op=write" width="100%" height="800px"></iframe>--%>
+
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!65e9!!4f1a!!6570!!636e!!629b!!5149!TOP5.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
+
 </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportK.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportK {
+    public partial class ReportK
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportK_H.aspx

@@ -9,7 +9,12 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportK1.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportK1.cpt&op=write" width="100%" height="800px"></iframe>--%>
+
+         <script  type="text/javascript">
+             var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!65e9!!4f1a!!6570!!636e!!629b!!5149!TOP5H.db&platform=PC&browserType=chrome";
+            let targetWindow = window.open(url, "_blank");
+            </script>
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportK_H.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportK_H {
+    public partial class ReportK_H
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportL.aspx

@@ -9,7 +9,11 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportL.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportL.cpt&op=write" width="100%" height="800px"></iframe>--%>
+     <script  type="text/javascript">
+         var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!65e9!!4f1a!!6570!!636e!!62a5!!5e9f!TOP5.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportL.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportL {
+    public partial class ReportL
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Manage/ReportL_H.aspx

@@ -9,7 +9,12 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportL1.cpt&op=write" width="100%" height="800px"></iframe>
+<%--        <iframe id="reportFrame" src="http://10.60.101.10:8401/webroot/decision/view/report?viewlet=reportL1.cpt&op=write" width="100%" height="800px"></iframe>--%>
+
+         <script  type="text/javascript">
+             var url = "http://10.60.101.97:8888/bi/Viewer?proc=1&action=viewer&hback=true&db=!4e8c!!5382!MES!55b7!!6d82!!62a5!!8868!!2f!!65e9!!4f1a!!6570!!636e!!62a5!!5e9f!TOP5H.db&platform=PC&browserType=chrome&browserType=IE&au_act=login&adminv=MES&passv=123";
+            let targetWindow = window.open(url, "_blank");
+            </script>
     </form>
 </body>
 </html>

SjMes/MESWebSite/Manage/ReportL_H.aspx.designer.cs

@@ -2,15 +2,17 @@
 // <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。 
+//     重新生成代码，则所做更改将丢失。
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace MESWebSite.Manage {
+namespace MESWebSite.Manage
+{
 
 
-    public partial class ReportL_H {
+    public partial class ReportL_H
+    {
 
         /// <summary>
         /// form1 控件。

SjMes/MESWebSite/Web.config

@@ -27,8 +27,10 @@
     </compilers>
   </system.codedom>
   <connectionStrings>
-    <add name="SqlConnString" connectionString="server=10.60.101.9;database=BBMPT;uid=sa;pwd=a1+" />
+	  <!--<add name="SqlConnString" connectionString="server=10.60.101.9;database=BBMPT;uid=sa;pwd=a1+" />-->
-    <add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.60.101.9;initial catalog=BBMPT;user id=sa;password=a1+;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
+	  <add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT" />
+	  <!--<add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.60.101.9;initial catalog=BBMPT;user id=sa;password=a1+;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
+	  <add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=dev.ccwin-in.com,6191;initial catalog=BBMPT;user id=sa;password=Microsoft@2021;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />
     <!--<add name="SqlConnString" connectionString="server=39.97.227.79;database=BBMPT;uid=sa;pwd=a1+" />
     <add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=39.97.227.79;initial catalog=BBMPT;user id=sa;password=a1+;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient" />-->
   </connectionStrings>

SjMes/PaintingPC/App.config

@@ -15,11 +15,13 @@
     <!--<add name="SqlConnStringForeign" connectionString="Persist Security Info=true;Initial Catalog=PRODUCTION_DATA;Data Source=10.60.27.27,52837\PAINTLINEDATA;User ID=SQLAdmin;Password=admin" />-->
   </connectionStrings>
   <appSettings>
-    <!--<add key="Position" value="下线一检 B侧 中支架" />
+    <add key="Position" value="下线一检 B侧 中支架" />
-    <add key="Station" value="F05" />-->
+    <add key="Station" value="F05" />
 	  <!--<add key="Position" value="下线二检  抛光区" />-->
-	  <add key="Position" value="一检" />
+	  <!--<add key="Position" value="一检" />-->
-    <add key="Station" value="S10" />
+	  <!--<add key="Position" value="下线一检 A侧 中支架" />-->
+	  <!--<add key="Position" value="下线二检  点修补" />-->
+    <!--<add key="Station" value="S10" />-->
     <!--<add key="FrmFirstCheckLeftSide" value="Side_1_BC01"/>
     <add key="FrmFirstCheckRightSide" value="Side_1_BC02"/>-->
     <add key="InspectTimes" value="1" />

SjMes/PaintingPC/FrmFirstCheck.Designer.cs

@@ -113,7 +113,7 @@
             this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
             this.pictureBox1.Location = new System.Drawing.Point(1, 11);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(199, 104);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -138,7 +138,7 @@
             this.rdo1.Checked = true;
             this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.rdo1.Location = new System.Drawing.Point(1, 120);
-            this.rdo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rdo1.Margin = new System.Windows.Forms.Padding(4);
             this.rdo1.Name = "rdo1";
             this.rdo1.Size = new System.Drawing.Size(212, 88);
             this.rdo1.TabIndex = 9;
@@ -152,7 +152,7 @@
             this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.rdo2.Location = new System.Drawing.Point(223, 120);
-            this.rdo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rdo2.Margin = new System.Windows.Forms.Padding(4);
             this.rdo2.Name = "rdo2";
             this.rdo2.Size = new System.Drawing.Size(212, 88);
             this.rdo2.TabIndex = 10;
@@ -165,7 +165,7 @@
             this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.rdo3.Location = new System.Drawing.Point(444, 120);
-            this.rdo3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rdo3.Margin = new System.Windows.Forms.Padding(4);
             this.rdo3.Name = "rdo3";
             this.rdo3.Size = new System.Drawing.Size(212, 88);
             this.rdo3.TabIndex = 11;
@@ -238,7 +238,7 @@
             this.btnSubmit.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255)))));
             this.btnSubmit.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSubmit.Location = new System.Drawing.Point(1408, 1172);
-            this.btnSubmit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSubmit.Margin = new System.Windows.Forms.Padding(4);
             this.btnSubmit.Name = "btnSubmit";
             this.btnSubmit.Size = new System.Drawing.Size(269, 99);
             this.btnSubmit.TabIndex = 31;
@@ -330,7 +330,7 @@
             this.btnPass1.BackColor = System.Drawing.Color.LightGray;
             this.btnPass1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnPass1.Location = new System.Drawing.Point(1, 630);
-            this.btnPass1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnPass1.Margin = new System.Windows.Forms.Padding(4);
             this.btnPass1.Name = "btnPass1";
             this.btnPass1.Size = new System.Drawing.Size(200, 99);
             this.btnPass1.TabIndex = 39;
@@ -343,7 +343,7 @@
             this.btnRepair1.BackColor = System.Drawing.Color.LightGray;
             this.btnRepair1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnRepair1.Location = new System.Drawing.Point(248, 630);
-            this.btnRepair1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnRepair1.Margin = new System.Windows.Forms.Padding(4);
             this.btnRepair1.Name = "btnRepair1";
             this.btnRepair1.Size = new System.Drawing.Size(200, 99);
             this.btnRepair1.TabIndex = 40;
@@ -356,7 +356,7 @@
             this.btnAbt1.BackColor = System.Drawing.Color.LightGray;
             this.btnAbt1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAbt1.Location = new System.Drawing.Point(487, 630);
-            this.btnAbt1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAbt1.Margin = new System.Windows.Forms.Padding(4);
             this.btnAbt1.Name = "btnAbt1";
             this.btnAbt1.Size = new System.Drawing.Size(200, 99);
             this.btnAbt1.TabIndex = 41;
@@ -369,7 +369,7 @@
             this.btnAbt2.BackColor = System.Drawing.Color.LightGray;
             this.btnAbt2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAbt2.Location = new System.Drawing.Point(1183, 630);
-            this.btnAbt2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAbt2.Margin = new System.Windows.Forms.Padding(4);
             this.btnAbt2.Name = "btnAbt2";
             this.btnAbt2.Size = new System.Drawing.Size(200, 99);
             this.btnAbt2.TabIndex = 44;
@@ -382,7 +382,7 @@
             this.btnRepair2.BackColor = System.Drawing.Color.LightGray;
             this.btnRepair2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnRepair2.Location = new System.Drawing.Point(944, 630);
-            this.btnRepair2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnRepair2.Margin = new System.Windows.Forms.Padding(4);
             this.btnRepair2.Name = "btnRepair2";
             this.btnRepair2.Size = new System.Drawing.Size(200, 99);
             this.btnRepair2.TabIndex = 43;
@@ -395,7 +395,7 @@
             this.btnPass2.BackColor = System.Drawing.Color.LightGray;
             this.btnPass2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnPass2.Location = new System.Drawing.Point(704, 630);
-            this.btnPass2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnPass2.Margin = new System.Windows.Forms.Padding(4);
             this.btnPass2.Name = "btnPass2";
             this.btnPass2.Size = new System.Drawing.Size(200, 99);
             this.btnPass2.TabIndex = 42;
@@ -420,9 +420,9 @@
             this.groupBox1.Controls.Add(this.txtSideNo);
             this.groupBox1.Controls.Add(this.label8);
             this.groupBox1.Location = new System.Drawing.Point(1397, 246);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
             this.groupBox1.Size = new System.Drawing.Size(293, 890);
             this.groupBox1.TabIndex = 45;
             this.groupBox1.TabStop = false;
@@ -431,7 +431,7 @@
             // 
             this.btnSideBack.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSideBack.Location = new System.Drawing.Point(103, 716);
-            this.btnSideBack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSideBack.Margin = new System.Windows.Forms.Padding(4);
             this.btnSideBack.Name = "btnSideBack";
             this.btnSideBack.Size = new System.Drawing.Size(179, 158);
             this.btnSideBack.TabIndex = 44;
@@ -443,7 +443,7 @@
             // 
             this.btnSide10.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide10.Location = new System.Drawing.Point(12, 716);
-            this.btnSide10.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide10.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide10.Name = "btnSide10";
             this.btnSide10.Size = new System.Drawing.Size(88, 158);
             this.btnSide10.TabIndex = 43;
@@ -455,7 +455,7 @@
             // 
             this.btnSide9.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide9.Location = new System.Drawing.Point(193, 544);
-            this.btnSide9.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide9.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide9.Name = "btnSide9";
             this.btnSide9.Size = new System.Drawing.Size(88, 158);
             this.btnSide9.TabIndex = 42;
@@ -467,7 +467,7 @@
             // 
             this.btnSide8.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide8.Location = new System.Drawing.Point(103, 544);
-            this.btnSide8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide8.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide8.Name = "btnSide8";
             this.btnSide8.Size = new System.Drawing.Size(88, 158);
             this.btnSide8.TabIndex = 41;
@@ -479,7 +479,7 @@
             // 
             this.btnSide7.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide7.Location = new System.Drawing.Point(12, 544);
-            this.btnSide7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide7.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide7.Name = "btnSide7";
             this.btnSide7.Size = new System.Drawing.Size(88, 158);
             this.btnSide7.TabIndex = 40;
@@ -491,7 +491,7 @@
             // 
             this.btnSide6.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide6.Location = new System.Drawing.Point(193, 371);
-            this.btnSide6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide6.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide6.Name = "btnSide6";
             this.btnSide6.Size = new System.Drawing.Size(88, 158);
             this.btnSide6.TabIndex = 39;
@@ -503,7 +503,7 @@
             // 
             this.btnSide5.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide5.Location = new System.Drawing.Point(103, 371);
-            this.btnSide5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide5.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide5.Name = "btnSide5";
             this.btnSide5.Size = new System.Drawing.Size(88, 158);
             this.btnSide5.TabIndex = 38;
@@ -515,7 +515,7 @@
             // 
             this.btnSide4.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide4.Location = new System.Drawing.Point(12, 371);
-            this.btnSide4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide4.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide4.Name = "btnSide4";
             this.btnSide4.Size = new System.Drawing.Size(88, 158);
             this.btnSide4.TabIndex = 37;
@@ -527,7 +527,7 @@
             // 
             this.btnSide3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide3.Location = new System.Drawing.Point(193, 199);
-            this.btnSide3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide3.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide3.Name = "btnSide3";
             this.btnSide3.Size = new System.Drawing.Size(88, 158);
             this.btnSide3.TabIndex = 36;
@@ -539,7 +539,7 @@
             // 
             this.btnSide2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide2.Location = new System.Drawing.Point(103, 199);
-            this.btnSide2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide2.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide2.Name = "btnSide2";
             this.btnSide2.Size = new System.Drawing.Size(88, 158);
             this.btnSide2.TabIndex = 35;
@@ -551,7 +551,7 @@
             // 
             this.btnSide1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide1.Location = new System.Drawing.Point(12, 199);
-            this.btnSide1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide1.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide1.Name = "btnSide1";
             this.btnSide1.Size = new System.Drawing.Size(88, 158);
             this.btnSide1.TabIndex = 34;
@@ -563,7 +563,7 @@
             // 
             this.btnSide.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSide.Location = new System.Drawing.Point(175, 124);
-            this.btnSide.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSide.Margin = new System.Windows.Forms.Padding(4);
             this.btnSide.Name = "btnSide";
             this.btnSide.Size = new System.Drawing.Size(107, 59);
             this.btnSide.TabIndex = 33;
@@ -575,7 +575,7 @@
             // 
             this.txtSideNo.Font = new System.Drawing.Font("黑体", 26F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.txtSideNo.Location = new System.Drawing.Point(12, 124);
-            this.txtSideNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtSideNo.Margin = new System.Windows.Forms.Padding(4);
             this.txtSideNo.Name = "txtSideNo";
             this.txtSideNo.Size = new System.Drawing.Size(159, 57);
             this.txtSideNo.TabIndex = 32;
@@ -664,7 +664,7 @@
             this.btnAbt3.BackColor = System.Drawing.Color.LightGray;
             this.btnAbt3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAbt3.Location = new System.Drawing.Point(487, 1174);
-            this.btnAbt3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAbt3.Margin = new System.Windows.Forms.Padding(4);
             this.btnAbt3.Name = "btnAbt3";
             this.btnAbt3.Size = new System.Drawing.Size(200, 99);
             this.btnAbt3.TabIndex = 56;
@@ -677,7 +677,7 @@
             this.btnRepair3.BackColor = System.Drawing.Color.LightGray;
             this.btnRepair3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnRepair3.Location = new System.Drawing.Point(248, 1174);
-            this.btnRepair3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnRepair3.Margin = new System.Windows.Forms.Padding(4);
             this.btnRepair3.Name = "btnRepair3";
             this.btnRepair3.Size = new System.Drawing.Size(200, 99);
             this.btnRepair3.TabIndex = 55;
@@ -690,7 +690,7 @@
             this.btnPass3.BackColor = System.Drawing.Color.LightGray;
             this.btnPass3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnPass3.Location = new System.Drawing.Point(1, 1174);
-            this.btnPass3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnPass3.Margin = new System.Windows.Forms.Padding(4);
             this.btnPass3.Name = "btnPass3";
             this.btnPass3.Size = new System.Drawing.Size(200, 99);
             this.btnPass3.TabIndex = 54;
@@ -770,7 +770,7 @@
             this.btnAbt4.BackColor = System.Drawing.Color.LightGray;
             this.btnAbt4.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnAbt4.Location = new System.Drawing.Point(1183, 1176);
-            this.btnAbt4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnAbt4.Margin = new System.Windows.Forms.Padding(4);
             this.btnAbt4.Name = "btnAbt4";
             this.btnAbt4.Size = new System.Drawing.Size(200, 99);
             this.btnAbt4.TabIndex = 65;
@@ -783,7 +783,7 @@
             this.btnRepair4.BackColor = System.Drawing.Color.LightGray;
             this.btnRepair4.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnRepair4.Location = new System.Drawing.Point(944, 1176);
-            this.btnRepair4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnRepair4.Margin = new System.Windows.Forms.Padding(4);
             this.btnRepair4.Name = "btnRepair4";
             this.btnRepair4.Size = new System.Drawing.Size(200, 99);
             this.btnRepair4.TabIndex = 64;
@@ -796,7 +796,7 @@
             this.btnPass4.BackColor = System.Drawing.Color.LightGray;
             this.btnPass4.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnPass4.Location = new System.Drawing.Point(704, 1176);
-            this.btnPass4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnPass4.Margin = new System.Windows.Forms.Padding(4);
             this.btnPass4.Name = "btnPass4";
             this.btnPass4.Size = new System.Drawing.Size(200, 99);
             this.btnPass4.TabIndex = 63;
@@ -902,8 +902,8 @@
             this.Controls.Add(this.labTime);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.labTitle);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "FrmFirstCheck";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "喷涂一次检验";

SjMes/PaintingPC/FrmSecondCheck.Designer.cs

@@ -64,9 +64,10 @@
             // 
             this.labChangeColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labChangeColor.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labChangeColor.Location = new System.Drawing.Point(1084, 100);
+            this.labChangeColor.Location = new System.Drawing.Point(1445, 125);
+            this.labChangeColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labChangeColor.Name = "labChangeColor";
-            this.labChangeColor.Size = new System.Drawing.Size(185, 70);
+            this.labChangeColor.Size = new System.Drawing.Size(247, 88);
             this.labChangeColor.TabIndex = 25;
             this.labChangeColor.Text = "修改颜色";
             this.labChangeColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -78,9 +79,10 @@
             // 
             this.labelVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labelVersion.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelVersion.Location = new System.Drawing.Point(893, 99);
+            this.labelVersion.Location = new System.Drawing.Point(1191, 124);
+            this.labelVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelVersion.Name = "labelVersion";
-            this.labelVersion.Size = new System.Drawing.Size(185, 70);
+            this.labelVersion.Size = new System.Drawing.Size(247, 88);
             this.labelVersion.TabIndex = 24;
             this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -88,9 +90,10 @@
             // 
             this.labStation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labStation.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labStation.Location = new System.Drawing.Point(702, 99);
+            this.labStation.Location = new System.Drawing.Point(936, 124);
+            this.labStation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labStation.Name = "labStation";
-            this.labStation.Size = new System.Drawing.Size(185, 70);
+            this.labStation.Size = new System.Drawing.Size(247, 88);
             this.labStation.TabIndex = 23;
             this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -98,9 +101,10 @@
             // 
             this.labWorkClass.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labWorkClass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labWorkClass.Location = new System.Drawing.Point(511, 99);
+            this.labWorkClass.Location = new System.Drawing.Point(681, 124);
+            this.labWorkClass.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labWorkClass.Name = "labWorkClass";
-            this.labWorkClass.Size = new System.Drawing.Size(185, 70);
+            this.labWorkClass.Size = new System.Drawing.Size(247, 88);
             this.labWorkClass.TabIndex = 22;
             this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click);
@@ -109,9 +113,10 @@
             // 
             this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rdo3.Location = new System.Drawing.Point(344, 99);
+            this.rdo3.Location = new System.Drawing.Point(459, 124);
+            this.rdo3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rdo3.Name = "rdo3";
-            this.rdo3.Size = new System.Drawing.Size(159, 70);
+            this.rdo3.Size = new System.Drawing.Size(212, 88);
             this.rdo3.TabIndex = 21;
             this.rdo3.Text = "项目调试";
             this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -121,9 +126,10 @@
             // 
             this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rdo2.Location = new System.Drawing.Point(178, 99);
+            this.rdo2.Location = new System.Drawing.Point(237, 124);
+            this.rdo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rdo2.Name = "rdo2";
-            this.rdo2.Size = new System.Drawing.Size(159, 70);
+            this.rdo2.Size = new System.Drawing.Size(212, 88);
             this.rdo2.TabIndex = 20;
             this.rdo2.Text = "量产调试";
             this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -134,9 +140,10 @@
             this.rdo1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
             this.rdo1.Checked = true;
             this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rdo1.Location = new System.Drawing.Point(12, 99);
+            this.rdo1.Location = new System.Drawing.Point(16, 124);
+            this.rdo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rdo1.Name = "rdo1";
-            this.rdo1.Size = new System.Drawing.Size(159, 70);
+            this.rdo1.Size = new System.Drawing.Size(212, 88);
             this.rdo1.TabIndex = 19;
             this.rdo1.TabStop = true;
             this.rdo1.Text = "正式量产";
@@ -147,9 +154,10 @@
             // 
             this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labTime.Location = new System.Drawing.Point(1019, 9);
+            this.labTime.Location = new System.Drawing.Point(1359, 11);
+            this.labTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labTime.Name = "labTime";
-            this.labTime.Size = new System.Drawing.Size(250, 84);
+            this.labTime.Size = new System.Drawing.Size(333, 104);
             this.labTime.TabIndex = 18;
             this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -158,9 +166,10 @@
             // 
             this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(12, 9);
+            this.pictureBox1.Location = new System.Drawing.Point(16, 11);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(159, 84);
+            this.pictureBox1.Size = new System.Drawing.Size(211, 104);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 17;
             this.pictureBox1.TabStop = false;
@@ -169,25 +178,28 @@
             // 
             this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labTitle.Location = new System.Drawing.Point(161, 9);
+            this.labTitle.Location = new System.Drawing.Point(215, 11);
+            this.labTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labTitle.Name = "labTitle";
-            this.labTitle.Size = new System.Drawing.Size(861, 84);
+            this.labTitle.Size = new System.Drawing.Size(1147, 104);
             this.labTitle.TabIndex = 16;
             this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // panel2
             // 
             this.panel2.AutoScroll = true;
-            this.panel2.Location = new System.Drawing.Point(12, 610);
+            this.panel2.Location = new System.Drawing.Point(16, 762);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(997, 265);
+            this.panel2.Size = new System.Drawing.Size(1329, 331);
             this.panel2.TabIndex = 48;
             // 
             // pictureBox2
             // 
-            this.pictureBox2.Location = new System.Drawing.Point(12, 257);
+            this.pictureBox2.Location = new System.Drawing.Point(16, 321);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(997, 350);
+            this.pictureBox2.Size = new System.Drawing.Size(1329, 438);
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox2.TabIndex = 47;
             this.pictureBox2.TabStop = false;
@@ -196,9 +208,10 @@
             // 
             this.label15.BackColor = System.Drawing.Color.Lime;
             this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(12, 175);
+            this.label15.Location = new System.Drawing.Point(16, 219);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(159, 75);
+            this.label15.Size = new System.Drawing.Size(212, 94);
             this.label15.TabIndex = 49;
             this.label15.Text = "扫码信息";
             this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -207,9 +220,10 @@
             // 
             this.labProductInfo.BackColor = System.Drawing.Color.White;
             this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labProductInfo.Location = new System.Drawing.Point(768, 175);
+            this.labProductInfo.Location = new System.Drawing.Point(1024, 219);
+            this.labProductInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labProductInfo.Name = "labProductInfo";
-            this.labProductInfo.Size = new System.Drawing.Size(500, 75);
+            this.labProductInfo.Size = new System.Drawing.Size(667, 94);
             this.labProductInfo.TabIndex = 52;
             this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -217,9 +231,10 @@
             // 
             this.label2.BackColor = System.Drawing.Color.Lime;
             this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(603, 175);
+            this.label2.Location = new System.Drawing.Point(804, 219);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(159, 75);
+            this.label2.Size = new System.Drawing.Size(212, 94);
             this.label2.TabIndex = 51;
             this.label2.Text = "产品信息";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -228,9 +243,10 @@
             // 
             this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
             this.label8.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(1015, 323);
+            this.label8.Location = new System.Drawing.Point(1353, 404);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(253, 70);
+            this.label8.Size = new System.Drawing.Size(337, 88);
             this.label8.TabIndex = 53;
             this.label8.Text = "一检结果";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -239,9 +255,10 @@
             // 
             this.labFirstCheck.BackColor = System.Drawing.Color.White;
             this.labFirstCheck.Font = new System.Drawing.Font("黑体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labFirstCheck.Location = new System.Drawing.Point(1015, 399);
+            this.labFirstCheck.Location = new System.Drawing.Point(1353, 499);
+            this.labFirstCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labFirstCheck.Name = "labFirstCheck";
-            this.labFirstCheck.Size = new System.Drawing.Size(253, 106);
+            this.labFirstCheck.Size = new System.Drawing.Size(337, 132);
             this.labFirstCheck.TabIndex = 54;
             this.labFirstCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -249,9 +266,10 @@
             // 
             this.labSecondCheck.BackColor = System.Drawing.Color.White;
             this.labSecondCheck.Font = new System.Drawing.Font("黑体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labSecondCheck.Location = new System.Drawing.Point(1015, 584);
+            this.labSecondCheck.Location = new System.Drawing.Point(1353, 730);
+            this.labSecondCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labSecondCheck.Name = "labSecondCheck";
-            this.labSecondCheck.Size = new System.Drawing.Size(253, 106);
+            this.labSecondCheck.Size = new System.Drawing.Size(337, 132);
             this.labSecondCheck.TabIndex = 56;
             this.labSecondCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -259,9 +277,10 @@
             // 
             this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
             this.label7.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(1015, 510);
+            this.label7.Location = new System.Drawing.Point(1353, 638);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(253, 70);
+            this.label7.Size = new System.Drawing.Size(337, 88);
             this.label7.TabIndex = 55;
             this.label7.Text = "二检结果";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -270,9 +289,10 @@
             // 
             this.labThirdCheck.BackColor = System.Drawing.Color.White;
             this.labThirdCheck.Font = new System.Drawing.Font("黑体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labThirdCheck.Location = new System.Drawing.Point(1016, 769);
+            this.labThirdCheck.Location = new System.Drawing.Point(1355, 961);
+            this.labThirdCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labThirdCheck.Name = "labThirdCheck";
-            this.labThirdCheck.Size = new System.Drawing.Size(253, 106);
+            this.labThirdCheck.Size = new System.Drawing.Size(337, 132);
             this.labThirdCheck.TabIndex = 58;
             this.labThirdCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -280,9 +300,10 @@
             // 
             this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
             this.label10.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(1016, 694);
+            this.label10.Location = new System.Drawing.Point(1355, 868);
+            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(253, 70);
+            this.label10.Size = new System.Drawing.Size(337, 88);
             this.label10.TabIndex = 57;
             this.label10.Text = "三检结果";
             this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -291,9 +312,10 @@
             // 
             this.btnPass.BackColor = System.Drawing.Color.Yellow;
             this.btnPass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnPass.Location = new System.Drawing.Point(674, 896);
+            this.btnPass.Location = new System.Drawing.Point(899, 1120);
+            this.btnPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnPass.Name = "btnPass";
-            this.btnPass.Size = new System.Drawing.Size(270, 116);
+            this.btnPass.Size = new System.Drawing.Size(360, 145);
             this.btnPass.TabIndex = 59;
             this.btnPass.Text = "抛光合格";
             this.btnPass.UseVisualStyleBackColor = false;
@@ -303,9 +325,10 @@
             // 
             this.btnRepair.BackColor = System.Drawing.Color.LimeGreen;
             this.btnRepair.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRepair.Location = new System.Drawing.Point(344, 895);
+            this.btnRepair.Location = new System.Drawing.Point(459, 1119);
+            this.btnRepair.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnRepair.Name = "btnRepair";
-            this.btnRepair.Size = new System.Drawing.Size(270, 116);
+            this.btnRepair.Size = new System.Drawing.Size(360, 145);
             this.btnRepair.TabIndex = 60;
             this.btnRepair.Text = "二次返修";
             this.btnRepair.UseVisualStyleBackColor = false;
@@ -315,9 +338,10 @@
             // 
             this.btnAbt.BackColor = System.Drawing.Color.Red;
             this.btnAbt.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAbt.Location = new System.Drawing.Point(998, 895);
+            this.btnAbt.Location = new System.Drawing.Point(1331, 1119);
+            this.btnAbt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAbt.Name = "btnAbt";
-            this.btnAbt.Size = new System.Drawing.Size(270, 116);
+            this.btnAbt.Size = new System.Drawing.Size(360, 145);
             this.btnAbt.TabIndex = 61;
             this.btnAbt.Text = "抛光报废";
             this.btnAbt.UseVisualStyleBackColor = false;
@@ -327,9 +351,10 @@
             // 
             this.txtBarCode.BackColor = System.Drawing.Color.White;
             this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtBarCode.Location = new System.Drawing.Point(178, 187);
+            this.txtBarCode.Location = new System.Drawing.Point(237, 234);
+            this.txtBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtBarCode.Name = "txtBarCode";
-            this.txtBarCode.Size = new System.Drawing.Size(419, 53);
+            this.txtBarCode.Size = new System.Drawing.Size(557, 65);
             this.txtBarCode.TabIndex = 0;
             this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown);
@@ -338,9 +363,10 @@
             // 
             this.btnFirstPass.BackColor = System.Drawing.Color.Green;
             this.btnFirstPass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnFirstPass.Location = new System.Drawing.Point(12, 895);
+            this.btnFirstPass.Location = new System.Drawing.Point(16, 1119);
+            this.btnFirstPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnFirstPass.Name = "btnFirstPass";
-            this.btnFirstPass.Size = new System.Drawing.Size(270, 116);
+            this.btnFirstPass.Size = new System.Drawing.Size(360, 145);
             this.btnFirstPass.TabIndex = 63;
             this.btnFirstPass.Text = "一次合格";
             this.btnFirstPass.UseVisualStyleBackColor = false;
@@ -350,17 +376,18 @@
             // 
             this.labProPosition.BackColor = System.Drawing.Color.White;
             this.labProPosition.Font = new System.Drawing.Font("黑体", 22F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labProPosition.Location = new System.Drawing.Point(1015, 257);
+            this.labProPosition.Location = new System.Drawing.Point(1353, 321);
+            this.labProPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labProPosition.Name = "labProPosition";
-            this.labProPosition.Size = new System.Drawing.Size(253, 60);
+            this.labProPosition.Size = new System.Drawing.Size(337, 75);
             this.labProPosition.TabIndex = 64;
             this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // FrmSecondCheck
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1280, 1024);
+            this.ClientSize = new System.Drawing.Size(1707, 1280);
             this.Controls.Add(this.labProPosition);
             this.Controls.Add(this.btnFirstPass);
             this.Controls.Add(this.txtBarCode);
@@ -388,7 +415,8 @@
             this.Controls.Add(this.labTime);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.labTitle);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "FrmSecondCheck";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "FrmSecondCheck";

SjMes/PaintingPC/FrmSecondCheckSpec.Designer.cs

@@ -62,9 +62,10 @@
             // 
             this.labChangeColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labChangeColor.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labChangeColor.Location = new System.Drawing.Point(911, 99);
+            this.labChangeColor.Location = new System.Drawing.Point(1215, 124);
+            this.labChangeColor.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labChangeColor.Name = "labChangeColor";
-            this.labChangeColor.Size = new System.Drawing.Size(107, 70);
+            this.labChangeColor.Size = new System.Drawing.Size(143, 88);
             this.labChangeColor.TabIndex = 25;
             this.labChangeColor.Text = "修改颜色";
             this.labChangeColor.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -76,9 +77,10 @@
             // 
             this.labelVersion.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labelVersion.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelVersion.Location = new System.Drawing.Point(703, 99);
+            this.labelVersion.Location = new System.Drawing.Point(937, 124);
+            this.labelVersion.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labelVersion.Name = "labelVersion";
-            this.labelVersion.Size = new System.Drawing.Size(202, 70);
+            this.labelVersion.Size = new System.Drawing.Size(269, 88);
             this.labelVersion.TabIndex = 24;
             this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -86,9 +88,10 @@
             // 
             this.labStation.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labStation.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labStation.Location = new System.Drawing.Point(612, 99);
+            this.labStation.Location = new System.Drawing.Point(816, 124);
+            this.labStation.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labStation.Name = "labStation";
-            this.labStation.Size = new System.Drawing.Size(87, 70);
+            this.labStation.Size = new System.Drawing.Size(116, 88);
             this.labStation.TabIndex = 23;
             this.labStation.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -96,9 +99,10 @@
             // 
             this.labWorkClass.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.labWorkClass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labWorkClass.Location = new System.Drawing.Point(511, 99);
+            this.labWorkClass.Location = new System.Drawing.Point(681, 124);
+            this.labWorkClass.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labWorkClass.Name = "labWorkClass";
-            this.labWorkClass.Size = new System.Drawing.Size(97, 70);
+            this.labWorkClass.Size = new System.Drawing.Size(129, 88);
             this.labWorkClass.TabIndex = 22;
             this.labWorkClass.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labWorkClass.Click += new System.EventHandler(this.labWorkClass_Click);
@@ -107,9 +111,10 @@
             // 
             this.rdo3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.rdo3.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rdo3.Location = new System.Drawing.Point(344, 99);
+            this.rdo3.Location = new System.Drawing.Point(459, 124);
+            this.rdo3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rdo3.Name = "rdo3";
-            this.rdo3.Size = new System.Drawing.Size(159, 70);
+            this.rdo3.Size = new System.Drawing.Size(212, 88);
             this.rdo3.TabIndex = 21;
             this.rdo3.Text = "项目调试";
             this.rdo3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -119,9 +124,10 @@
             // 
             this.rdo2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))));
             this.rdo2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rdo2.Location = new System.Drawing.Point(178, 99);
+            this.rdo2.Location = new System.Drawing.Point(237, 124);
+            this.rdo2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rdo2.Name = "rdo2";
-            this.rdo2.Size = new System.Drawing.Size(159, 70);
+            this.rdo2.Size = new System.Drawing.Size(212, 88);
             this.rdo2.TabIndex = 20;
             this.rdo2.Text = "量产调试";
             this.rdo2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -132,9 +138,10 @@
             this.rdo1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(128)))));
             this.rdo1.Checked = true;
             this.rdo1.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.rdo1.Location = new System.Drawing.Point(12, 99);
+            this.rdo1.Location = new System.Drawing.Point(16, 124);
+            this.rdo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rdo1.Name = "rdo1";
-            this.rdo1.Size = new System.Drawing.Size(159, 70);
+            this.rdo1.Size = new System.Drawing.Size(212, 88);
             this.rdo1.TabIndex = 19;
             this.rdo1.TabStop = true;
             this.rdo1.Text = "正式量产";
@@ -145,9 +152,10 @@
             // 
             this.labTime.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.labTime.Font = new System.Drawing.Font("宋体", 24F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labTime.Location = new System.Drawing.Point(768, 9);
+            this.labTime.Location = new System.Drawing.Point(1024, 11);
+            this.labTime.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labTime.Name = "labTime";
-            this.labTime.Size = new System.Drawing.Size(250, 84);
+            this.labTime.Size = new System.Drawing.Size(333, 104);
             this.labTime.TabIndex = 18;
             this.labTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labTime.Click += new System.EventHandler(this.labTime_Click);
@@ -156,9 +164,10 @@
             // 
             this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
-            this.pictureBox1.Location = new System.Drawing.Point(12, 9);
+            this.pictureBox1.Location = new System.Drawing.Point(16, 11);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(159, 84);
+            this.pictureBox1.Size = new System.Drawing.Size(211, 104);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 17;
             this.pictureBox1.TabStop = false;
@@ -167,24 +176,27 @@
             // 
             this.labTitle.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.labTitle.Font = new System.Drawing.Font("宋体", 48F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labTitle.Location = new System.Drawing.Point(161, 9);
+            this.labTitle.Location = new System.Drawing.Point(215, 11);
+            this.labTitle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labTitle.Name = "labTitle";
-            this.labTitle.Size = new System.Drawing.Size(601, 84);
+            this.labTitle.Size = new System.Drawing.Size(801, 104);
             this.labTitle.TabIndex = 16;
             this.labTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // panel2
             // 
-            this.panel2.Location = new System.Drawing.Point(12, 486);
+            this.panel2.Location = new System.Drawing.Point(16, 608);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(844, 282);
+            this.panel2.Size = new System.Drawing.Size(1125, 352);
             this.panel2.TabIndex = 48;
             // 
             // pictureBox2
             // 
-            this.pictureBox2.Location = new System.Drawing.Point(12, 257);
+            this.pictureBox2.Location = new System.Drawing.Point(16, 321);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(844, 223);
+            this.pictureBox2.Size = new System.Drawing.Size(1125, 279);
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox2.TabIndex = 47;
             this.pictureBox2.TabStop = false;
@@ -193,9 +205,10 @@
             // 
             this.label15.BackColor = System.Drawing.Color.Lime;
             this.label15.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(12, 175);
+            this.label15.Location = new System.Drawing.Point(16, 219);
+            this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label15.Name = "label15";
-            this.label15.Size = new System.Drawing.Size(159, 75);
+            this.label15.Size = new System.Drawing.Size(212, 94);
             this.label15.TabIndex = 49;
             this.label15.Text = "扫码信息";
             this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -204,9 +217,10 @@
             // 
             this.labProductInfo.BackColor = System.Drawing.Color.White;
             this.labProductInfo.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labProductInfo.Location = new System.Drawing.Point(695, 175);
+            this.labProductInfo.Location = new System.Drawing.Point(927, 219);
+            this.labProductInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labProductInfo.Name = "labProductInfo";
-            this.labProductInfo.Size = new System.Drawing.Size(324, 75);
+            this.labProductInfo.Size = new System.Drawing.Size(432, 94);
             this.labProductInfo.TabIndex = 52;
             this.labProductInfo.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -214,9 +228,10 @@
             // 
             this.label2.BackColor = System.Drawing.Color.Lime;
             this.label2.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(603, 175);
+            this.label2.Location = new System.Drawing.Point(804, 219);
+            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(90, 75);
+            this.label2.Size = new System.Drawing.Size(120, 94);
             this.label2.TabIndex = 51;
             this.label2.Text = "产品信息";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -225,9 +240,10 @@
             // 
             this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
             this.label8.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label8.Location = new System.Drawing.Point(860, 306);
+            this.label8.Location = new System.Drawing.Point(1147, 382);
+            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(159, 48);
+            this.label8.Size = new System.Drawing.Size(212, 60);
             this.label8.TabIndex = 53;
             this.label8.Text = "一检结果";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -236,9 +252,10 @@
             // 
             this.labFirstCheck.BackColor = System.Drawing.Color.White;
             this.labFirstCheck.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labFirstCheck.Location = new System.Drawing.Point(860, 353);
+            this.labFirstCheck.Location = new System.Drawing.Point(1147, 441);
+            this.labFirstCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labFirstCheck.Name = "labFirstCheck";
-            this.labFirstCheck.Size = new System.Drawing.Size(159, 72);
+            this.labFirstCheck.Size = new System.Drawing.Size(212, 90);
             this.labFirstCheck.TabIndex = 54;
             this.labFirstCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -246,9 +263,10 @@
             // 
             this.labSecondCheck.BackColor = System.Drawing.Color.White;
             this.labSecondCheck.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labSecondCheck.Location = new System.Drawing.Point(860, 471);
+            this.labSecondCheck.Location = new System.Drawing.Point(1147, 589);
+            this.labSecondCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labSecondCheck.Name = "labSecondCheck";
-            this.labSecondCheck.Size = new System.Drawing.Size(159, 67);
+            this.labSecondCheck.Size = new System.Drawing.Size(212, 84);
             this.labSecondCheck.TabIndex = 56;
             this.labSecondCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -256,9 +274,10 @@
             // 
             this.label7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
             this.label7.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(862, 427);
+            this.label7.Location = new System.Drawing.Point(1149, 534);
+            this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(157, 40);
+            this.label7.Size = new System.Drawing.Size(209, 50);
             this.label7.TabIndex = 55;
             this.label7.Text = "二检结果";
             this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -267,9 +286,10 @@
             // 
             this.labThirdCheck.BackColor = System.Drawing.Color.White;
             this.labThirdCheck.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labThirdCheck.Location = new System.Drawing.Point(859, 581);
+            this.labThirdCheck.Location = new System.Drawing.Point(1145, 726);
+            this.labThirdCheck.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labThirdCheck.Name = "labThirdCheck";
-            this.labThirdCheck.Size = new System.Drawing.Size(160, 60);
+            this.labThirdCheck.Size = new System.Drawing.Size(213, 75);
             this.labThirdCheck.TabIndex = 58;
             this.labThirdCheck.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
@@ -277,9 +297,10 @@
             // 
             this.label10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
             this.label10.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(860, 541);
+            this.label10.Location = new System.Drawing.Point(1147, 676);
+            this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label10.Name = "label10";
-            this.label10.Size = new System.Drawing.Size(159, 37);
+            this.label10.Size = new System.Drawing.Size(212, 46);
             this.label10.TabIndex = 57;
             this.label10.Text = "三检结果";
             this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -288,9 +309,10 @@
             // 
             this.btnPass.BackColor = System.Drawing.Color.LightGray;
             this.btnPass.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnPass.Location = new System.Drawing.Point(865, 643);
+            this.btnPass.Location = new System.Drawing.Point(1153, 804);
+            this.btnPass.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnPass.Name = "btnPass";
-            this.btnPass.Size = new System.Drawing.Size(71, 124);
+            this.btnPass.Size = new System.Drawing.Size(95, 155);
             this.btnPass.TabIndex = 59;
             this.btnPass.Text = "抛光合格";
             this.btnPass.UseVisualStyleBackColor = false;
@@ -300,9 +322,10 @@
             // 
             this.btnAbt.BackColor = System.Drawing.Color.LightGray;
             this.btnAbt.Font = new System.Drawing.Font("黑体", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAbt.Location = new System.Drawing.Point(947, 643);
+            this.btnAbt.Location = new System.Drawing.Point(1263, 804);
+            this.btnAbt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnAbt.Name = "btnAbt";
-            this.btnAbt.Size = new System.Drawing.Size(67, 124);
+            this.btnAbt.Size = new System.Drawing.Size(89, 155);
             this.btnAbt.TabIndex = 61;
             this.btnAbt.Text = "抛光报废";
             this.btnAbt.UseVisualStyleBackColor = false;
@@ -312,9 +335,10 @@
             // 
             this.txtBarCode.BackColor = System.Drawing.Color.White;
             this.txtBarCode.Font = new System.Drawing.Font("黑体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.txtBarCode.Location = new System.Drawing.Point(178, 187);
+            this.txtBarCode.Location = new System.Drawing.Point(237, 234);
+            this.txtBarCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtBarCode.Name = "txtBarCode";
-            this.txtBarCode.Size = new System.Drawing.Size(419, 53);
+            this.txtBarCode.Size = new System.Drawing.Size(557, 65);
             this.txtBarCode.TabIndex = 0;
             this.txtBarCode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.txtBarCode.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtBarCode_KeyDown);
@@ -323,17 +347,18 @@
             // 
             this.labProPosition.BackColor = System.Drawing.Color.White;
             this.labProPosition.Font = new System.Drawing.Font("黑体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labProPosition.Location = new System.Drawing.Point(859, 257);
+            this.labProPosition.Location = new System.Drawing.Point(1145, 321);
+            this.labProPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.labProPosition.Name = "labProPosition";
-            this.labProPosition.Size = new System.Drawing.Size(159, 49);
+            this.labProPosition.Size = new System.Drawing.Size(212, 61);
             this.labProPosition.TabIndex = 62;
             this.labProPosition.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // FrmSecondCheckSpec
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1024, 768);
+            this.ClientSize = new System.Drawing.Size(1365, 960);
             this.Controls.Add(this.labProPosition);
             this.Controls.Add(this.txtBarCode);
             this.Controls.Add(this.btnAbt);
@@ -359,7 +384,8 @@
             this.Controls.Add(this.labTime);
             this.Controls.Add(this.pictureBox1);
             this.Controls.Add(this.labTitle);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "FrmSecondCheckSpec";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "FrmSecondCheck";

SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.Designer.cs

@@ -102,18 +102,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(2, 2, 2, 2);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 8;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+            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, 3F));
+            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, 128F));
+            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, 80F));
+            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, 48F));
+            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, 80F));
+            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.Percent, 100F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F));
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 70F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(1280, 880);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(1707, 1100);
             this.tableLayoutPanel1.TabIndex = 0;
             // 
             // panel1
@@ -131,10 +131,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(2, 85);
+            this.panel1.Location = new System.Drawing.Point(3, 106);
-            this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1276, 124);
+            this.panel1.Size = new System.Drawing.Size(1701, 156);
             this.panel1.TabIndex = 0;
             // 
             // txtLastScanL
@@ -143,11 +143,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(30, 63);
+            this.txtLastScanL.Location = new System.Drawing.Point(40, 79);
-            this.txtLastScanL.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.txtLastScanL.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtLastScanL.Name = "txtLastScanL";
             this.txtLastScanL.ReadOnly = true;
-            this.txtLastScanL.Size = new System.Drawing.Size(343, 34);
+            this.txtLastScanL.Size = new System.Drawing.Size(457, 43);
             this.txtLastScanL.TabIndex = 11;
             // 
             // txtLastScanR
@@ -156,11 +156,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(390, 63);
+            this.txtLastScanR.Location = new System.Drawing.Point(520, 79);
-            this.txtLastScanR.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.txtLastScanR.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtLastScanR.Name = "txtLastScanR";
             this.txtLastScanR.ReadOnly = true;
-            this.txtLastScanR.Size = new System.Drawing.Size(343, 34);
+            this.txtLastScanR.Size = new System.Drawing.Size(457, 43);
             this.txtLastScanR.TabIndex = 10;
             // 
             // txtProduceModel
@@ -169,10 +169,9 @@
             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(915, 23);
+            this.txtProduceModel.Location = new System.Drawing.Point(1220, 29);
-            this.txtProduceModel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.txtProduceModel.Name = "txtProduceModel";
-            this.txtProduceModel.Size = new System.Drawing.Size(60, 24);
+            this.txtProduceModel.Size = new System.Drawing.Size(75, 30);
             this.txtProduceModel.TabIndex = 9;
             this.txtProduceModel.Text = "左右";
             // 
@@ -181,10 +180,9 @@
             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(761, 23);
+            this.label7.Location = new System.Drawing.Point(1015, 29);
-            this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(160, 24);
+            this.label7.Size = new System.Drawing.Size(199, 30);
             this.label7.TabIndex = 8;
             this.label7.Text = "当前生产模式";
             // 
@@ -194,10 +192,9 @@
             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(691, 23);
+            this.txtConfig.Location = new System.Drawing.Point(921, 29);
-            this.txtConfig.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.txtConfig.Name = "txtConfig";
-            this.txtConfig.Size = new System.Drawing.Size(60, 24);
+            this.txtConfig.Size = new System.Drawing.Size(75, 30);
             this.txtConfig.TabIndex = 7;
             this.txtConfig.Text = "高配";
             // 
@@ -206,10 +203,9 @@
             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(537, 23);
+            this.label5.Location = new System.Drawing.Point(716, 29);
-            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(160, 24);
+            this.label5.Size = new System.Drawing.Size(199, 30);
             this.label5.TabIndex = 6;
             this.label5.Text = "当前配置状态";
             // 
@@ -219,10 +215,9 @@
             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(350, 23);
+            this.lbScanState.Location = new System.Drawing.Point(467, 29);
-            this.lbScanState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbScanState.Name = "lbScanState";
-            this.lbScanState.Size = new System.Drawing.Size(110, 24);
+            this.lbScanState.Size = new System.Drawing.Size(137, 30);
             this.lbScanState.TabIndex = 5;
             this.lbScanState.Text = "允许扫码";
             // 
@@ -231,10 +226,9 @@
             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(242, 23);
+            this.label3.Location = new System.Drawing.Point(323, 29);
-            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(110, 24);
+            this.label3.Size = new System.Drawing.Size(137, 30);
             this.label3.TabIndex = 4;
             this.label3.Text = "扫描状态";
             // 
@@ -244,10 +238,9 @@
             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(112, 23);
+            this.lbLinkState.Location = new System.Drawing.Point(149, 29);
-            this.lbLinkState.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbLinkState.Name = "lbLinkState";
-            this.lbLinkState.Size = new System.Drawing.Size(110, 24);
+            this.lbLinkState.Size = new System.Drawing.Size(137, 30);
             this.lbLinkState.TabIndex = 3;
             this.lbLinkState.Text = "连接成功";
             // 
@@ -256,10 +249,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(1114, 62);
+            this.btnOpenParamDialog.Location = new System.Drawing.Point(1485, 78);
-            this.btnOpenParamDialog.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btnOpenParamDialog.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnOpenParamDialog.Name = "btnOpenParamDialog";
-            this.btnOpenParamDialog.Size = new System.Drawing.Size(154, 55);
+            this.btnOpenParamDialog.Size = new System.Drawing.Size(205, 69);
             this.btnOpenParamDialog.TabIndex = 2;
             this.btnOpenParamDialog.Text = "返回选中窗口";
             this.btnOpenParamDialog.UseVisualStyleBackColor = false;
@@ -270,10 +263,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(956, 62);
+            this.btnSearch.Location = new System.Drawing.Point(1275, 78);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(154, 55);
+            this.btnSearch.Size = new System.Drawing.Size(205, 69);
             this.btnSearch.TabIndex = 1;
             this.btnSearch.Text = "查询明细";
             this.btnSearch.UseVisualStyleBackColor = false;
@@ -284,28 +277,27 @@
             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(8, 23);
+            this.label1.Location = new System.Drawing.Point(11, 29);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(99, 24);
+            this.label1.Size = new System.Drawing.Size(123, 30);
             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, 45F));
+            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.Percent, 50F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F));
+            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.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(2, 213);
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(3, 266);
-            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(1276, 76);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(1701, 96);
             this.tableLayoutPanel2.TabIndex = 1;
             // 
             // txtLeftScan
@@ -314,24 +306,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(47, 14);
+            this.txtLeftScan.Location = new System.Drawing.Point(63, 19);
-            this.txtLeftScan.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.txtLeftScan.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtLeftScan.Name = "txtLeftScan";
-            this.txtLeftScan.Size = new System.Drawing.Size(589, 47);
+            this.txtLeftScan.Size = new System.Drawing.Size(784, 57);
             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, 60F));
+            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, 90F));
+            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, 60F));
+            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, 90F));
+            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, 60F));
+            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, 90F));
+            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, 60F));
+            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, 90F));
+            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.Percent, 100F));
             this.tableLayoutPanel3.Controls.Add(this.txtLowQty, 7, 0);
             this.tableLayoutPanel3.Controls.Add(this.txtHighQty, 5, 0);
@@ -343,12 +335,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(2, 341);
+            this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 426);
-            this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(1276, 76);
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(1701, 96);
             this.tableLayoutPanel3.TabIndex = 3;
             // 
             // txtLowQty
@@ -359,10 +351,9 @@
             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(512, 0);
+            this.txtLowQty.Location = new System.Drawing.Point(683, 0);
-            this.txtLowQty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.txtLowQty.Name = "txtLowQty";
-            this.txtLowQty.Size = new System.Drawing.Size(86, 76);
+            this.txtLowQty.Size = new System.Drawing.Size(114, 96);
             this.txtLowQty.TabIndex = 9;
             this.txtLowQty.Text = "0";
             this.txtLowQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -375,10 +366,9 @@
             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(362, 0);
+            this.txtHighQty.Location = new System.Drawing.Point(483, 0);
-            this.txtHighQty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.txtHighQty.Name = "txtHighQty";
-            this.txtHighQty.Size = new System.Drawing.Size(86, 76);
+            this.txtHighQty.Size = new System.Drawing.Size(114, 96);
             this.txtHighQty.TabIndex = 8;
             this.txtHighQty.Text = "0";
             this.txtHighQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -391,10 +381,9 @@
             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(212, 0);
+            this.txtRightQty.Location = new System.Drawing.Point(283, 0);
-            this.txtRightQty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.txtRightQty.Name = "txtRightQty";
-            this.txtRightQty.Size = new System.Drawing.Size(86, 76);
+            this.txtRightQty.Size = new System.Drawing.Size(114, 96);
             this.txtRightQty.TabIndex = 7;
             this.txtRightQty.Text = "0";
             this.txtRightQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -407,10 +396,9 @@
             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(62, 0);
+            this.txtLeftQty.Location = new System.Drawing.Point(83, 0);
-            this.txtLeftQty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.txtLeftQty.Name = "txtLeftQty";
-            this.txtLeftQty.Size = new System.Drawing.Size(86, 76);
+            this.txtLeftQty.Size = new System.Drawing.Size(114, 96);
             this.txtLeftQty.TabIndex = 6;
             this.txtLeftQty.Text = "0";
             this.txtLeftQty.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -424,10 +412,9 @@
             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(2, 0);
+            this.label13.Location = new System.Drawing.Point(3, 0);
-            this.label13.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(56, 76);
+            this.label13.Size = new System.Drawing.Size(74, 96);
             this.label13.TabIndex = 1;
             this.label13.Text = "左";
             this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -441,10 +428,9 @@
             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(152, 0);
+            this.label14.Location = new System.Drawing.Point(203, 0);
-            this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label14.Name = "label14";
-            this.label14.Size = new System.Drawing.Size(56, 76);
+            this.label14.Size = new System.Drawing.Size(74, 96);
             this.label14.TabIndex = 2;
             this.label14.Text = "右";
             this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -454,10 +440,9 @@
             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(1245, 32);
+            this.lbVer.Location = new System.Drawing.Point(1659, 40);
-            this.lbVer.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbVer.Name = "lbVer";
-            this.lbVer.Size = new System.Drawing.Size(29, 12);
+            this.lbVer.Size = new System.Drawing.Size(39, 15);
             this.lbVer.TabIndex = 10;
             this.lbVer.Text = "    ";
             // 
@@ -470,10 +455,9 @@
             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(302, 0);
+            this.label4.Location = new System.Drawing.Point(403, 0);
-            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(56, 76);
+            this.label4.Size = new System.Drawing.Size(74, 96);
             this.label4.TabIndex = 11;
             this.label4.Text = "高";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -487,10 +471,9 @@
             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(452, 0);
+            this.label8.Location = new System.Drawing.Point(603, 0);
-            this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(56, 76);
+            this.label8.Size = new System.Drawing.Size(74, 96);
             this.label8.TabIndex = 12;
             this.label8.Text = "低";
             this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -502,10 +485,9 @@
             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(2, 824);
+            this.lbMsg.Location = new System.Drawing.Point(3, 1030);
-            this.lbMsg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbMsg.Name = "lbMsg";
-            this.lbMsg.Size = new System.Drawing.Size(119, 56);
+            this.lbMsg.Size = new System.Drawing.Size(146, 70);
             this.lbMsg.TabIndex = 5;
             this.lbMsg.Text = "异常信息 提示";
             this.lbMsg.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -517,10 +499,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(2, 293);
+            this.panel2.Location = new System.Drawing.Point(3, 366);
-            this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panel2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(1276, 44);
+            this.panel2.Size = new System.Drawing.Size(1701, 56);
             this.panel2.TabIndex = 6;
             // 
             // lbEnd
@@ -528,10 +510,9 @@
             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(370, 8);
+            this.lbEnd.Location = new System.Drawing.Point(493, 10);
-            this.lbEnd.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbEnd.Name = "lbEnd";
-            this.lbEnd.Size = new System.Drawing.Size(218, 19);
+            this.lbEnd.Size = new System.Drawing.Size(257, 24);
             this.lbEnd.TabIndex = 3;
             this.lbEnd.Text = "2024-06-01 23:59:59";
             // 
@@ -540,10 +521,9 @@
             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(337, 8);
+            this.label6.Location = new System.Drawing.Point(449, 10);
-            this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(20, 19);
+            this.label6.Size = new System.Drawing.Size(23, 24);
             this.label6.TabIndex = 2;
             this.label6.Text = "-";
             // 
@@ -552,10 +532,9 @@
             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(138, 8);
+            this.lbBegin.Location = new System.Drawing.Point(184, 10);
-            this.lbBegin.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbBegin.Name = "lbBegin";
-            this.lbBegin.Size = new System.Drawing.Size(218, 19);
+            this.lbBegin.Size = new System.Drawing.Size(257, 24);
             this.lbBegin.TabIndex = 1;
             this.lbBegin.Text = "2024-06-01 00:00:00";
             // 
@@ -564,10 +543,9 @@
             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(4, 8);
+            this.label2.Location = new System.Drawing.Point(5, 10);
-            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(140, 19);
+            this.label2.Size = new System.Drawing.Size(173, 24);
             this.label2.TabIndex = 0;
             this.label2.Text = "当前生产数据:";
             // 
@@ -579,13 +557,13 @@
             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(2, 421);
+            this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 526);
-            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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, 402F));
+            this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 501F));
-            this.tableLayoutPanel4.Size = new System.Drawing.Size(1276, 401);
+            this.tableLayoutPanel4.Size = new System.Drawing.Size(1701, 502);
             this.tableLayoutPanel4.TabIndex = 7;
             // 
             // dgridScanRecords
@@ -609,8 +587,8 @@
             this.生产时间});
             this.dgridScanRecords.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgridScanRecords.EnableHeadersVisualStyles = false;
-            this.dgridScanRecords.Location = new System.Drawing.Point(640, 2);
+            this.dgridScanRecords.Location = new System.Drawing.Point(853, 2);
-            this.dgridScanRecords.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.dgridScanRecords.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.dgridScanRecords.Name = "dgridScanRecords";
             this.dgridScanRecords.ReadOnly = true;
             dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -623,8 +601,9 @@
             this.dgridScanRecords.RowHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgridScanRecords.RowHeadersWidth = 51;
             this.dgridScanRecords.RowTemplate.Height = 27;
-            this.dgridScanRecords.Size = new System.Drawing.Size(634, 397);
+            this.dgridScanRecords.Size = new System.Drawing.Size(845, 498);
             this.dgridScanRecords.TabIndex = 4;
+            this.dgridScanRecords.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgridScanRecords_CellContentClick);
             // 
             // 塑件唯一码
             // 
@@ -683,10 +662,9 @@
             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(2, 0);
+            this.txtAllQty.Location = new System.Drawing.Point(3, 0);
-            this.txtAllQty.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.txtAllQty.Name = "txtAllQty";
-            this.txtAllQty.Size = new System.Drawing.Size(634, 401);
+            this.txtAllQty.Size = new System.Drawing.Size(844, 502);
             this.txtAllQty.TabIndex = 5;
             this.txtAllQty.Text = "0";
             this.txtAllQty.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -695,10 +673,10 @@
             // 
             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(2, 82);
+            this.panel3.Location = new System.Drawing.Point(3, 102);
-            this.panel3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(1276, 1);
+            this.panel3.Size = new System.Drawing.Size(1701, 1);
             this.panel3.TabIndex = 8;
             // 
             // panel4
@@ -706,10 +684,10 @@
             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(2, 2);
+            this.panel4.Location = new System.Drawing.Point(3, 2);
-            this.panel4.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(1276, 76);
+            this.panel4.Size = new System.Drawing.Size(1701, 96);
             this.panel4.TabIndex = 9;
             // 
             // lbTime
@@ -717,10 +695,9 @@
             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(956, 30);
+            this.lbTime.Location = new System.Drawing.Point(1275, 38);
-            this.lbTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbTime.Name = "lbTime";
-            this.lbTime.Size = new System.Drawing.Size(319, 33);
+            this.lbTime.Size = new System.Drawing.Size(397, 40);
             this.lbTime.TabIndex = 1;
             this.lbTime.Text = "2024-10-10 12:23:32";
             // 
@@ -729,10 +706,9 @@
             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(194, 15);
+            this.label11.Location = new System.Drawing.Point(259, 19);
-            this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label11.Name = "label11";
-            this.label11.Size = new System.Drawing.Size(412, 48);
+            this.label11.Size = new System.Drawing.Size(513, 60);
             this.label11.TabIndex = 0;
             this.label11.Text = "北汽模塑生产看板";
             // 
@@ -750,12 +726,12 @@
             // 
             // FrmDoorSill_214_3
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1280, 880);
+            this.ClientSize = new System.Drawing.Size(1707, 1100);
             this.Controls.Add(this.tableLayoutPanel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "FrmDoorSill_214_3";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "214门槛冲孔";

SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3.cs

@@ -70,9 +70,10 @@ namespace PunchAndWeld
 
         private void btnOpenParamDialog_Click(object sender, EventArgs e)
         {
-            txtConfig.Text = "";
+            string cf = txtConfig.Text;
-            txtProduceModel.Text = "";
+            string pm = txtProduceModel.Text;
-            ShowParamDialog(txtConfig.Text, txtProduceModel.Text);
+            ShowParamDialog(cf, pm);
+           
             LoadScanBoxEnabled();
         }
         private void txtLeftScan_KeyDown(object sender, KeyEventArgs e)
@@ -214,7 +215,7 @@ namespace PunchAndWeld
         /// <param name="config">配置 1高配，2低配 </param>
         /// <param name="leftOrRight">1左右，2左，3右</param>
         /// <param name="state">1允许生产，0生产完成</param>
-        public void SendToPLC(string config, string leftOrRight, int state)
+        public void SendToPLC(int config, int leftOrRight, int state)
         {
             if (ConfigurationManager.AppSettings["IsHaveVisual"] == "1")
             {
@@ -296,17 +297,31 @@ namespace PunchAndWeld
         {
             _conditionDialog = new FrmDoorSill_214_3_Condition(cfg, pm);
             _conditionDialog.AfterOkButtonClick += (configCode, produceModel) => {
+                if ((txtConfig.Text?.Trim()+ txtProduceModel.Text?.Trim()) != (configCode+ produceModel) )
+                {
+                    _leftScanCode = "";
+                    _rightScanCode = "";
+                    txtLastScanL.Text = "";
+                    txtLastScanR.Text = "";
+                    txtConfig.Text = "";
+                    txtProduceModel.Text = "";
+                }
+                
                 txtConfig.Text = configCode;
                 txtProduceModel.Text = produceModel;
                 this.Show();
                 _conditionDialog.Hide();
             };
 
+            if (string.IsNullOrEmpty(cfg))
+            {
                 _conditionDialog.FormClosed += (arg1, arg2) => {
                     this.Close();
                     this.Dispose();
 
                 };
+            }
+           
             _conditionDialog.ShowDialog();
 
         }
@@ -404,7 +419,7 @@ namespace PunchAndWeld
                     ShowHint($"操作{scanLeftOrRight}条码:{_leftScanCode},操作成功", false);
                 }
 
-                SendToPLC(config.ToString(), produceModel.ToString(), 1);
+                SendToPLC(config, produceModel, 1);
 
                 txtLastScanL.Text = "";
                 txtLastScanR.Text = "";
@@ -634,5 +649,10 @@ namespace PunchAndWeld
         {
             lbTime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
         }
+
+        private void dgridScanRecords_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+
+        }
     }
 }

SjMes/PunchAssemble/PunchAndWeld/FrmDoorSill_214_3_Condition.cs

@@ -93,6 +93,7 @@ namespace PunchAndWeld
         private void btnCancel_Click(object sender, EventArgs e)
         {
             this.Close();
+            this.Dispose();
             if(AfterCancelClick != null)
             {
                 AfterCancelClick();

SjMes/PunchAssemble/PunchAndWeld/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.20")]
+[assembly: AssemblyVersion("1.0.0.22")]
-[assembly: AssemblyFileVersion("1.0.0.20")]
+[assembly: AssemblyFileVersion("1.0.0.22")]

SjMes/PurchingMistakeNew/App.config

@@ -5,7 +5,9 @@
     </startup>
   <connectionStrings>
     <!--<add name="SqlConnString" connectionString="Persist Security Info=true;Initial Catalog=BBMPT;Data Source=39.97.227.79;User ID=sa;Password=a1+"/>-->
-    <add name="SqlConnString" connectionString="Persist Security Info=true;Initial Catalog=BBMPT;Data Source=10.60.101.9;User ID=sa;Password=a1+"/>
+	  <add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>
+
+	  <!--<add name="SqlConnString" connectionString="Persist Security Info=true;Initial Catalog=BBMPT;Data Source=10.60.101.9;User ID=sa;Password=a1+"/>-->
     <!--<add name="report" connectionString="Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=10.60.101.9;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=PC201904081405E;Use Encryption for Data=False;Tag with column collation when possible=False"/>-->
     <add name="report" connectionString="Provider=SQLOLEDB.1;Password=a1+;Persist Security Info=True;User ID=sa;Initial Catalog=BBMPT;Data Source=39.97.227.79;Use Procedure for Prepare=1;Auto Translate=True;Packet Size=4096;Workstation ID=PC201904081405E;Use Encryption for Data=False;Tag with column collation when possible=False"/>
 
@@ -16,6 +18,6 @@
     <add key="Printer3" value="Microsoft XPS Document Writer"/>
     <add key="type" value="1"/>
     <add key="interval" value="60000"/>
-    <add key="loadForm" value="4"/>
+    <add key="loadForm" value="1"/>
   </appSettings>
 </configuration>

SjMes/WebService/Web.config

@@ -28,7 +28,8 @@
   </system.web>
   <connectionStrings>
     <!--数据库连接串-->
-    <add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>
+	  <!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
+	  <add name="SqlConnString" connectionString="DATA SOURCE = dev.ccwin-in.com,6191;USER ID = sa;PASSWORD = Microsoft@2021;INITIAL CATALOG = BBMPT"/>
     <add name="BBMPTEntities" connectionString="metadata=res://*/EFModel.BBMPT.csdl|res://*/EFModel.BBMPT.ssdl|res://*/EFModel.BBMPT.msl;provider=System.Data.SqlClient;provider connection string=&quot;data source=10.60.101.9;initial catalog=BBMPT;user id=sa;password=a1+;multipleactiveresultsets=True;application name=EntityFramework&quot;" providerName="System.Data.EntityClient"/>
     <!--<add name="SqlConnString" connectionString="Data Source=10.60.101.9;user id=sa;password=a1+;database=BBMPT;max pool size = 50;"/>-->
     <!--二厂配置-->