修改数据库路径，微调界面

UAS-MES/App.config

@@ -10,7 +10,7 @@
     </sectionGroup>
   </configSections>
   <connectionStrings>
-    <add name="MES" connectionString="Password=select!#%*(;User ID=MES;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));" />
+    <add name="MES" connectionString="Password=select!#%*(;User ID=UAS_MES;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=218.17.158.219)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));" />
   </connectionStrings>
   <startup useLegacyV2RuntimeActivationPolicy="true"> 
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />

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

@@ -71,7 +71,7 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1311, 36);
             this.panel2.TabIndex = 31;
@@ -161,7 +161,7 @@
             this.Loading.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Loading.ForeColor = System.Drawing.Color.Blue;
             this.Loading.Location = new System.Drawing.Point(56, 569);
-            this.Loading.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Loading.Margin = new System.Windows.Forms.Padding(4);
             this.Loading.Name = "Loading";
             this.Loading.Size = new System.Drawing.Size(73, 31);
             this.Loading.TabIndex = 62;
@@ -175,7 +175,7 @@
             this.UnLoading.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.UnLoading.ForeColor = System.Drawing.Color.Blue;
             this.UnLoading.Location = new System.Drawing.Point(163, 569);
-            this.UnLoading.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.UnLoading.Margin = new System.Windows.Forms.Padding(4);
             this.UnLoading.Name = "UnLoading";
             this.UnLoading.Size = new System.Drawing.Size(73, 31);
             this.UnLoading.TabIndex = 63;
@@ -209,7 +209,7 @@
             this.iflastsn.AutoSize = true;
             this.iflastsn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.iflastsn.Location = new System.Drawing.Point(417, 616);
-            this.iflastsn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.iflastsn.Margin = new System.Windows.Forms.Padding(4);
             this.iflastsn.Name = "iflastsn";
             this.iflastsn.Size = new System.Drawing.Size(142, 31);
             this.iflastsn.TabIndex = 72;
@@ -221,7 +221,7 @@
             this.softwareversion_label.AutoSize = true;
             this.softwareversion_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.softwareversion_label.Location = new System.Drawing.Point(939, 208);
-            this.softwareversion_label.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.softwareversion_label.Margin = new System.Windows.Forms.Padding(4);
             this.softwareversion_label.Name = "softwareversion_label";
             this.softwareversion_label.Size = new System.Drawing.Size(114, 31);
             this.softwareversion_label.TabIndex = 74;
@@ -233,7 +233,7 @@
             this.ecn_label.AutoSize = true;
             this.ecn_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ecn_label.Location = new System.Drawing.Point(939, 305);
-            this.ecn_label.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ecn_label.Margin = new System.Windows.Forms.Padding(4);
             this.ecn_label.Name = "ecn_label";
             this.ecn_label.Size = new System.Drawing.Size(94, 31);
             this.ecn_label.TabIndex = 75;
@@ -245,7 +245,7 @@
             this.ClearSn_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.ClearSn_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
             this.ClearSn_code.Location = new System.Drawing.Point(383, 620);
-            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ClearSn_code.Margin = new System.Windows.Forms.Padding(4);
             this.ClearSn_code.Name = "ClearSn_code";
             this.ClearSn_code.Size = new System.Drawing.Size(21, 20);
             this.ClearSn_code.TabIndex = 138;
@@ -257,7 +257,7 @@
             this.CleanMa_code.Cursor = System.Windows.Forms.Cursors.Hand;
             this.CleanMa_code.Image = global::UAS_MES.Properties.Resources.bindingNavigatorDeleteItem_Image;
             this.CleanMa_code.Location = new System.Drawing.Point(389, 78);
-            this.CleanMa_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CleanMa_code.Margin = new System.Windows.Forms.Padding(4);
             this.CleanMa_code.Name = "CleanMa_code";
             this.CleanMa_code.Size = new System.Drawing.Size(21, 20);
             this.CleanMa_code.TabIndex = 139;
@@ -319,7 +319,7 @@
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(49, 182);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(856, 362);
             this.OperateResult.TabIndex = 94;
@@ -333,7 +333,7 @@
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
             this.Clean.Location = new System.Drawing.Point(821, 570);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -352,7 +352,7 @@
             this.softwareversion.BackColor = System.Drawing.Color.White;
             this.softwareversion.ID = null;
             this.softwareversion.Location = new System.Drawing.Point(1077, 208);
-            this.softwareversion.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.softwareversion.Margin = new System.Windows.Forms.Padding(4);
             this.softwareversion.Name = "softwareversion";
             this.softwareversion.Power = null;
             this.softwareversion.Size = new System.Drawing.Size(192, 25);
@@ -369,7 +369,7 @@
             this.ecn.BackColor = System.Drawing.Color.White;
             this.ecn.ID = null;
             this.ecn.Location = new System.Drawing.Point(1077, 305);
-            this.ecn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ecn.Margin = new System.Windows.Forms.Padding(4);
             this.ecn.Name = "ecn";
             this.ecn.Power = null;
             this.ecn.Size = new System.Drawing.Size(192, 25);
@@ -386,7 +386,7 @@
             this.Confirm.Image = ((System.Drawing.Image)(resources.GetObject("Confirm.Image")));
             this.Confirm.IsShowBorder = true;
             this.Confirm.Location = new System.Drawing.Point(417, 669);
-            this.Confirm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Confirm.Margin = new System.Windows.Forms.Padding(4);
             this.Confirm.MoveImage = ((System.Drawing.Image)(resources.GetObject("Confirm.MoveImage")));
             this.Confirm.Name = "Confirm";
             this.Confirm.NormalImage = ((System.Drawing.Image)(resources.GetObject("Confirm.NormalImage")));
@@ -404,7 +404,7 @@
             this.code.BackColor = System.Drawing.Color.White;
             this.code.ID = null;
             this.code.Location = new System.Drawing.Point(163, 672);
-            this.code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.code.Margin = new System.Windows.Forms.Padding(4);
             this.code.Name = "code";
             this.code.Power = null;
             this.code.Size = new System.Drawing.Size(212, 25);
@@ -422,7 +422,7 @@
             this.sn_code.Enabled = false;
             this.sn_code.ID = null;
             this.sn_code.Location = new System.Drawing.Point(163, 616);
-            this.sn_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
             this.sn_code.Size = new System.Drawing.Size(212, 25);
@@ -435,11 +435,11 @@
             // 
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.Location = new System.Drawing.Point(181, 43);
+            this.LockMakeCode.Location = new System.Drawing.Point(181, 46);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(91, 24);
+            this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.TabIndex = 140;
-            this.LockMakeCode.Text = "锁定工单";
+            this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
             // 
             // ma_code
@@ -496,7 +496,7 @@
             this.Controls.Add(this.ma_prodcode_label);
             this.Controls.Add(this.panel2);
             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 = "Make_FeedingCollection";
             this.Tag = "Make!FeedingCollection";
             this.Text = "上料采集";

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

@@ -111,7 +111,7 @@
             this.panel2.Controls.Add(this.label1);
             this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel2.Location = new System.Drawing.Point(0, 0);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Margin = new System.Windows.Forms.Padding(4);
             this.panel2.Name = "panel2";
             this.panel2.Size = new System.Drawing.Size(1359, 36);
             this.panel2.TabIndex = 88;
@@ -212,7 +212,7 @@
             this.AutoPrint.AutoSize = true;
             this.AutoPrint.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.AutoPrint.Location = new System.Drawing.Point(1048, 128);
-            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.AutoPrint.Margin = new System.Windows.Forms.Padding(4);
             this.AutoPrint.Name = "AutoPrint";
             this.AutoPrint.Size = new System.Drawing.Size(154, 31);
             this.AutoPrint.TabIndex = 128;
@@ -224,7 +224,7 @@
             this.Cancel.AutoSize = true;
             this.Cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Cancel.Location = new System.Drawing.Point(429, 715);
