解决冲突

UAS-MES/CustomControl/TextBoxWithIcon/MaCodeSearchTextBox.Designer.cs

@@ -57,6 +57,7 @@
             this.TextBox.Lock = false;
             this.TextBox.Name = "TextBox";
             this.TextBox.Power = null;
+            this.TextBox.Size = new System.Drawing.Size(178, 28);
             this.TextBox.Size = new System.Drawing.Size(178, 21);
             this.TextBox.Str = null;
             this.TextBox.Str1 = null;

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

@@ -28,34 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("主板");
-            System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("液晶屏");
-            System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("电路板");
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_NewMatainInf));
-            this.mbc_component_lsv = new System.Windows.Forms.ListView();
-            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.nrg_name_lsv = new System.Windows.Forms.ListView();
-            this.nrg_code = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.nrg_name = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.nr_name_lsv = new System.Windows.Forms.ListView();
-            this.nr_code = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.nr_name = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.nr_groupcode = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.mbr_dutycode_lsv = new System.Windows.Forms.ListView();
-            this.nd_code = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.nd_name = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.mbr_solutioncode_lsv = new System.Windows.Forms.ListView();
-            this.so_code = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.so_name = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.Cancel = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.groupBoxWithBorder1 = new UAS_MES.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
-            this.bc_name = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.bc_name_label = new System.Windows.Forms.Label();
-            this.bg_name = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.bg_name_label = new System.Windows.Forms.Label();
-            this.headBar1 = new UAS_MES.CustomControl.HeadBar();
-            this.groupBoxWithBorder1.SuspendLayout();
             this.SuspendLayout();
             // 
             // mbc_component_lsv
@@ -68,10 +40,9 @@
             listViewItem1,
             listViewItem2,
             listViewItem3});
-            this.mbc_component_lsv.Location = new System.Drawing.Point(9, 127);
-            this.mbc_component_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbc_component_lsv.Location = new System.Drawing.Point(12, 159);
             this.mbc_component_lsv.Name = "mbc_component_lsv";
-            this.mbc_component_lsv.Size = new System.Drawing.Size(219, 153);
+            this.mbc_component_lsv.Size = new System.Drawing.Size(291, 190);
             this.mbc_component_lsv.TabIndex = 1;
             this.mbc_component_lsv.UseCompatibleStateImageBehavior = false;
             this.mbc_component_lsv.View = System.Windows.Forms.View.Details;
@@ -90,10 +61,9 @@
             this.nrg_name_lsv.Cursor = System.Windows.Forms.Cursors.Default;
             this.nrg_name_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nrg_name_lsv.FullRowSelect = true;
-            this.nrg_name_lsv.Location = new System.Drawing.Point(232, 127);
-            this.nrg_name_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.nrg_name_lsv.Location = new System.Drawing.Point(309, 159);
             this.nrg_name_lsv.Name = "nrg_name_lsv";
-            this.nrg_name_lsv.Size = new System.Drawing.Size(199, 153);
+            this.nrg_name_lsv.Size = new System.Drawing.Size(264, 190);
             this.nrg_name_lsv.TabIndex = 2;
             this.nrg_name_lsv.UseCompatibleStateImageBehavior = false;
             this.nrg_name_lsv.View = System.Windows.Forms.View.Details;
@@ -101,7 +71,7 @@
             // 
             // nrg_code
             // 
-            this.nrg_code.Text = "不良原因组代码";
+            this.nrg_code.Text = "";
             this.nrg_code.Width = 0;
             // 
             // nrg_name
@@ -117,10 +87,9 @@
             this.nr_groupcode});
             this.nr_name_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.nr_name_lsv.FullRowSelect = true;
-            this.nr_name_lsv.Location = new System.Drawing.Point(436, 127);
-            this.nr_name_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.nr_name_lsv.Location = new System.Drawing.Point(581, 159);
             this.nr_name_lsv.Name = "nr_name_lsv";
-            this.nr_name_lsv.Size = new System.Drawing.Size(182, 306);
+            this.nr_name_lsv.Size = new System.Drawing.Size(241, 381);
             this.nr_name_lsv.TabIndex = 3;
             this.nr_name_lsv.UseCompatibleStateImageBehavior = false;
             this.nr_name_lsv.View = System.Windows.Forms.View.Details;
@@ -128,7 +97,6 @@
             // 
             // nr_code
             // 
-            this.nr_code.Text = "不良原因代码";
             this.nr_code.Width = 0;
             // 
             // nr_name
@@ -147,10 +115,9 @@
             this.nd_name});
             this.mbr_dutycode_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_dutycode_lsv.FullRowSelect = true;
-            this.mbr_dutycode_lsv.Location = new System.Drawing.Point(9, 284);
-            this.mbr_dutycode_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbr_dutycode_lsv.Location = new System.Drawing.Point(12, 355);
             this.mbr_dutycode_lsv.Name = "mbr_dutycode_lsv";
