WIN-GH9CEESPLTB\Administrator vor 1 Monat
Ursprung
Commit
8dbf57a17b

+ 2 - 2
MainForm/FaForm/BandBarodeDialog_S1.Designer.cs

@@ -1,6 +1,6 @@
 namespace MainForm.FaForm
 namespace MainForm.FaForm
 {
 {
-    partial class BandBarodeDialog_S1
+    partial class Dialog_BandBarode_S1
     {
     {
         /// <summary>
         /// <summary>
         /// Required designer variable.
         /// Required designer variable.
@@ -134,7 +134,7 @@
             this.ClientSize = new System.Drawing.Size(800, 370);
             this.ClientSize = new System.Drawing.Size(800, 370);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.groupBox1);
-            this.Name = "BandBarodeDialog_S1";
+            this.Name = "Dialog_BandBarode_S1";
             this.Text = "BandBarodeDialog_S1";
             this.Text = "BandBarodeDialog_S1";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BandBarodeDialog_S1_FormClosing);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BandBarodeDialog_S1_FormClosing);
             this.Load += new System.EventHandler(this.BandBarodeDialog_S1_Load);
             this.Load += new System.EventHandler(this.BandBarodeDialog_S1_Load);

+ 2 - 2
MainForm/FaForm/BandBarodeDialog_S1.cs

@@ -15,7 +15,7 @@ using SqlSugar;
 
 
 namespace MainForm.FaForm
 namespace MainForm.FaForm
 {
 {
-    public partial class BandBarodeDialog_S1 : Form
+    public partial class Dialog_BandBarode_S1 : Form
     {
     {
         public static bool isNoClose { get; set; }=false;
         public static bool isNoClose { get; set; }=false;
 
 
@@ -33,7 +33,7 @@ namespace MainForm.FaForm
         private Timer _inputTimer;
         private Timer _inputTimer;
         Form_Home home=new Form_Home();
         Form_Home home=new Form_Home();
 
 
-        public BandBarodeDialog_S1()
+        public Dialog_BandBarode_S1()
         {
         {
             InitializeComponent();
             InitializeComponent();
             //置顶
             //置顶

MainForm/FaForm/BandBarodeDialog.resx → MainForm/FaForm/Dialog_BandBarode_S1.resx


+ 2 - 2
MainForm/FaForm/BandBarodeDialog.Designer.cs

@@ -1,6 +1,6 @@
 namespace MainForm.FaForm
 namespace MainForm.FaForm
 {
 {
-    partial class BandBarodeDialog
+    partial class Dialog_BandBarode_S3
     {
     {
         /// <summary>
         /// <summary>
         /// Required designer variable.
         /// Required designer variable.
@@ -154,7 +154,7 @@
             this.ClientSize = new System.Drawing.Size(725, 300);
             this.ClientSize = new System.Drawing.Size(725, 300);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox2);
-            this.Name = "BandBarodeDialog";
+            this.Name = "Dialog_BandBarode_S3";
             this.Text = "BandBarodeDialog";
             this.Text = "BandBarodeDialog";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BandBarodeDialog_FormClosing);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BandBarodeDialog_FormClosing);
             this.Load += new System.EventHandler(this.BandBarodeDialog_Load);
             this.Load += new System.EventHandler(this.BandBarodeDialog_Load);

+ 2 - 2
MainForm/FaForm/BandBarodeDialog.cs

@@ -11,7 +11,7 @@ using static MainForm.SQLHelper;
 
 
 namespace MainForm.FaForm
 namespace MainForm.FaForm
 {
 {
-    public partial class BandBarodeDialog : Form
+    public partial class Dialog_BandBarode_S3 : Form
     {
     {
         public string pcbCode { get; private set; }
         public string pcbCode { get; private set; }
         public string _CarrierBarcode {  get;  set; }
         public string _CarrierBarcode {  get;  set; }
@@ -26,7 +26,7 @@ namespace MainForm.FaForm
 
 
         private Timer _inputTimer;
         private Timer _inputTimer;
 
 
-        public BandBarodeDialog(string carrierBarcode, string strProductBarcode, string strPCBBarcode)
+        public Dialog_BandBarode_S3(string carrierBarcode, string strProductBarcode, string strPCBBarcode)
         {
         {
             _CarrierBarcode = carrierBarcode;
             _CarrierBarcode = carrierBarcode;
             _strProductBarcode = strProductBarcode;
             _strProductBarcode = strProductBarcode;

MainForm/FaForm/BandBarodeDialog_S1.resx → MainForm/FaForm/Dialog_BandBarode_S3.resx


+ 44 - 0
MainForm/FaForm/Dialog_MaterialVerify_S1.Designer.cs

@@ -0,0 +1,44 @@
+using System.ComponentModel;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace MainForm.FaForm
+{
+    partial class Dialog_MaterialVerify_S1
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new Container();
+            this.AutoScaleMode = AutoScaleMode.Font;
+            this.ClientSize = new Size(800, 450);
+            this.Text = "Dialog_MaterialVerify_S1";
+        }
+
+        #endregion
+    }
+}

+ 12 - 0
MainForm/FaForm/Dialog_MaterialVerify_S1.cs

@@ -0,0 +1,12 @@
+using System.Windows.Forms;
+
+namespace MainForm.FaForm
+{
+    public partial class Dialog_MaterialVerify_S1 : Form
+    {
+        public Dialog_MaterialVerify_S1()
+        {
+            InitializeComponent();
+        }
+    }
+}

+ 2 - 2
MainForm/FaForm/Form_Home.cs

@@ -2993,7 +2993,7 @@ namespace MainForm
         private void S1_OpenDialog(int plcNo,string stationNameStr,string tagBaseName,string tagMesCommName) {
         private void S1_OpenDialog(int plcNo,string stationNameStr,string tagBaseName,string tagMesCommName) {
             Task.Run(() =>
             Task.Run(() =>
             {
             {
-                using (var dialog = new BandBarodeDialog_S1())
+                using (var dialog = new Dialog_BandBarode_S1())
                 {
                 {
                     var rs = dialog.ShowDialog();
                     var rs = dialog.ShowDialog();
                     if (rs == DialogResult.OK)
                     if (rs == DialogResult.OK)
@@ -6447,7 +6447,7 @@ namespace MainForm
 
 
                         if (OpenDailogFalg)
                         if (OpenDailogFalg)
                         {
                         {
-                            using (var dialog = new BandBarodeDialog(strCarrierBarcode, ProductBarcode, PCBBarcode))
+                            using (var dialog = new Dialog_BandBarode_S3(strCarrierBarcode, ProductBarcode, PCBBarcode))
                             {
                             {
                                 var rs = dialog.ShowDialog();
                                 var rs = dialog.ShowDialog();
                                 if (rs == DialogResult.OK)
                                 if (rs == DialogResult.OK)

+ 16 - 10
MainForm/MainForm.csproj

@@ -306,17 +306,23 @@
     <Compile Include="ClassFile\XiaomiClass\IoTHelper.cs" />
     <Compile Include="ClassFile\XiaomiClass\IoTHelper.cs" />
     <Compile Include="ClassFile\XiaomiClass\MesHelper.cs" />
     <Compile Include="ClassFile\XiaomiClass\MesHelper.cs" />
     <Compile Include="ClassFile\XiaomiClass\ProcessHelper.cs" />
     <Compile Include="ClassFile\XiaomiClass\ProcessHelper.cs" />
-    <Compile Include="FaForm\BandBarodeDialog.cs">
+    <Compile Include="FaForm\Dialog_BandBarode_S3.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
-    <Compile Include="FaForm\BandBarodeDialog.Designer.cs">
-      <DependentUpon>BandBarodeDialog.cs</DependentUpon>
+    <Compile Include="FaForm\Dialog_BandBarode_S3.Designer.cs">
+      <DependentUpon>Dialog_BandBarode_S3.cs</DependentUpon>
     </Compile>
     </Compile>
-    <Compile Include="FaForm\BandBarodeDialog_S1.cs">
+    <Compile Include="FaForm\Dialog_BandBarode_S1.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
     </Compile>
     </Compile>
-    <Compile Include="FaForm\BandBarodeDialog_S1.Designer.cs">
-      <DependentUpon>BandBarodeDialog_S1.cs</DependentUpon>
+    <Compile Include="FaForm\Dialog_BandBarode_S1.Designer.cs">
+      <DependentUpon>Dialog_BandBarode_S1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="FaForm\Dialog_MaterialVerify_S1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FaForm\Dialog_MaterialVerify_S1.Designer.cs">
+      <DependentUpon>Dialog_MaterialVerify_S1.cs</DependentUpon>
     </Compile>
     </Compile>
     <Compile Include="FaForm\Form_DevAlarm.cs">
     <Compile Include="FaForm\Form_DevAlarm.cs">
       <SubType>Form</SubType>
       <SubType>Form</SubType>
@@ -435,11 +441,11 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     </Compile>
     <Compile Include="Settings.cs" />
     <Compile Include="Settings.cs" />
-    <EmbeddedResource Include="FaForm\BandBarodeDialog.resx">
-      <DependentUpon>BandBarodeDialog.cs</DependentUpon>
+    <EmbeddedResource Include="FaForm\Dialog_BandBarode_S3.resx">
+      <DependentUpon>Dialog_BandBarode_S3.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
-    <EmbeddedResource Include="FaForm\BandBarodeDialog_S1.resx">
-      <DependentUpon>BandBarodeDialog_S1.cs</DependentUpon>
+    <EmbeddedResource Include="FaForm\Dialog_BandBarode_S1.resx">
+      <DependentUpon>Dialog_BandBarode_S1.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
     <EmbeddedResource Include="FaForm\Form_DevAlarm.resx">
     <EmbeddedResource Include="FaForm\Form_DevAlarm.resx">
       <DependentUpon>Form_DevAlarm.cs</DependentUpon>
       <DependentUpon>Form_DevAlarm.cs</DependentUpon>