-            this.Cancel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Cancel.Margin = new System.Windows.Forms.Padding(4);
             this.Cancel.Name = "Cancel";
             this.Cancel.Size = new System.Drawing.Size(114, 31);
             this.Cancel.TabIndex = 129;
@@ -294,7 +294,7 @@
             // 
             this.pa_code.ErrorMsg = null;
             this.pa_code.Location = new System.Drawing.Point(144, 68);
-            this.pa_code.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.pa_code.Margin = new System.Windows.Forms.Padding(5);
             this.pa_code.Name = "pa_code";
             this.pa_code.Pr_id = null;
             this.pa_code.Size = new System.Drawing.Size(199, 26);
@@ -303,7 +303,7 @@
             // PrintList
             // 
             this.PrintList.Location = new System.Drawing.Point(144, 186);
-            this.PrintList.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.PrintList.Margin = new System.Windows.Forms.Padding(5);
             this.PrintList.Name = "PrintList";
             this.PrintList.Size = new System.Drawing.Size(200, 31);
             this.PrintList.TabIndex = 158;
@@ -314,7 +314,7 @@
             this.PrintNum.BackColor = System.Drawing.Color.White;
             this.PrintNum.ID = null;
             this.PrintNum.Location = new System.Drawing.Point(1105, 186);
-            this.PrintNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PrintNum.Margin = new System.Windows.Forms.Padding(4);
             this.PrintNum.Name = "PrintNum";
             this.PrintNum.Negative = false;
             this.PrintNum.Power = null;
@@ -328,7 +328,7 @@
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.OperateResult.Location = new System.Drawing.Point(1036, 268);
-            this.OperateResult.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(291, 429);
             this.OperateResult.TabIndex = 155;
@@ -343,7 +343,7 @@
             this.ma_code.DBTitle = "工单查询";
             this.ma_code.FormName = null;
             this.ma_code.Location = new System.Drawing.Point(468, 68);
-            this.ma_code.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(4);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
@@ -363,7 +363,7 @@
             this.Printing.Image = ((System.Drawing.Image)(resources.GetObject("Printing.Image")));
             this.Printing.IsShowBorder = true;
             this.Printing.Location = new System.Drawing.Point(1183, 186);
-            this.Printing.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Printing.Margin = new System.Windows.Forms.Padding(4);
             this.Printing.MoveImage = ((System.Drawing.Image)(resources.GetObject("Printing.MoveImage")));
             this.Printing.Name = "Printing";
             this.Printing.NormalImage = ((System.Drawing.Image)(resources.GetObject("Printing.NormalImage")));
@@ -383,7 +383,7 @@
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
             this.Clean.Location = new System.Drawing.Point(1141, 714);
-            this.Clean.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Clean.Margin = new System.Windows.Forms.Padding(4);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
@@ -401,7 +401,7 @@
             this.pa_packageqty.Enabled = false;
             this.pa_packageqty.ID = null;
             this.pa_packageqty.Location = new System.Drawing.Point(468, 128);
-            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_packageqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_packageqty.Name = "pa_packageqty";
             this.pa_packageqty.Power = null;
             this.pa_packageqty.Size = new System.Drawing.Size(199, 25);
@@ -419,7 +419,7 @@
             this.ma_prodcode.Enabled = false;
             this.ma_prodcode.ID = null;
             this.ma_prodcode.Location = new System.Drawing.Point(817, 69);
-            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Power = null;
             this.ma_prodcode.Size = new System.Drawing.Size(199, 25);
@@ -436,7 +436,7 @@
             this.pa_totalqty.BackColor = System.Drawing.Color.White;
             this.pa_totalqty.ID = null;
             this.pa_totalqty.Location = new System.Drawing.Point(469, 186);
-            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_totalqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_totalqty.Name = "pa_totalqty";
             this.pa_totalqty.Power = null;
             this.pa_totalqty.Size = new System.Drawing.Size(199, 25);
@@ -453,7 +453,7 @@
             this.ma_prodname.Enabled = false;
             this.ma_prodname.ID = null;
             this.ma_prodname.Location = new System.Drawing.Point(144, 128);
-            this.ma_prodname.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ma_prodname.Margin = new System.Windows.Forms.Padding(4);
             this.ma_prodname.Name = "ma_prodname";
             this.ma_prodname.Power = null;
             this.ma_prodname.Size = new System.Drawing.Size(199, 25);
@@ -470,7 +470,7 @@
             this.pa_restqty.Enabled = false;
             this.pa_restqty.ID = null;
             this.pa_restqty.Location = new System.Drawing.Point(815, 128);
-            this.pa_restqty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pa_restqty.Margin = new System.Windows.Forms.Padding(4);
             this.pa_restqty.Name = "pa_restqty";
             this.pa_restqty.Power = null;
             this.pa_restqty.Size = new System.Drawing.Size(199, 25);
@@ -486,7 +486,7 @@
             this.barcode.BackColor = System.Drawing.Color.White;
             this.barcode.ID = null;
             this.barcode.Location = new System.Drawing.Point(117, 715);
-            this.barcode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.barcode.Margin = new System.Windows.Forms.Padding(4);
             this.barcode.Name = "barcode";
             this.barcode.Power = "ifwrite";
             this.barcode.Size = new System.Drawing.Size(260, 25);
@@ -510,7 +510,7 @@
             this.pa_indate,
             this.pd_id});
             this.PackageDetail.Location = new System.Drawing.Point(31, 268);
-            this.PackageDetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.PackageDetail.Margin = new System.Windows.Forms.Padding(4);
             this.PackageDetail.Name = "PackageDetail";
             this.PackageDetail.ReadOnly = true;
             this.PackageDetail.RowTemplate.Height = 23;
@@ -599,7 +599,7 @@
             this.Controls.Add(this.pr_detail_label);
             this.Controls.Add(this.ma_code_label);
             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 = "Make_PackageCollection";
             this.Tag = "Make!PackageCollection";
             this.Text = "包装采集";

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

@@ -103,7 +103,7 @@
             // 
             this.bc_remark_label.AutoSize = true;
             this.bc_remark_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_remark_label.Location = new System.Drawing.Point(447, 239);
+            this.bc_remark_label.Location = new System.Drawing.Point(447, 214);
             this.bc_remark_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_remark_label.Name = "bc_remark_label";
             this.bc_remark_label.Size = new System.Drawing.Size(92, 27);
@@ -114,7 +114,7 @@
             // 
             this.ms_sncode_label.AutoSize = true;
             this.ms_sncode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_sncode_label.Location = new System.Drawing.Point(308, 686);
+            this.ms_sncode_label.Location = new System.Drawing.Point(308, 661);
             this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
             this.ms_sncode_label.Size = new System.Drawing.Size(72, 27);
@@ -125,7 +125,7 @@
             // 
             this.bc_groupcode_label.AutoSize = true;
             this.bc_groupcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.bc_groupcode_label.Location = new System.Drawing.Point(27, 236);
+            this.bc_groupcode_label.Location = new System.Drawing.Point(27, 211);
             this.bc_groupcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.bc_groupcode_label.Name = "bc_groupcode_label";
             this.bc_groupcode_label.Size = new System.Drawing.Size(92, 27);
@@ -136,7 +136,7 @@
             // 
             this.mc_restqty_label.AutoSize = true;
             this.mc_restqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mc_restqty_label.Location = new System.Drawing.Point(743, 126);
+            this.mc_restqty_label.Location = new System.Drawing.Point(785, 109);
             this.mc_restqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mc_restqty_label.Name = "mc_restqty_label";
             this.mc_restqty_label.Size = new System.Drawing.Size(92, 27);
@@ -147,7 +147,7 @@
             // 
             this.mcd_inqty_label.AutoSize = true;
             this.mcd_inqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty_label.Location = new System.Drawing.Point(409, 126);