-            this.mbr_dutycode_lsv.Size = new System.Drawing.Size(219, 149);
+            this.mbr_dutycode_lsv.Size = new System.Drawing.Size(291, 185);
             this.mbr_dutycode_lsv.TabIndex = 5;
             this.mbr_dutycode_lsv.UseCompatibleStateImageBehavior = false;
             this.mbr_dutycode_lsv.View = System.Windows.Forms.View.Details;
@@ -173,10 +140,9 @@
             this.so_name});
             this.mbr_solutioncode_lsv.Font = new System.Drawing.Font("微软雅黑", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.mbr_solutioncode_lsv.FullRowSelect = true;
-            this.mbr_solutioncode_lsv.Location = new System.Drawing.Point(232, 284);
-            this.mbr_solutioncode_lsv.Margin = new System.Windows.Forms.Padding(2);
+            this.mbr_solutioncode_lsv.Location = new System.Drawing.Point(309, 355);
             this.mbr_solutioncode_lsv.Name = "mbr_solutioncode_lsv";
-            this.mbr_solutioncode_lsv.Size = new System.Drawing.Size(199, 149);
+            this.mbr_solutioncode_lsv.Size = new System.Drawing.Size(264, 185);
             this.mbr_solutioncode_lsv.TabIndex = 6;
             this.mbr_solutioncode_lsv.UseCompatibleStateImageBehavior = false;
             this.mbr_solutioncode_lsv.View = System.Windows.Forms.View.Details;
@@ -199,13 +165,12 @@
             this.Cancel.DownImage = ((System.Drawing.Image)(resources.GetObject("Cancel.DownImage")));
             this.Cancel.Image = null;
             this.Cancel.IsShowBorder = true;
-            this.Cancel.Location = new System.Drawing.Point(326, 450);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(2);
+            this.Cancel.Location = new System.Drawing.Point(435, 563);
             this.Cancel.MoveImage = ((System.Drawing.Image)(resources.GetObject("Cancel.MoveImage")));
             this.Cancel.Name = "Cancel";
             this.Cancel.NormalImage = ((System.Drawing.Image)(resources.GetObject("Cancel.NormalImage")));
             this.Cancel.Power = null;
-            this.Cancel.Size = new System.Drawing.Size(60, 28);
+            this.Cancel.Size = new System.Drawing.Size(80, 35);
             this.Cancel.TabIndex = 58;
             this.Cancel.Text = "取消";
             this.Cancel.UseVisualStyleBackColor = false;
@@ -218,13 +183,12 @@
             this.Save.DownImage = ((System.Drawing.Image)(resources.GetObject("Save.DownImage")));
             this.Save.Image = null;
             this.Save.IsShowBorder = true;
-            this.Save.Location = new System.Drawing.Point(238, 450);
-            this.Save.Margin = new System.Windows.Forms.Padding(2);
+            this.Save.Location = new System.Drawing.Point(317, 563);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
             this.Save.NormalImage = ((System.Drawing.Image)(resources.GetObject("Save.NormalImage")));
             this.Save.Power = null;
-            this.Save.Size = new System.Drawing.Size(60, 28);
+            this.Save.Size = new System.Drawing.Size(80, 35);
             this.Save.TabIndex = 57;
             this.Save.Text = "保存";
             this.Save.UseVisualStyleBackColor = false;
@@ -239,11 +203,9 @@
             this.groupBoxWithBorder1.Controls.Add(this.bg_name_label);
             this.groupBoxWithBorder1.Dock = System.Windows.Forms.DockStyle.Top;
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(0, 32);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(0, 40);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(624, 80);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(832, 100);
             this.groupBoxWithBorder1.TabIndex = 4;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "工单信息";
@@ -259,10 +221,11 @@
             this.bc_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_name.ForeColor = System.Drawing.Color.Black;
             this.bc_name.ID = null;
-            this.bc_name.Location = new System.Drawing.Point(404, 34);
+            this.bc_name.Location = new System.Drawing.Point(538, 42);
+            this.bc_name.Margin = new System.Windows.Forms.Padding(4);
             this.bc_name.Name = "bc_name";
             this.bc_name.Power = null;
-            this.bc_name.Size = new System.Drawing.Size(141, 23);
+            this.bc_name.Size = new System.Drawing.Size(187, 27);
             this.bc_name.Str = null;
             this.bc_name.Str1 = null;
             this.bc_name.Str2 = null;
@@ -273,9 +236,10 @@
             // 
             this.bc_name_label.AutoSize = true;
             this.bc_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_name_label.Location = new System.Drawing.Point(308, 34);
+            this.bc_name_label.Location = new System.Drawing.Point(411, 42);
+            this.bc_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_name_label.Name = "bc_name_label";
-            this.bc_name_label.Size = new System.Drawing.Size(74, 21);
+            this.bc_name_label.Size = new System.Drawing.Size(92, 27);
             this.bc_name_label.TabIndex = 101;
             this.bc_name_label.Text = "不良代码";
             // 
@@ -289,10 +253,11 @@
             this.bg_name.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bg_name.ForeColor = System.Drawing.Color.Black;
             this.bg_name.ID = null;
-            this.bg_name.Location = new System.Drawing.Point(128, 34);
+            this.bg_name.Location = new System.Drawing.Point(170, 42);
+            this.bg_name.Margin = new System.Windows.Forms.Padding(4);
             this.bg_name.Name = "bg_name";
             this.bg_name.Power = null;
-            this.bg_name.Size = new System.Drawing.Size(141, 23);
+            this.bg_name.Size = new System.Drawing.Size(187, 27);
             this.bg_name.Str = null;
             this.bg_name.Str1 = null;
             this.bg_name.Str2 = null;
@@ -303,9 +268,10 @@
             // 
             this.bg_name_label.AutoSize = true;
             this.bg_name_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bg_name_label.Location = new System.Drawing.Point(19, 34);
+            this.bg_name_label.Location = new System.Drawing.Point(25, 42);
+            this.bg_name_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bg_name_label.Name = "bg_name_label";
-            this.bg_name_label.Size = new System.Drawing.Size(90, 21);
+            this.bg_name_label.Size = new System.Drawing.Size(112, 27);
             this.bg_name_label.TabIndex = 99;
             this.bg_name_label.Text = "不良代码组";
             // 
@@ -314,8 +280,9 @@
             this.headBar1.BackColor = System.Drawing.SystemColors.ControlDarkDark;
             this.headBar1.Dock = System.Windows.Forms.DockStyle.Top;
             this.headBar1.Location = new System.Drawing.Point(0, 0);
+            this.headBar1.Margin = new System.Windows.Forms.Padding(4);
             this.headBar1.Name = "headBar1";
-            this.headBar1.Size = new System.Drawing.Size(624, 32);
+            this.headBar1.Size = new System.Drawing.Size(832, 40);
             this.headBar1.TabIndex = 0;
             this.headBar1.Title = "新增维修信息";
             // 
@@ -323,7 +290,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(624, 488);
+            this.ClientSize = new System.Drawing.Size(832, 610);
             this.Controls.Add(this.Cancel);
             this.Controls.Add(this.Save);
             this.Controls.Add(this.mbr_solutioncode_lsv);
@@ -334,13 +301,9 @@
             this.Controls.Add(this.mbc_component_lsv);
             this.Controls.Add(this.headBar1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "Make_NewMatainInf";
             this.Tag = "ShowDialogWindow";
             this.Text = "Make_NewMatainInf";
-            this.Load += new System.EventHandler(this.Make_NewMatainInf_Load);
-            this.groupBoxWithBorder1.ResumeLayout(false);
-            this.groupBoxWithBorder1.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -364,11 +327,11 @@
         private System.Windows.Forms.ColumnHeader nd_code;
         private System.Windows.Forms.ColumnHeader so_code;
         private System.Windows.Forms.ColumnHeader nr_name;
+        private System.Windows.Forms.ColumnHeader nrg_code;
         private System.Windows.Forms.ColumnHeader nr_code;
         private System.Windows.Forms.ColumnHeader nr_groupcode;
         private System.Windows.Forms.ColumnHeader nd_name;
         private System.Windows.Forms.ColumnHeader so_name;
         private System.Windows.Forms.ColumnHeader columnHeader1;
-        private System.Windows.Forms.ColumnHeader nrg_code;
     }
 }