+            this.mcd_inqty_label.Location = new System.Drawing.Point(451, 109);
             this.mcd_inqty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty_label.Name = "mcd_inqty_label";
             this.mcd_inqty_label.Size = new System.Drawing.Size(92, 27);
@@ -158,7 +158,7 @@
             // 
             this.ma_qty_label.AutoSize = true;
             this.ma_qty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty_label.Location = new System.Drawing.Point(26, 126);
+            this.ma_qty_label.Location = new System.Drawing.Point(26, 109);
             this.ma_qty_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty_label.Name = "ma_qty_label";
             this.ma_qty_label.Size = new System.Drawing.Size(92, 27);
@@ -169,7 +169,7 @@
             // 
             this.ma_prodcode_label.AutoSize = true;
             this.ma_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode_label.Location = new System.Drawing.Point(412, 76);
+            this.ma_prodcode_label.Location = new System.Drawing.Point(454, 59);
             this.ma_prodcode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode_label.Name = "ma_prodcode_label";
             this.ma_prodcode_label.Size = new System.Drawing.Size(92, 27);
@@ -180,7 +180,7 @@
             // 
             this.pr_detail_label.AutoSize = true;
             this.pr_detail_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail_label.Location = new System.Drawing.Point(743, 76);
+            this.pr_detail_label.Location = new System.Drawing.Point(785, 59);
             this.pr_detail_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail_label.Name = "pr_detail_label";
             this.pr_detail_label.Size = new System.Drawing.Size(92, 27);
@@ -191,7 +191,7 @@
             // 
             this.ms_makecode_label.AutoSize = true;
             this.ms_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ms_makecode_label.Location = new System.Drawing.Point(26, 76);
+            this.ms_makecode_label.Location = new System.Drawing.Point(26, 59);
             this.ms_makecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ms_makecode_label.Name = "ms_makecode_label";
             this.ms_makecode_label.Size = new System.Drawing.Size(92, 27);
@@ -203,7 +203,7 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.label2.ForeColor = System.Drawing.Color.Blue;
-            this.label2.Location = new System.Drawing.Point(26, 187);
+            this.label2.Location = new System.Drawing.Point(26, 162);
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 27);
@@ -214,7 +214,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(27, 286);
+            this.label3.Location = new System.Drawing.Point(27, 261);
             this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 27);
@@ -226,7 +226,7 @@
             this.GoodProduct.AutoSize = true;
             this.GoodProduct.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.GoodProduct.ForeColor = System.Drawing.Color.Blue;
-            this.GoodProduct.Location = new System.Drawing.Point(31, 680);
+            this.GoodProduct.Location = new System.Drawing.Point(31, 655);
             this.GoodProduct.Margin = new System.Windows.Forms.Padding(4);
             this.GoodProduct.Name = "GoodProduct";
             this.GoodProduct.Size = new System.Drawing.Size(83, 35);
@@ -240,7 +240,7 @@
             this.Reject.AutoSize = true;
             this.Reject.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Reject.ForeColor = System.Drawing.Color.Red;
-            this.Reject.Location = new System.Drawing.Point(141, 680);
+            this.Reject.Location = new System.Drawing.Point(141, 655);
             this.Reject.Margin = new System.Windows.Forms.Padding(4);
             this.Reject.Name = "Reject";
             this.Reject.Size = new System.Drawing.Size(107, 35);
@@ -256,7 +256,7 @@
             this.columnHeader5,
             this.columnHeader1,
             this.columnHeader2});
-            this.WaitRejectList.Location = new System.Drawing.Point(29, 362);
+            this.WaitRejectList.Location = new System.Drawing.Point(29, 337);
             this.WaitRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.WaitRejectList.Name = "WaitRejectList";
             this.WaitRejectList.Size = new System.Drawing.Size(393, 304);
@@ -284,7 +284,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(27, 331);
+            this.label4.Location = new System.Drawing.Point(27, 306);
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 27);
@@ -295,7 +295,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(542, 331);
+            this.label5.Location = new System.Drawing.Point(542, 306);
             this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(92, 27);
@@ -306,7 +306,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(946, 240);
+            this.label6.Location = new System.Drawing.Point(946, 215);
             this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(92, 27);
@@ -321,7 +321,7 @@
             this.columnHeader3,
             this.columnHeader7,
             this.columnHeader8});
-            this.ChoosedRejectList.Location = new System.Drawing.Point(544, 362);
+            this.ChoosedRejectList.Location = new System.Drawing.Point(544, 337);
             this.ChoosedRejectList.Margin = new System.Windows.Forms.Padding(4);
             this.ChoosedRejectList.Name = "ChoosedRejectList";
             this.ChoosedRejectList.Size = new System.Drawing.Size(393, 304);
@@ -356,7 +356,7 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label7.Location = new System.Drawing.Point(248, 336);
+            this.label7.Location = new System.Drawing.Point(248, 311);
             this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(174, 20);
@@ -370,7 +370,7 @@
             this.ma_code.Condition = null;
             this.ma_code.DBTitle = null;
             this.ma_code.FormName = null;
-            this.ma_code.Location = new System.Drawing.Point(175, 76);
+            this.ma_code.Location = new System.Drawing.Point(159, 59);
             this.ma_code.Name = "ma_code";
             this.ma_code.Power = null;
             this.ma_code.SelectField = null;
@@ -385,11 +385,11 @@
             // 
             this.LockMakeCode.AutoSize = true;
             this.LockMakeCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LockMakeCode.Location = new System.Drawing.Point(175, 46);
+            this.LockMakeCode.Location = new System.Drawing.Point(378, 62);
             this.LockMakeCode.Name = "LockMakeCode";
-            this.LockMakeCode.Size = new System.Drawing.Size(91, 24);
+            this.LockMakeCode.Size = new System.Drawing.Size(61, 24);
             this.LockMakeCode.TabIndex = 66;
-            this.LockMakeCode.Text = "锁定工单";
+            this.LockMakeCode.Text = "锁定";
             this.LockMakeCode.UseVisualStyleBackColor = true;
             // 
             // Save
@@ -399,7 +399,7 @@
             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(684, 684);
+            this.Save.Location = new System.Drawing.Point(684, 659);
             this.Save.Margin = new System.Windows.Forms.Padding(4);
             this.Save.MoveImage = ((System.Drawing.Image)(resources.GetObject("Save.MoveImage")));
             this.Save.Name = "Save";
@@ -415,7 +415,7 @@
             // 
             this.mcd_remainqty.AutoSize = true;
             this.mcd_remainqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_remainqty.Location = new System.Drawing.Point(907, 126);
+            this.mcd_remainqty.Location = new System.Drawing.Point(920, 109);
             this.mcd_remainqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_remainqty.Name = "mcd_remainqty";
             this.mcd_remainqty.Size = new System.Drawing.Size(0, 27);
@@ -426,7 +426,7 @@
             // 
             this.pr_detail.AutoSize = true;
             this.pr_detail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pr_detail.Location = new System.Drawing.Point(907, 76);
+            this.pr_detail.Location = new System.Drawing.Point(920, 59);
             this.pr_detail.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Size = new System.Drawing.Size(0, 27);
@@ -436,7 +436,7 @@
             // 
             this.ma_qty.AutoSize = true;
             this.ma_qty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_qty.Location = new System.Drawing.Point(175, 126);
+            this.ma_qty.Location = new System.Drawing.Point(159, 109);
             this.ma_qty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_qty.Name = "ma_qty";
             this.ma_qty.Size = new System.Drawing.Size(0, 27);
@@ -446,7 +446,7 @@
             // 
             this.mcd_inqty.AutoSize = true;
             this.mcd_inqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.mcd_inqty.Location = new System.Drawing.Point(564, 126);
+            this.mcd_inqty.Location = new System.Drawing.Point(594, 109);
             this.mcd_inqty.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.mcd_inqty.Name = "mcd_inqty";
             this.mcd_inqty.Size = new System.Drawing.Size(0, 27);
@@ -457,7 +457,7 @@
             // 
             this.ma_prodcode.AutoSize = true;
             this.ma_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_prodcode.Location = new System.Drawing.Point(564, 76);
+            this.ma_prodcode.Location = new System.Drawing.Point(594, 59);
             this.ma_prodcode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.ma_prodcode.Name = "ma_prodcode";
             this.ma_prodcode.Size = new System.Drawing.Size(0, 27);
@@ -466,7 +466,7 @@
             // OperateResult
             // 
             this.OperateResult.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OperateResult.Location = new System.Drawing.Point(951, 284);
+            this.OperateResult.Location = new System.Drawing.Point(951, 259);
             this.OperateResult.Margin = new System.Windows.Forms.Padding(4);
             this.OperateResult.Name = "OperateResult";
             this.OperateResult.Size = new System.Drawing.Size(275, 382);
@@ -480,7 +480,7 @@
             this.CleanInfo.DownImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.DownImage")));
             this.CleanInfo.Image = ((System.Drawing.Image)(resources.GetObject("CleanInfo.Image")));
             this.CleanInfo.IsShowBorder = true;
-            this.CleanInfo.Location = new System.Drawing.Point(1046, 681);
+            this.CleanInfo.Location = new System.Drawing.Point(1046, 656);
             this.CleanInfo.Margin = new System.Windows.Forms.Padding(4);
             this.CleanInfo.MoveImage = ((System.Drawing.Image)(resources.GetObject("CleanInfo.MoveImage")));
             this.CleanInfo.Name = "CleanInfo";
@@ -495,7 +495,7 @@
             // ChooseedReject
             // 
             this.ChooseedReject.Image = ((System.Drawing.Image)(resources.GetObject("ChooseedReject.Image")));
-            this.ChooseedReject.Location = new System.Drawing.Point(452, 571);
+            this.ChooseedReject.Location = new System.Drawing.Point(452, 546);
             this.ChooseedReject.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseedReject.Name = "ChooseedReject";
             this.ChooseedReject.Size = new System.Drawing.Size(67, 29);
@@ -506,7 +506,7 @@
             // WaitReject
             // 
             this.WaitReject.Image = ((System.Drawing.Image)(resources.GetObject("WaitReject.Image")));
-            this.WaitReject.Location = new System.Drawing.Point(452, 491);
+            this.WaitReject.Location = new System.Drawing.Point(452, 466);
             this.WaitReject.Margin = new System.Windows.Forms.Padding(4);
             this.WaitReject.Name = "WaitReject";
             this.WaitReject.Size = new System.Drawing.Size(67, 29);
@@ -519,7 +519,7 @@
             this.bc_remark.AllPower = null;
             this.bc_remark.BackColor = System.Drawing.Color.White;
             this.bc_remark.ID = null;
-            this.bc_remark.Location = new System.Drawing.Point(547, 237);
+            this.bc_remark.Location = new System.Drawing.Point(547, 212);
             this.bc_remark.Margin = new System.Windows.Forms.Padding(4);
             this.bc_remark.Multiline = true;
             this.bc_remark.Name = "bc_remark";
@@ -534,7 +534,7 @@
             // 
             this.bc_groupcode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.bc_groupcode.FormattingEnabled = true;
-            this.bc_groupcode.Location = new System.Drawing.Point(164, 240);
+            this.bc_groupcode.Location = new System.Drawing.Point(159, 215);
             this.bc_groupcode.Margin = new System.Windows.Forms.Padding(4);
             this.bc_groupcode.Name = "bc_groupcode";
             this.bc_groupcode.Size = new System.Drawing.Size(251, 26);
@@ -547,7 +547,7 @@
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.Font = new System.Drawing.Font("宋体", 10.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(423, 686);
+            this.ms_sncode.Location = new System.Drawing.Point(423, 661);
             this.ms_sncode.Margin = new System.Windows.Forms.Padding(4);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = null;
@@ -564,7 +564,7 @@
             this.bc_code.AllPower = null;
             this.bc_code.BackColor = System.Drawing.Color.White;
             this.bc_code.ID = null;
-            this.bc_code.Location = new System.Drawing.Point(164, 286);
+            this.bc_code.Location = new System.Drawing.Point(159, 261);
             this.bc_code.Name = "bc_code";
             this.bc_code.Power = null;
             this.bc_code.Size = new System.Drawing.Size(251, 25);
@@ -579,7 +579,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.ClientSize = new System.Drawing.Size(1230, 740);
+            this.ClientSize = new System.Drawing.Size(1230, 710);
             this.Controls.Add(this.bc_code);
             this.Controls.Add(this.ma_code);
             this.Controls.Add(this.LockMakeCode);

UAS-MES/Main.Designer.cs

@@ -85,6 +85,7 @@
             // 
             // name_label
             // 
+            this.name_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.name_label.AutoSize = true;
             this.name_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.name_label.Location = new System.Drawing.Point(8, 4);
@@ -115,9 +116,10 @@
             // 
             // inf_currentstep
             // 
+            this.inf_currentstep.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_currentstep.AutoSize = true;
             this.inf_currentstep.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_currentstep.Location = new System.Drawing.Point(348, 6);
+            this.inf_currentstep.Location = new System.Drawing.Point(308, 6);
             this.inf_currentstep.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_currentstep.Name = "inf_currentstep";
             this.inf_currentstep.Size = new System.Drawing.Size(0, 24);
@@ -125,9 +127,10 @@
             // 
             // step_label
             // 
+            this.step_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.step_label.AutoSize = true;
             this.step_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.step_label.Location = new System.Drawing.Point(240, 6);
+            this.step_label.Location = new System.Drawing.Point(200, 6);
             this.step_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.step_label.Name = "step_label";
             this.step_label.Size = new System.Drawing.Size(86, 24);
@@ -136,6 +139,7 @@
             // 
             // inf_name
             // 
+            this.inf_name.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_name.AutoSize = true;
             this.inf_name.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.inf_name.Location = new System.Drawing.Point(85, 4);
@@ -146,9 +150,10 @@
             // 
             // Inf_linecode
             // 
+            this.Inf_linecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode.AutoSize = true;
             this.Inf_linecode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode.Location = new System.Drawing.Point(601, 5);
+            this.Inf_linecode.Location = new System.Drawing.Point(561, 5);
             this.Inf_linecode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode.Name = "Inf_linecode";
             this.Inf_linecode.Size = new System.Drawing.Size(0, 24);
@@ -156,9 +161,10 @@
             // 
             // inf_source
             // 
+            this.inf_source.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_source.AutoSize = true;
             this.inf_source.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_source.Location = new System.Drawing.Point(836, 5);
+            this.inf_source.Location = new System.Drawing.Point(796, 5);
             this.inf_source.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_source.Name = "inf_source";
             this.inf_source.Size = new System.Drawing.Size(0, 24);
@@ -166,9 +172,10 @@
             // 
             // inf_db
             // 
+            this.inf_db.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.inf_db.AutoSize = true;
             this.inf_db.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.inf_db.Location = new System.Drawing.Point(1099, 5);
+            this.inf_db.Location = new System.Drawing.Point(1090, 5);
             this.inf_db.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.inf_db.Name = "inf_db";
             this.inf_db.Size = new System.Drawing.Size(0, 24);
@@ -176,9 +183,10 @@
             // 
             // Inf_linecode_label
             // 
+            this.Inf_linecode_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_linecode_label.AutoSize = true;
             this.Inf_linecode_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_linecode_label.Location = new System.Drawing.Point(520, 5);
+            this.Inf_linecode_label.Location = new System.Drawing.Point(480, 5);
             this.Inf_linecode_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_linecode_label.Name = "Inf_linecode_label";
             this.Inf_linecode_label.Size = new System.Drawing.Size(50, 24);
@@ -187,9 +195,10 @@
             // 
             // db_label
             // 
+            this.db_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.db_label.AutoSize = true;
             this.db_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.db_label.Location = new System.Drawing.Point(1004, 5);
+            this.db_label.Location = new System.Drawing.Point(995, 5);
             this.db_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.db_label.Name = "db_label";
             this.db_label.Size = new System.Drawing.Size(68, 24);
@@ -198,9 +207,10 @@
             // 
             // Inf_source_label
             // 
+            this.Inf_source_label.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Inf_source_label.AutoSize = true;
             this.Inf_source_label.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Inf_source_label.Location = new System.Drawing.Point(756, 5);
+            this.Inf_source_label.Location = new System.Drawing.Point(716, 5);
             this.Inf_source_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.Inf_source_label.Name = "Inf_source_label";
             this.Inf_source_label.Size = new System.Drawing.Size(50, 24);

UAS-MES/代码备份/上料采集.txt

@@ -1,556 +0,0 @@
-using System;
-using System.Data;
-using System.Text;
-using System.Windows.Forms;
-using 优软MES.CustomControl.TextBoxWithIcon;
-using 优软MES.DataOperate;
-using 优软MES.Entity;
-using 优软MES.PublicMethod;
-using System.Drawing;
-
-namespace 优软MES.产线作业
-{
-    public partial class 上料采集 : Form
-    {
-        //MakeSerial表主键
-        string ms_id;
-        //制造单号                                                                             
-        string make_code;
-        //产品编号
-        string make_prodcode;
-        //工序编号
-        string stepcode;
-        //完工状态
-        string ms_status;
-        //流程码
-        string ms_code;
-        //工序名称
-        string stepname;
-        //工艺路线编号
-        string ms_craftcode;
-        //管控类型
-
-        string ErrorMessage;
-
-        //用于提醒的序列A
-        string[] RemainListA;
-        //用于提醒的序列B
-        string[] RemainListB = new string[0];
-        //提醒序列的索引
-        int RemainIndex = 0;
-
-        DataHelper dh;
-        StringBuilder sql = new StringBuilder();
-
-        DataTable dt;
-        //保存ListB中的数据
-        DataTable dt1;
-
-        AutoSizeFormClass asc = new AutoSizeFormClass();
-        public 上料采集()
-        {
-            InitializeComponent();
-        }
-
-        private void 上料采集_Load(object sender, EventArgs e)
-        {
-            dh = new DataHelper();
-            code.Focus();
-            asc.controllInitializeSize(this);
-        }
-
-        private void 上料采集_SizeChanged(object sender, EventArgs e)
-        {
-            asc.controlAutoSize(this);
-        }
-
-        private void Clean_Click(object sender, EventArgs e)
-        {
-            OperateResult.Clear();
-        }
-
-        private void Confirm_Click(object sender, EventArgs e)
-        {
-            //模拟键盘事件
-            KeyEventArgs e2 = new KeyEventArgs(Keys.Enter);
-            code_KeyDown(sender, e2);
-        }
-
-        private void code_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.KeyCode == Keys.Enter)
-            {
-                //勾选的是上料的步骤
-                if (Loading.Checked)
-                {
-                    //如果录入框和工单号均有输入
-                    if (code.Text != "" && ms_makecode.Text != "" && sn_code.Text == "")
-                    {
-                        //将录入框的值给序列号
-                        sn_code.Text = code.Text;
-                        sql.Append("select ms_makecode,ms_prodcode,pr_detail,ma_qty,mcd_inqty,ma_qty-mcd_inqty mcd_restqty ");
-                        sql.Append("from makeserial left join product on ms_prodcode=pr_code left join make on ms_makecode=ma_code ");
-                        sql.Append("left join makecraftdetail on mcd_macode=ms_makecode where ms_sncode='" + sn_code.Text + "'");
-                        dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                        BaseUtil.SetFormValue(this.Controls, dt);
-                        sql.Clear();
-                        //如果当前工序是第一道工序
-                        bool FirstStage = LogicHandler.CheckIfFirstMakeSerial(code.Text, ms_makecode.Text, User.UserSourceCode);
-                        #region
-                        if (FirstStage)
-                        {
-                            //根据序列号查出ma_code,ma_prodcode,stepcode
-                            dt = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_craftcode,ms_status,ms_nextstepcode,ms_prodcode,ms_code from makeserial where ms_sncode='" + code.Text + "'", "select");
-                            if (dt.Rows.Count > 0)
-                            {
-                                ms_id = dt.Rows[0]["ms_id"].ToString();
-                                make_code = dt.Rows[0]["ms_makecode"].ToString();
-                                ms_craftcode = dt.Rows[0]["ms_craftcode"].ToString();
-                                make_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
-                                stepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
-                                ms_status = dt.Rows[0]["ms_status"].ToString();
-                                ms_code = dt.Rows[0]["ms_code"].ToString();
-                            }
-                            //勾选了前一工单
-                            if (iflastsn.Checked)
-                            {
-                                //判断序列号的前一工单是否已经完工
-                                if (dt.Rows[0]["ms_makecode"].ToString() != ms_makecode.Text && dt.Rows[0]["ms_status"].ToString() == "2")
-                                {
-                                    sql.Append("Insert into MakeSerial (ms_id, ms_code, ms_sncode ,ms_prodcode, ms_indate,ms_lastmacode,");
-                                    sql.Append("ms_wccode,ms_craftcode,ms_craftname,ms_nextstepcode,ms_status,ms_makecode) select MAKESERIAL_SEQ.NEXTVAL,");
-                                    sql.Append("'" + sn_code.Text + "','" + sn_code.Text + "',ma_prodcode,sysdate,'lastcode',ma_wccode,ma_craftcode,ma_craftname,mcd_nextstepcode,0,ma_code ");
-                                    sql.Append("from make left join makecraftdetail on ma_code =mcd_macode where ma_code='" + make_code + "'");
-                                    dh.ExecuteSql(sql.ToString(), "insert");
-                                    sql.Clear();
-                                    //查询 stepproduct 中是否有采集类型为其他序列号, 并且物料号等于ms_prodcode
-                                    dt = (DataTable)dh.ExecuteSql("select * from stepproduct where sp_mothercode='" + make_prodcode + "' and sp_stepcode='" + stepcode + "' and sp_soncode='" + make_prodcode + "'", "select");
-                                    string sp_id = dt.Rows[0]["sp_id"].ToString();
-                                    if (dt.Rows.Count > 0)
-                                    {
-                                        sql.Append("insert into Craftmaterial (cm_id, cm_makecode,cm_maid,cm_maprodcode,");
-                                        sql.Append("cm_soncode,cm_mscode,cm_sncode,cm_stepcode,cm_stepname,cm_craftcode,cm_craftname,");
-                                        sql.Append("cm_barcode,cm_inqty,cm_indate,cm_inman,cm_linecode,cm_wccode,cm_sourcecode,cm_spid) ");
-                                        sql.Append("select Craftmaterial_seq.nextval, ma_code, ma_id, ma_prodcode, sp_soncode,");
-                                        sql.Append("'" + code.Text + "','" + code.Text + "',mcd_stepcode,mcd_stepname,ma_craftcode");
-                                        sql.Append(",ma_craftname,'" + code.Text + "',1,sysdate,'" + User.UserName + "',ma_linecode,ma_wccode,");
-                                        sql.Append("'资源编号','" + sp_id + "' from make left join makecraftdetail on mcd_macode=ma_code");
-                                        sql.Append(" left join stepproduct on sp_stepcode=mcd_stepcode  where ma_code = '" + make_code + "'and ");
-                                        sql.Append("sp_id = " + sp_id + " and mcd_stepcode='" + stepcode + "'");
-                                        dh.ExecuteSql(sql.ToString(), "insert");
-                                        sql.Clear();
-                                        if (make_code == ms_makecode.Text && stepcode == "")
-                                        {
-                                            code.Text = "";
-                                            OperateResult.AppendText(">>获取序列号成功\n");
-                                        }
-                                        else
-                                        {
-                                            OperateResult.AppendText(">>序列号无前段工单\n");
-                                        }
-                                    }
-                                }
-                                else if (make_code == ms_makecode.Text && stepcode == User.CurrentStep)
-                                {
-                                    code.Text = "";
-                                    OperateResult.AppendText(">>获取序列号成功\n");
-                                }
-                            }
-                            //未勾选上一工序
-                            else
-                            {
-                                dt = (DataTable)dh.ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_sncode='" + sn_code.Text + "' and ms_makecode='" + ms_makecode.Text + "'", "select");
-                                if (dt.Rows.Count == 0)
-                                {
-                                    sql.Append("Insert into MakeSerial (ms_id, ms_code, ms_sncode ,ms_prodcode, ms_indate,");
-                                    sql.Append("ms_wccode,ms_craftcode,ms_craftname,ms_nextstepcode,ms_status,ms_makecode) select MAKESERIAL_SEQ.NEXTVAL,");
-                                    sql.Append("'" + sn_code.Text + "','" + sn_code.Text + "',ma_prodcode,sysdate,ma_wccode,ma_craftcode,ma_craftname,mcd_nextstepcode,0,ma_code ");
-                                    sql.Append("from make left join makecraftdetail on ma_code =mcd_macode where ma_code='" + ms_makecode.Text + "'");
-                                    dh.ExecuteSql(sql.ToString(), "insert");
-                                    sql.Clear();
-                                }
-                                else
-                                {
-                                    stepcode = dt.Rows[0]["ms_stepcode"].ToString();
-                                    ms_status = dt.Rows[0]["ms_status"].ToString();
-                                }
-                                if (ms_status == "0" || (stepcode == User.CurrentStep && ms_status == "1"))
-                                {
-                                    code.Text = "";
-                                    OperateResult.AppendText(">>获取序列号成功\n");
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>序列号错误\n");
-                                }
-                            }
-                        }
-                        #endregion
-                        //不是第一道工序
-                        else
-                        {
-                            if (dh.CheckExist("makeserial", "ms_sncode='" + sn_code.Text + "' and ms_status=1 and ms_nextstepcode='" + User.CurrentStep + "'"))
-                            {
-                                OperateResult.AppendText(">>获取序列号成功\n");
-                                code.Text = "";
-                            }
-                            else
-                            {
-                                OperateResult.AppendText(">>序列号错误\n");
-                            }
-                        }
-                    }
-                    //输入了输入框的值没有输入工单号
-                    else if (code.Text != "" && ms_makecode.Text == "" && sn_code.Text == "")
-                    {
-                        //将录入框的值给序列号
-                        dt = (DataTable)dh.ExecuteSql("select ms_status,ms_nextstepcode,ms_prodcode,ms_makecode,ms_code,ms_stepname from makeserial where ms_sncode='" + code.Text + "'", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            make_code = dt.Rows[0]["ms_makecode"].ToString();
-                            make_prodcode = dt.Rows[0]["ms_prodcode"].ToString();
-                            stepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
-                            ms_code = dt.Rows[0]["ms_code"].ToString();
-                            ms_status = dt.Rows[0]["ms_status"].ToString();
-                            stepname = dt.Rows[0]["ms_stepname"].ToString();
-                            //ms_status==1表示正在生产中，ms_status==2表示已完工
-                            //并且当前的执行步骤和用户的岗位工序一致
-                            if (ms_status == "1" && stepcode == User.CurrentStep)
-                            {
-                                sql.Clear();
-                                sql.Append("select sp_id,sp_description,sp_soncode,pr_detail,pr_spec,sp_repcode,pr_id,sp_type,'未采集' sp_ifpick,");
-                                sql.Append("sp_prefix,sp_length,sp_regex,sp_regex,sp_ifforsn  from stepproduct left join product on pr_code=sp_soncode where ");
-                                sql.Append("sp_stepcode='" + stepcode + "'  And sp_mothercode='" + make_prodcode + "' and sp_type='物料' and pr_tracekind=2 order by SP_DETNO asc");
-                                dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                                //单独用一个DataTable存储一个
-                                dt1 = new DataTable();
-                                sql.Clear();
-                                sql.Append("select sp_id,sp_prefix,sp_ifforsn,sp_length,sp_description,sp_soncode,pr_tracekind,pr_detail,pr_spec,sp_repcode,pr_id,");
-                                sql.Append("sp_type,case when (sp_type='物料' and sp_soncode=pr_code) then '已采集' else '未采集' end sp_ifpick ,sp_prefix,");
-                                sql.Append("sp_length,sp_regex,sp_regex,sp_ifforsn from stepproduct left join product on pr_code=sp_soncode where ");
-                                sql.Append("sp_craftcode='" + ms_craftcode + "' and sp_stepcode='" + stepcode + "' And sp_mothercode ='" + make_prodcode + "' and((sp_type = '物料' and pr_tracekind <> 2)or sp_type <> '物料') order by SP_DETNO asc");
-                                dt1 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                                sql.Clear();
-                                sn_code.Text = code.Text;
-                                code.Clear();
-                                //用于记录提醒的数据长度
-                                RemainListA = new string[dt.Rows.Count];
-                                RemainListB = new string[dt1.Rows.Count];
-                                //for (int i = 0; i < dt.Rows.Count; i++)
-                                //{
-                                //    //设置需要输入的内容的标签文字
-                                //    this.Controls["sp_soncode" + i + "_label"].Visible = true;
-                                //    this.Controls["sp_soncode" + i + "_label"].Text = dt.Rows[i]["pr_detail"].ToString();
-                                //    //强制转换成EnterTextBox，因为自定义了参数
-                                //    EnterTextBox enterbox = (EnterTextBox)this.Controls["sp_soncode" + i];
-                                //    enterbox.KeyDown += Save_BatchCode;
-                                //    //用额外定义的Str来传递参数
-                                //    enterbox.ID = dt.Rows[i]["sp_id"].ToString();
-                                //    enterbox.Str = dt.Rows[i]["sp_soncode"].ToString();
-                                //    enterbox.Str1 = dt.Rows[i]["sp_repcode"].ToString();
-                                //    //记录输入框对应的标签
-                                //    enterbox.Str2 = "sp_soncode" + i + "_label";
-                                //    //设置TextBox可见
-                                //    enterbox.Visible = true;
-                                //    RemainListA[i] = dt.Rows[i]["sp_soncode"].ToString();
-                                //}
-                                for (int i = 0; i < dt1.Rows.Count; i++)
-                                {
-                                    RemainListB[i] = dt1.Rows[i]["sp_soncode"].ToString();
-                                }
-                                //如果A序列存在提醒的内容直接提醒第一个
-                                if (dt.Rows.Count > 0)
-                                {
-                                    OperateResult.AppendText("<<请采集批次物料" + dt.Rows[0]["sp_soncode"].ToString() + "的条码\n");
-                                    RemainIndex = RemainIndex + 1;
-                                }
-                                //A序列不存在需要提醒的内容则直接判断B的
-                                else if (dt1.Rows.Count > 0)
-                                {
-                                    OperateResult.AppendText("<<请采集" + dt1.Rows[0]["sp_soncode"].ToString() + "的物料条码（MAC\\ BT\\ IMEI1\\IMEI2 数据）\n");
-                                }
-                            }
-                            else {
-                                OperateResult.AppendText(">>当前工单不在线或者岗位资源不对应\n");
-                            }
-                        }
-                        else
-                        {
-                            OperateResult.AppendText(">>用户序列号错误，未进行上一工序的采集\n");
-                        }
-                    }
-                    //序列号不为空的时候
-                    else if (sn_code.Text != null)
-                    {
-                        //索引超出长度表示内容均已提醒
-                        if (RemainIndex >= RemainListB.Length)
-                        {
-                            OperateResult.AppendText(">>该序列号没有需要采集的内容\n");
-                            return;
-                        }
-                        string sp_soncode = dt1.Rows[RemainIndex]["sp_soncode"].ToString();
-                        string sp_prefix = dt1.Rows[RemainIndex]["sp_prefix"].ToString();
-                        string length = dt1.Rows[RemainIndex]["sp_length"].ToString();
-                        string sp_id = dt1.Rows[RemainIndex]["sp_id"].ToString();
-                        string sp_ifforsn = dt1.Rows[RemainIndex]["sp_ifforsn"].ToString();
-                        string pr_tracekind = dt1.Rows[RemainIndex]["pr_tracekind"].ToString();
-                        int sp_length = int.Parse(length != "" ? length : "0");
-                        if (dt1.Rows[RemainIndex]["sp_type"].ToString() == "物料")
-                        {
-                            //序列号用作条码
-                            if (sp_ifforsn != "0")
-                            {
-                                dt = (DataTable)dh.ExecuteSql("select count(1) from makeserial where ms_sncode='" + code.Text + "' and ms_status=2 and ms_prodcode='" + sp_soncode + "'", "select");
-                                if (dt.Rows.Count > 0)
-                                {
-                                    if (dh.getRowCount("craftmaterial", "cm_sncode='" + sn_code.Text + "' and cm_barcode='" + code.Text + "' and cm_soncode='" + sp_soncode + "'") > 0)
-                                    {
-                                        OperateResult.AppendText(">>条码已采集过\n", Color.Red);
-                                    }
-                                    else
-                                    {
-                                        Save_OtherCode(sp_soncode, make_code, sn_code.Text, sp_id);
-                                    }
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>序列号不存在\n", Color.Red);
-                                }
-                            }
-                            //单件管控物料
-                            else if (pr_tracekind == "1")
-                            {
-                                dt = (DataTable)dh.ExecuteSql("select bar_prodcode,bar_code from barcode where bar_code='" + code.Text + "'", "select");
-                                if (dt.Rows.Count > 0)
-                                {
-                                    if (sp_soncode != dt.Rows[0]["bar_prodcode"].ToString())
-                                    {
-                                        OperateResult.AppendText(">>用户条码号对应的物料不是：" + sp_soncode + "\n");
-                                    }
-                                    else
-                                    {
-                                        dt = (DataTable)dh.ExecuteSql("select cm_id from craftmaterail where cm_soncode='" + sp_soncode + "' and cm_barcode='" + code.Text + "'", "select");
-                                        if (dt.Rows.Count > 0)
-                                        {
-
-                                            OperateResult.AppendText(">>条码已采集过\n", Color.Red);
-                                        }
-                                        else
-                                        {
-                                            Save_OtherCode(sp_soncode, make_code, sn_code.Text, sp_id);
-                                        }
-                                    }
-                                }
-                            }
-                            //不管控
-                            else if (pr_tracekind == "0")
-                            {
-                                if (code.Text.Substring(0, sp_prefix.Length) == sp_prefix && code.Text.Length == sp_length)
-                                {
-                                    Save_OtherCode(sp_soncode, make_code, sn_code.Text, sp_id);
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>前缀不匹配\n", Color.Red);
-                                }
-                            }
-                        }
-                        else
-                        {
-                            //如果sp_type!='物料'的话
-                            switch (dt1.Rows[RemainIndex]["sp_type"].ToString())
-                            {
-                                case "MAC":
-                                    dh.UpdateByCondition("makeserial", "ms_mac='" + code.Text + "'", "ms_id=" + ms_id);
-                                    break;
-                                case "BT":
-                                    dh.UpdateByCondition("makeserial", "ms_bt='" + code.Text + "'", "ms_id=" + ms_id);
-                                    break;
-                                case "IMEI1":
-                                    dh.UpdateByCondition("makeserial", "ms_imei1='" + code.Text + "'", "ms_id=" + ms_id);
-                                    break;
-                                case "IMEI2":
-                                    dh.UpdateByCondition("makeserial", "ms_imei2='" + code.Text + "'", "ms_id=" + ms_id);
-                                    break;
-                                default:
-                                    break;
-                            }
-                        }
-                    }
-                }
-                //勾选了下料的时候
-                else if (UnLoading.Checked)
-                {
-                    //序列号不为空的时候
-                    if (sn_code.Text != "")
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select cm_id,cm_stepcode,ms_makecode,cm_mccode from craftmaterial left join makeserial on cm_makecode=ms_makecode and cm_sncode=ms_sncode where ms_sncode='" + sn_code.Text + "' and cm_barcode='" + code.Text + "'", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            string cm_id = dt.Rows[0]["cm_id"].ToString();
-                            string ms_macode = dt.Rows[0]["ms_makecode"].ToString();
-                            string cm_stepcode = dt.Rows[0]["cm_stepcode"].ToString();
-                            string cm_mccode = dt.Rows[0]["cm_mccode"].ToString();
-                            dh.ExecuteSql("delete from Craftmaterial where cm_id=" + cm_id, "delete");
-                            LogicHandler.InsertMakeProcess(ms_macode, sn_code.Text, "下料成功", User.UserName);
-                            int count = dh.getRowCount("craftMaterial", "cm_mccode='" + cm_mccode + "' and cm_stepcode='" + cm_stepcode + "' and cm_sncode='" + sn_code.Text + "'");
-                            if (count == 0)
-                            {
-                                dh.UpdateByCondition("makecraftdetail ", "mcd_inqty=mcd_inqty-1,mcd_outqty=mcd_outqty-1,mcd_okqty = mcd_okqty - 1", "mcd_mccode='" + cm_mccode + "' and mcd_stepcode='" + cm_stepcode + "'");
-                            }
-                        }
-                    }
-                    //序列号为空的时候
-                    else if (sn_code.Text == "")
-                    {
-                        dt = (DataTable)dh.ExecuteSql("select ms_status,ms_stepcode,ms_nextstepcode  from  makeserial  where  ms_sncode='" + code.Text + "'", "select");
-                        if (dt.Rows.Count > 0)
-                        {
-                            string ms_status = dt.Rows[0]["ms_status"].ToString();
-                            string ms_stepcode = dt.Rows[0]["ms_stepcode"].ToString();
-                            string ms_nextstepcode = dt.Rows[0]["ms_nextstepcode"].ToString();
-                            if (ms_status == "1" && ms_stepcode != User.CurrentStep)
-                            {
-                                OperateResult.SelectionColor = Color.Red;
-                                OperateResult.AppendText(">>当前工序不是" + User.CurrentStep + "\n");
-                            }
-                            else if (ms_status == "0" && ms_stepcode != User.CurrentStep)
-                            {
-                                OperateResult.SelectionColor = Color.Red;
-                                OperateResult.AppendText(">>当前工序不是" + User.CurrentStep + "\n");
-                            }
-                            else if (ms_status == "2" && ms_nextstepcode != User.CurrentStep)
-                            {
-                                OperateResult.SelectionColor = Color.Red;
-                                OperateResult.AppendText(">>该序列号已经包装\n");
-                            }
-                            else
-                            {
-                                dt = (DataTable)dh.ExecuteSql("select * from craftmaterial where cm_sncode='" + sn_code.Text + "'", "select");
-                                if (dt.Rows.Count > 0)
-                                {
-                                    OperateResult.AppendText(">>请采集需要下料的序列号\n", Color.Green);
-                                    sn_code.Text = code.Text;
-                                }
-                                else
-                                {
-                                    OperateResult.AppendText(">>该序列号未上料，无需下料\n", Color.Red);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        //用于批次料采集
-        /// <summary>
-        /// 采集子件编号,所有的控件委托相同的方法，通过控件属性不同去更新,
-        /// 备用的字段用于参数的传递Str传soncode,Str1传repcode,Str2传递对应标签的名称
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        //private void Save_BatchCode(object sender, KeyEventArgs e)
-        //{
-        //    //转换成自定义的插件类型
-        //    EnterTextBox soncode = (EnterTextBox)sender;
-        //    if (e.KeyData == Keys.Enter)
-        //    {
-        //        if (soncode.Text != "")
-        //        {
-        //            dt = (DataTable)dh.ExecuteSql("select bar_prodcode,bar_remain from barcode where bar_code='" + soncode.Text + "'", "select");
-        //            //判断对应的条码号是否存在
-        //            if (dt.Rows.Count > 0)
-        //            {
-        //                string barprodcode = dt.Rows[0]["bar_prodcode"].ToString();
-        //                string barremain = dt.Rows[0]["bar_remain"].ToString();
-        //                //备用的字段用于参数的传递Str传soncode,Str1传repcode
-        //                if (soncode.Str != barprodcode && soncode.Str1 != barprodcode)
-        //                {
-        //                    OperateResult.AppendText(">>条码号对应的物料不是需要上料的物料\n", Color.Red);
-        //                }
-        //                else
-        //                {
-        //                    if (LogicHandler.SetMaterialUp(soncode.Text, make_code, soncode.Text, soncode.Str, User.UserSourceCode, User.UserName, soncode.ID, "BATCH", out ErrorMessage))
-        //                    {
-        //                        LogicHandler.InsertMakeProcess(make_code, sn_code.Text, "上料成功", User.UserName);
-        //                        OperateResult.AppendText(">>采集成功\n", Color.Green);
-        //                        //输入完成后控件不可见
-        //                        soncode.Visible = false;
-        //                        //控件标题不可见
-        //                        Controls[soncode.Str2].Visible = false;
-        //                        //如果RemainListA中还存在需要提醒的内容
-        //                        if (RemainListA.Length > RemainIndex)
-        //                        {
-        //                            OperateResult.AppendText("<<请采集批次料" + RemainListA[RemainIndex] + "的条码\n");
-        //                            RemainIndex = RemainIndex + 1;
-        //                        }
-        //                        //跳到RemainListB中查看是否有需要提醒的内容
-        //                        else
-        //                        {
-        //                            //如果提示序列B的长度大于0
-        //                            if (RemainListB.Length > 0)
-        //                            {
-        //                                RemainIndex = 0;
-        //                                OperateResult.AppendText("<<请采集物料" + RemainListB[RemainIndex] + "的条码\n");
-        //                            }
-        //                            else
-        //                            {
-        //                                sn_code.Text = "";
-        //                                code.Text = "";
-        //                                OperateResult.AppendText(">>上料采集完成！\n", Color.Green);
-        //                            }
-        //                        }
-        //                    }
-        //                }
-        //            }
-        //            else
-        //            {
-        //                OperateResult.AppendText(">>条码号不存在\n", Color.Red);
-        //            }
-        //        }
-        //        else
-        //        {
-        //            OperateResult.AppendText(">>条码不能为空\n", Color.Red);
-        //        }
-        //    }
-        //}
-
-        //此类中通用的保存逻辑
-        private void Save_OtherCode(string sp_soncode, string ma_code, string ms_sncode, string sp_id)
-        {
-            DataTable dt = new DataTable();
-            if (LogicHandler.SetMaterialUp(ms_sncode, make_code, code.Text, sp_soncode, User.UserSourceCode, User.UserName, sp_id, "SINGLE", out ErrorMessage))
-            {
-                sql.Append("select count(0) cn  from stepProduct left join make on ma_prodcode=sp_mothercode ");
-                sql.Append("left join CraftMaterial on cm_spid=sp_id where sp_craftcode='" + ms_craftcode + "' and sp_stepcode='" + stepcode + "' and ma_code='" + make_code + "' ");
-                sql.Append("and sp_id not in (select distinct cm_spid from CraftMaterial where ");
-                sql.Append("cm_makecode='" + make_code + "' and cm_stepcode='" + stepcode + "' and cm_mscode='" + ms_code + "')");
-                dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                sql.Clear();
-                if (dt.Rows.Count > 0)
-                {
-                    LogicHandler.InsertMakeProcess(ma_code, ms_sncode, "采集成功", User.UserName);
-                }
-                //采集成功提示
-                RemainIndex = RemainIndex + 1;
-                OperateResult.SelectionColor = Color.Green;
-                OperateResult.AppendText(">>采集成功\n");
-                //如果+1后不小于B序列的长度，则已采集完成，不需要进行提示了
-                if (RemainIndex < RemainListB.Length)
-                {
-                    OperateResult.AppendText("<<请采集物料" + RemainListB[RemainIndex] + "的条码（MAC\\WIFI\\BT\\IMEI1\\IMEI2 数据）\n");
-                }
-                else
-                {
-                    //上料采集成功，设置序列号栏目为空
-                    sn_code.Text = "";
-                    OperateResult.AppendText(">>上料采集完成！\n", Color.Green);
-                }
-            }
-            else
-            {
-                OperateResult.AppendText(">>" + ErrorMessage + "\n");
-            }
-        }
-    }
-}

UAS-出货标签管理/App.config

@@ -25,7 +25,7 @@
         <value />
       </setting>
       <setting name="FTPAddress" serializeAs="String">
-        <value>ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</value>
+        <value>ftp://richwellgroup.com.cn|printuser|printuser</value>
       </setting>
     </UAS_LabelMachine.Properties.Settings>
   </userSettings>

UAS-出货标签管理/Properties/Settings.Designer.cs

@@ -73,7 +73,7 @@ namespace UAS_LabelMachine.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8")]
+        [global::System.Configuration.DefaultSettingValueAttribute("ftp://richwellgroup.com.cn|printuser|printuser")]
         public string FTPAddress {
             get {
                 return ((string)(this["FTPAddress"]));

UAS-出货标签管理/Properties/Settings.settings

@@ -15,7 +15,7 @@
       <Value Profile="(Default)" />
     </Setting>
     <Setting Name="FTPAddress" Type="System.String" Scope="User">
-      <Value Profile="(Default)">ftp://sz.hi-mantech.com:46688|yhndftp|Stga28ytG8</Value>
+      <Value Profile="(Default)">ftp://richwellgroup.com.cn|printuser|printuser</Value>
     </Setting>
   </Settings>
 </SettingsFile>

UAS-出货标签管理/PublicMethod/DataHelper.cs

@@ -19,9 +19,9 @@ namespace UAS_LabelMachine
         //富为内网地址
         //private readonly string ConnectionStrings = "Data Source=192.168.0.88/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //富为外网地址
-        //private readonly string ConnectionStrings = "Data Source=richwellgroup.com.cn/orcl;User ID=DATACENTER;PassWord=select!#%*(";
+        private readonly string ConnectionStrings = "Data Source=richwellgroup.com.cn/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //怡海能达外网地址
-        private readonly string ConnectionStrings = "Data Source=sz.hi-mantech.com/orcl;User ID=DATACENTER;PassWord=select!#%*(";
+        //private readonly string ConnectionStrings = "Data Source=sz.hi-mantech.com/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //怡海能达内网地址
         //private readonly string ConnectionStrings = "Data Source=192.168.1.200/orcl;User ID=DATACENTER;PassWord=select!#%*(";
         //用户选择的数据库的连接字符串

UAS_WinForm.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UAS-MES接口", "MES接口\UAS-MES接口.csproj", "{A52EFE9C-838E-4E8C-BAAA-B1C226E57A81}"
 EndProject