UAS-MES/UAS-MES.csproj

@@ -22,6 +22,7 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <PublishUrl>ftp://172.16.11.99/</PublishUrl>
     <PublishUrl>ftp://192.168.253.9/MESSetting/</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
@@ -32,6 +33,7 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
+    <InstallUrl>http://172.16.11.99/</InstallUrl>
     <InstallUrl>http://218.17.158.219:8888/publish.htm/</InstallUrl>
     <UpdateUrl>http://218.17.158.219:8888/publish.htm/</UpdateUrl>
     <TargetCulture>zh</TargetCulture>
@@ -41,6 +43,7 @@
     <MinimumRequiredVersion>1.0.0.59</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
+    <ApplicationRevision>194</ApplicationRevision>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <ApplicationRevision>201</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>

UAS_WinForm.sln

@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES接口", "MES接口\UAS-MES接口.csproj", "{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES", "UAS-MES\UAS-MES.csproj", "{411DEE44-B893-47E0-A0C2-797A3DAE2466}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-特殊解析规则", "UAS-特殊解析规则\UAS-特殊解析规则.csproj", "{7D199649-095F-4280-BD82-9481BCAB85B4}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-出货标签管理", "UAS-出货标签管理\UAS-出货标签管理.csproj", "{AF6321B6-3B55-4756-8B0B-110354A7BC1E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject", "TestProject\TestProject.csproj", "{92488A73-91D7-4797-9794-67C4D9D86D09}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-特殊解析规则", "UAS-特殊解析规则\UAS-特殊解析规则.csproj", "{7D199649-095F-4280-BD82-9481BCAB85B4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,10 +27,6 @@ Global
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{411DEE44-B893-47E0-A0C2-797A3DAE2466}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AF6321B6-3B55-4756-8B0B-110354A7BC1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -39,6 +35,10 @@ Global
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92488A73-91D7-4797-9794-67C4D9D86D09}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7D199649-095F-4280-BD82-9481BCAB85B4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE