修改内容提交

UAS_MES_YD/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -107,6 +107,7 @@ namespace UAS_MES_NEW.Make
             this.AutoPrintBad = new System.Windows.Forms.CheckBox();
             this.RePrint = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.IfTest = new UAS_MES_NEW.CustomControl.CustomCheckBox.ReSetCheckBox();
+            this.ReleaseSN = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.BadInfSource)).BeginInit();
             this.SuspendLayout();
@@ -932,6 +933,7 @@ namespace UAS_MES_NEW.Make
             this.WriteSoftWare.TabIndex = 195;
             this.WriteSoftWare.Text = "解绑SN";
             this.WriteSoftWare.UseVisualStyleBackColor = true;
+            this.WriteSoftWare.Visible = false;
             this.WriteSoftWare.CheckedChanged += new System.EventHandler(this.WriteSoftWare_CheckedChanged);
             // 
             // label10
@@ -996,12 +998,32 @@ namespace UAS_MES_NEW.Make
             this.IfTest.Text = "是否抽检";
             this.IfTest.UseVisualStyleBackColor = true;
             // 
+            // ReleaseSN
+            // 
+            this.ReleaseSN.AllPower = null;
+            this.ReleaseSN.BackColor = System.Drawing.Color.Transparent;
+            this.ReleaseSN.DownImage = ((System.Drawing.Image)(resources.GetObject("ReleaseSN.DownImage")));
+            this.ReleaseSN.Image = null;
+            this.ReleaseSN.IsShowBorder = true;
+            this.ReleaseSN.Location = new System.Drawing.Point(1298, 990);
+            this.ReleaseSN.Margin = new System.Windows.Forms.Padding(4);
+            this.ReleaseSN.MoveImage = ((System.Drawing.Image)(resources.GetObject("ReleaseSN.MoveImage")));
+            this.ReleaseSN.Name = "ReleaseSN";
+            this.ReleaseSN.NormalImage = ((System.Drawing.Image)(resources.GetObject("ReleaseSN.NormalImage")));
+            this.ReleaseSN.Power = null;
+            this.ReleaseSN.Size = new System.Drawing.Size(130, 52);
+            this.ReleaseSN.TabIndex = 202;
+            this.ReleaseSN.Text = "解绑SN";
+            this.ReleaseSN.UseVisualStyleBackColor = false;
+            this.ReleaseSN.Click += new System.EventHandler(this.ReleaseSN_Click);
+            // 
             // Make_TestCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(1724, 1070);
+            this.Controls.Add(this.ReleaseSN);
             this.Controls.Add(this.IfTest);
             this.Controls.Add(this.RePrint);
             this.Controls.Add(this.AutoPrintBad);
@@ -1146,5 +1168,6 @@ namespace UAS_MES_NEW.Make
         private System.Windows.Forms.CheckBox AutoPrintBad;
         private CustomControl.ButtonUtil.NormalButton RePrint;
         private ReSetCheckBox IfTest;
+        private CustomControl.ButtonUtil.NormalButton ReleaseSN;
     }
 }

UAS_MES_YD/FunctionCode/Make/Make_TestCollection.cs

@@ -387,15 +387,9 @@ namespace UAS_MES_NEW.Make
                         //良品信息采集
                         if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, out ErrorMessage))
                         {
-                            if (WriteSoftWare.Checked)
-                            {
-                                dh.ExecuteSql("delete from sninfo where si_sn='" + ms_sncode.Text + "'", "delete");
-                                dh.ExecuteSql("delete from makesnrelation where sn='" + ms_sncode.Text + "' and makecode='" + ma_code.Text + "'", "delete");
-                                dh.ExecuteSql("update makeserial set ms_sncode=ms_firstsn where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + ma_code.Text + "'", "update");
-                            }
                             if (IfTest.Checked)
                             {
-                                dh.ExecuteSql("update makeserial set ms_iftest=-1 where ms_id='"+oMSID+"'", "update");
+                                dh.ExecuteSql("update makeserial set ms_iftest=-1 where ms_id='" + oMSID + "'", "update");
                             }
                             //提示正确返回时传递的信息
                             if (ErrorMessage.Contains("AFTERSUCCESS"))
@@ -701,9 +695,11 @@ namespace UAS_MES_NEW.Make
                 WaitReject.Enabled = false;
                 ChooseedReject.Enabled = false;
                 Save.Visible = false;
+                ReleaseSN.Enabled = false;
             }
             else
             {
+                ReleaseSN.Enabled = true;
                 bc_code.Enabled = true;
                 WaitReject.Enabled = true;
                 ChooseedReject.Enabled = true;
@@ -855,5 +851,20 @@ namespace UAS_MES_NEW.Make
         {
 
         }
+
+        private void ReleaseSN_Click(object sender, EventArgs e)
+        {
+            if (dh.CheckExist("makeserial", "ms_sncode<>ms_firstsn and ms_id='" + oMSID + "'"))
+            {
+                dh.ExecuteSql("delete from sninfo where si_sn='" + ms_sncode.Text + "'", "delete");
+                dh.ExecuteSql("delete from makesnrelation where sn='" + ms_sncode.Text + "' and makecode='" + ma_code.Text + "'", "delete");
+                dh.ExecuteSql("update makeserial set ms_sncode=ms_firstsn,ms_imei1='',ms_mac='',ms_bt='',ms_beforesn='' where ms_sncode='" + ms_sncode.Text + "' and ms_makecode='" + ma_code.Text + "'", "update");
+                OperateResult.AppendText(">>" + ms_sncode.Text + "解绑成功\n", Color.Green);
+            }
+            else
+            {
+                OperateResult.AppendText(">>" + ms_sncode.Text + "没有需要解绑的内容\n", Color.Red);
+            }
+        }
     }
 }

UAS_MES_YD/FunctionCode/Make/Make_TestCollection.resx

@@ -498,6 +498,44 @@
         2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
         zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
         ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ReleaseSN.DownImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFcSURBVFhH5di7UsJAFMbxtDT6QMI76IAFT0npIE0K
+        GcRORxHklpAIBHLfbILV8XxeNsMznJ35F5vu+82kWYuILD4N7oq75roCw27sb/x5WBdc27btntY64o/i
+        DnZjPxy4S6A0R6PHO1WUNHc9ep4uxIXd2D8eP/XZowWUThBG+n3p0stsKbbJ0qFDFFfscQuUbpzm9Pqx
+        Eh8c4PGLkuX0Nl+LDw4GJckUTRaO+OBQo+SKpitXfHAwKClfZuuN+OBgUDJV0NzxxAeHM5TFxhffGUpe
+        aFp5n+KDg0FRfHH8nfjgUKPoktztXnxwMCgFX7xdID441ChlRf7+ID44GBTNl21wFB8capSqot0xFB8c
+        /lE6Wa70IU5oH0Ziw/5cFebpoPUwHPbL04nCJKUgisWF3dgPB3gABc9v7fvBoBcnaVKdvkha2I39cPjx
+        oPrhusndcPinpIXd2N8gIusbTaFspKtR2SQAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ReleaseSN.MoveImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAFzSURBVFhH5djNSgJRGMZxL2P2gTfQFbZvHSEZFBEW
+        CEIQBEIgVFiS9qXWoDmp4/fHzDmjM2a+vU/QqUVX0DvwXxxn9fwYXJwYEcXWNzIWt83dcq7AsBv7LXgA
+        ZI0r71/aaqjCJf8o7sFu7IcDFwdK4vimrv1oSZXRnArdQFzYjf3pQkOzRxIoVWc6X5X6M7ruBGIr9mbU
+        9MIVe9hAcXvBO125WnxwgMcXSpcPF20tPjgYlI5eUK6lxAcHg9Lmw3nTFx8cDEpLLSjr+OKDg0FpqojO
+        Gp744GBQ3vyITutT8cHBoDheRCe1ifjgYFBe+ZCxJ+KDg0GpT0NKv4zFBweDUpuEdFQdiQ8OBsXmw2Fl
+        JD44/KCM53TwNBQfHAzKMx/2Hgfig8M3SrXYUasUfz67DwOxYf9dV5urg+RWzta4aEnxn83OfV9c2I39
+        cIAHUOJceTNbUfmW94GX0sJu7IcDPH5fXCe4EvfXxe5/D7ux3yKi2CfkPhTy27lqkwAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="ReleaseSN.NormalImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAAEUAAAAWCAYAAACWl1FwAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAGVSURBVFhH5di7agJRFIXhDSKoYBQEC8FCECwEQRBE
+        4uUVEtTiPKVlom2wttM6IfF+15njXHRnL19jD/zFmanWV8zAEDNTp9OJS6/Sm2QUht3YH4cHtdvtF6k7
+        mUwG1tqd3FR3YTf2w0FKUVOu6XT68Xgw3+8PtWH/bDYbCkeLGo1Gz/d9JwzvrL0gCKx49KlerxtIBUGo
+        PjjAg2q1mqDc2fN99cEBHlStVk0oB+t56oMDPKhSqZggDNm1N/XBAR5ULpeNvGD46rrqgwM8qFQqGV8O
+        56ujPjjAg4rFosFL5ni5qA8O8KBCoWBuns/701l9cIAH5fN5QfF4dzipDw7woFwuZ+zN483+oD44wIOy
+        2azB52i13asPDvCgTCZjHGt5sdmqDw7woHQ6bRzX8ny1UR8c4EHJZNJc5fC7XKsPDvCgRCLR2x9Pzt9q
+        zT+Lpdqw/3A6W/HoUywWa32Nx8OL4zwffM8X6sJu7IcDPCgajaak7udoNNjsdgc81BZ2Yz8c4PH8cR2J
+        ROJSU3qXjMKwG/vjzEz/skOI3Zqgv7AAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

UAS_MES_YD/FunctionCode/OQC/OQC_BatchResultJudge.Designer.cs

@@ -77,9 +77,10 @@
             // 
             this.ob_batchqty_label.AutoSize = true;
             this.ob_batchqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_batchqty_label.Location = new System.Drawing.Point(510, 233);
+            this.ob_batchqty_label.Location = new System.Drawing.Point(1020, 466);
+            this.ob_batchqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_batchqty_label.Name = "ob_batchqty_label";
-            this.ob_batchqty_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_batchqty_label.Size = new System.Drawing.Size(114, 41);
             this.ob_batchqty_label.TabIndex = 158;
             this.ob_batchqty_label.Text = "实批数";
             // 
@@ -87,9 +88,10 @@
             // 
             this.ob_result_label.AutoSize = true;
             this.ob_result_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_result_label.Location = new System.Drawing.Point(510, 201);
+            this.ob_result_label.Location = new System.Drawing.Point(1020, 402);
+            this.ob_result_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_result_label.Name = "ob_result_label";
-            this.ob_result_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_result_label.Size = new System.Drawing.Size(146, 41);
             this.ob_result_label.TabIndex = 166;
             this.ob_result_label.Text = "判定结果";
             // 
@@ -97,9 +99,10 @@
             // 
             this.ob_okqty_label.AutoSize = true;
             this.ob_okqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_okqty_label.Location = new System.Drawing.Point(510, 302);
+            this.ob_okqty_label.Location = new System.Drawing.Point(1020, 604);
+            this.ob_okqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_okqty_label.Name = "ob_okqty_label";
-            this.ob_okqty_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_okqty_label.Size = new System.Drawing.Size(114, 41);
             this.ob_okqty_label.TabIndex = 160;
             this.ob_okqty_label.Text = "合格数";
             // 
@@ -107,9 +110,10 @@
             // 
             this.ob_ngqty_label.AutoSize = true;
             this.ob_ngqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_ngqty_label.Location = new System.Drawing.Point(510, 336);
+            this.ob_ngqty_label.Location = new System.Drawing.Point(1020, 672);
+            this.ob_ngqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_ngqty_label.Name = "ob_ngqty_label";
-            this.ob_ngqty_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_ngqty_label.Size = new System.Drawing.Size(146, 41);
             this.ob_ngqty_label.TabIndex = 162;
             this.ob_ngqty_label.Text = "不合格数";
             // 
@@ -117,21 +121,21 @@
             // 
             this.oi_checkqty_label.AutoSize = true;
             this.oi_checkqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.oi_checkqty_label.Location = new System.Drawing.Point(510, 267);
+            this.oi_checkqty_label.Location = new System.Drawing.Point(1020, 534);
+            this.oi_checkqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.oi_checkqty_label.Name = "oi_checkqty_label";
-            this.oi_checkqty_label.Size = new System.Drawing.Size(58, 21);
+            this.oi_checkqty_label.Size = new System.Drawing.Size(114, 41);
             this.oi_checkqty_label.TabIndex = 164;
             this.oi_checkqty_label.Text = "抽检数";
             // 
             // ReworkRequire
             // 
             this.ReworkRequire.AutoSize = true;
-            this.ReworkRequire.Checked = true;
-            this.ReworkRequire.CheckState = System.Windows.Forms.CheckState.Checked;
             this.ReworkRequire.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ReworkRequire.Location = new System.Drawing.Point(122, 496);
+            this.ReworkRequire.Location = new System.Drawing.Point(244, 992);
+            this.ReworkRequire.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ReworkRequire.Name = "ReworkRequire";
-            this.ReworkRequire.Size = new System.Drawing.Size(125, 25);
+            this.ReworkRequire.Size = new System.Drawing.Size(242, 45);
             this.ReworkRequire.TabIndex = 168;
             this.ReworkRequire.Text = "发起返工需求";
             this.ReworkRequire.UseVisualStyleBackColor = true;
@@ -140,9 +144,10 @@
             // 
             this.ob_aqlcode_label.AutoSize = true;
             this.ob_aqlcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_aqlcode_label.Location = new System.Drawing.Point(510, 369);
+            this.ob_aqlcode_label.Location = new System.Drawing.Point(1020, 738);
+            this.ob_aqlcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_aqlcode_label.Name = "ob_aqlcode_label";
-            this.ob_aqlcode_label.Size = new System.Drawing.Size(42, 21);
+            this.ob_aqlcode_label.Size = new System.Drawing.Size(83, 41);
             this.ob_aqlcode_label.TabIndex = 169;
             this.ob_aqlcode_label.Text = "AQL";
             // 
@@ -150,9 +155,10 @@
             // 
             this.ob_prodcode_label.AutoSize = true;
             this.ob_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_prodcode_label.Location = new System.Drawing.Point(264, 116);
+            this.ob_prodcode_label.Location = new System.Drawing.Point(528, 232);
+            this.ob_prodcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_prodcode_label.Name = "ob_prodcode_label";
-            this.ob_prodcode_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_prodcode_label.Size = new System.Drawing.Size(146, 41);
             this.ob_prodcode_label.TabIndex = 218;
             this.ob_prodcode_label.Text = "产品编号";
             // 
@@ -160,9 +166,10 @@
             // 
             this.ob_makecode_label.AutoSize = true;
             this.ob_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_makecode_label.Location = new System.Drawing.Point(8, 116);
+            this.ob_makecode_label.Location = new System.Drawing.Point(16, 232);
+            this.ob_makecode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_makecode_label.Name = "ob_makecode_label";
-            this.ob_makecode_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_makecode_label.Size = new System.Drawing.Size(114, 41);
             this.ob_makecode_label.TabIndex = 216;
             this.ob_makecode_label.Text = "工单号";
             // 
@@ -170,9 +177,10 @@
             // 
             this.ob_checkno_label.AutoSize = true;
             this.ob_checkno_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_checkno_label.Location = new System.Drawing.Point(8, 12);
+            this.ob_checkno_label.Location = new System.Drawing.Point(16, 24);
+            this.ob_checkno_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_checkno_label.Name = "ob_checkno_label";
-            this.ob_checkno_label.Size = new System.Drawing.Size(58, 21);
+            this.ob_checkno_label.Size = new System.Drawing.Size(114, 41);
             this.ob_checkno_label.TabIndex = 214;
             this.ob_checkno_label.Text = "抽检批";
             // 
@@ -180,9 +188,10 @@
             // 
             this.obd_outboxcode_label.AutoSize = true;
             this.obd_outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.obd_outboxcode_label.Location = new System.Drawing.Point(8, 44);
+            this.obd_outboxcode_label.Location = new System.Drawing.Point(16, 88);
+            this.obd_outboxcode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.obd_outboxcode_label.Name = "obd_outboxcode_label";
-            this.obd_outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.obd_outboxcode_label.Size = new System.Drawing.Size(82, 41);
             this.obd_outboxcode_label.TabIndex = 212;
             this.obd_outboxcode_label.Text = "箱号";
             // 
@@ -190,9 +199,10 @@
             // 
             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(8, 78);
+            this.ms_sncode_label.Location = new System.Drawing.Point(16, 156);
+            this.ms_sncode_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ms_sncode_label.Name = "ms_sncode_label";
-            this.ms_sncode_label.Size = new System.Drawing.Size(58, 21);
+            this.ms_sncode_label.Size = new System.Drawing.Size(114, 41);
             this.ms_sncode_label.TabIndex = 210;
             this.ms_sncode_label.Text = "序列号";
             // 
@@ -200,9 +210,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label3.Location = new System.Drawing.Point(36, 425);
+            this.label3.Location = new System.Drawing.Point(72, 850);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(444, 20);
+            this.label3.Size = new System.Drawing.Size(887, 36);
             this.label3.TabIndex = 222;
             this.label3.Text = "--说明:如何物料没有维护AQL标准，需手动填写最大不合格允许通过数";
             // 
@@ -210,17 +221,19 @@
             // 
             this.ob_maxngacceptqty_label.AutoSize = true;
             this.ob_maxngacceptqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(36, 397);
+            this.ob_maxngacceptqty_label.Location = new System.Drawing.Point(72, 794);
+            this.ob_maxngacceptqty_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_maxngacceptqty_label.Name = "ob_maxngacceptqty_label";
-            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(170, 21);
+            this.ob_maxngacceptqty_label.Size = new System.Drawing.Size(338, 41);
             this.ob_maxngacceptqty_label.TabIndex = 223;
             this.ob_maxngacceptqty_label.Text = "最大不合格允许通过数";
             // 
             // Remark
             // 
-            this.Remark.Location = new System.Drawing.Point(88, 162);
+            this.Remark.Location = new System.Drawing.Point(176, 324);
+            this.Remark.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Remark.Name = "Remark";
-            this.Remark.Size = new System.Drawing.Size(411, 225);
+            this.Remark.Size = new System.Drawing.Size(818, 446);
             this.Remark.TabIndex = 225;
             this.Remark.Tag = "Remark";
             this.Remark.Text = "";
@@ -229,9 +242,10 @@
             // 
             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(8, 162);
+            this.label5.Location = new System.Drawing.Point(16, 324);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(42, 21);
+            this.label5.Size = new System.Drawing.Size(82, 41);
             this.label5.TabIndex = 226;
             this.label5.Text = "备注";
             // 
@@ -239,9 +253,10 @@
             // 
             this.ob_status_label.AutoSize = true;
             this.ob_status_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ob_status_label.Location = new System.Drawing.Point(510, 168);
+            this.ob_status_label.Location = new System.Drawing.Point(1020, 336);
+            this.ob_status_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.ob_status_label.Name = "ob_status_label";
-            this.ob_status_label.Size = new System.Drawing.Size(74, 21);
+            this.ob_status_label.Size = new System.Drawing.Size(146, 41);
             this.ob_status_label.TabIndex = 232;
             this.ob_status_label.Text = "批次状态";
             // 
@@ -252,12 +267,13 @@
             this.normalButton1.DownImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.DownImage")));
             this.normalButton1.Image = null;
             this.normalButton1.IsShowBorder = true;
-            this.normalButton1.Location = new System.Drawing.Point(428, 396);
+            this.normalButton1.Location = new System.Drawing.Point(856, 792);
+            this.normalButton1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.normalButton1.MoveImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.MoveImage")));
             this.normalButton1.Name = "normalButton1";
             this.normalButton1.NormalImage = ((System.Drawing.Image)(resources.GetObject("normalButton1.NormalImage")));
             this.normalButton1.Power = null;
-            this.normalButton1.Size = new System.Drawing.Size(75, 28);
+            this.normalButton1.Size = new System.Drawing.Size(150, 56);
             this.normalButton1.TabIndex = 234;
             this.normalButton1.Text = "保存备注";
             this.normalButton1.UseVisualStyleBackColor = false;
@@ -268,10 +284,11 @@
             this.ob_maxngacceptqty.AllPower = "";
             this.ob_maxngacceptqty.BackColor = System.Drawing.Color.White;
             this.ob_maxngacceptqty.ID = null;
-            this.ob_maxngacceptqty.Location = new System.Drawing.Point(201, 398);
+            this.ob_maxngacceptqty.Location = new System.Drawing.Point(402, 796);
+            this.ob_maxngacceptqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_maxngacceptqty.Name = "ob_maxngacceptqty";
             this.ob_maxngacceptqty.Power = "";
-            this.ob_maxngacceptqty.Size = new System.Drawing.Size(194, 21);
+            this.ob_maxngacceptqty.Size = new System.Drawing.Size(384, 35);
             this.ob_maxngacceptqty.Str = null;
             this.ob_maxngacceptqty.Str1 = null;
             this.ob_maxngacceptqty.Str2 = null;
@@ -284,10 +301,11 @@
             this.ob_status.BackColor = System.Drawing.Color.White;
             this.ob_status.Enabled = false;
             this.ob_status.ID = null;
-            this.ob_status.Location = new System.Drawing.Point(600, 168);
+            this.ob_status.Location = new System.Drawing.Point(1200, 336);
+            this.ob_status.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_status.Name = "ob_status";
             this.ob_status.Power = null;
-            this.ob_status.Size = new System.Drawing.Size(147, 21);
+            this.ob_status.Size = new System.Drawing.Size(290, 35);
             this.ob_status.Str = null;
             this.ob_status.Str1 = null;
             this.ob_status.Str2 = null;
@@ -300,10 +318,11 @@
             this.ob_source.BackColor = System.Drawing.Color.White;
             this.ob_source.Enabled = false;
             this.ob_source.ID = null;
-            this.ob_source.Location = new System.Drawing.Point(759, 46);
+            this.ob_source.Location = new System.Drawing.Point(1518, 92);
+            this.ob_source.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_source.Name = "ob_source";
             this.ob_source.Power = null;
-            this.ob_source.Size = new System.Drawing.Size(147, 21);
+            this.ob_source.Size = new System.Drawing.Size(290, 35);
             this.ob_source.Str = null;
             this.ob_source.Str1 = null;
             this.ob_source.Str2 = null;
@@ -317,10 +336,11 @@
             this.ob_id.BackColor = System.Drawing.Color.White;
             this.ob_id.Enabled = false;
             this.ob_id.ID = null;
-            this.ob_id.Location = new System.Drawing.Point(759, 26);
+            this.ob_id.Location = new System.Drawing.Point(1518, 52);
+            this.ob_id.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_id.Name = "ob_id";
             this.ob_id.Power = null;
-            this.ob_id.Size = new System.Drawing.Size(147, 21);
+            this.ob_id.Size = new System.Drawing.Size(290, 35);
             this.ob_id.Str = null;
             this.ob_id.Str1 = null;
             this.ob_id.Str2 = null;
@@ -331,9 +351,10 @@
             // 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(760, 142);
+            this.OperateResult.Location = new System.Drawing.Point(1520, 284);
+            this.OperateResult.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.OperateResult.Name = "OperateResult";
-            this.OperateResult.Size = new System.Drawing.Size(210, 319);
+            this.OperateResult.Size = new System.Drawing.Size(416, 634);
             this.OperateResult.TabIndex = 227;
             this.OperateResult.Text = "";
             // 
@@ -344,12 +365,13 @@
             this.GetBatch.DownImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.DownImage")));
             this.GetBatch.Image = ((System.Drawing.Image)(resources.GetObject("GetBatch.Image")));
             this.GetBatch.IsShowBorder = true;
-            this.GetBatch.Location = new System.Drawing.Point(511, 117);
+            this.GetBatch.Location = new System.Drawing.Point(1022, 234);
+            this.GetBatch.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.GetBatch.MoveImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.MoveImage")));
             this.GetBatch.Name = "GetBatch";
             this.GetBatch.NormalImage = ((System.Drawing.Image)(resources.GetObject("GetBatch.NormalImage")));
             this.GetBatch.Power = "ifread";
-            this.GetBatch.Size = new System.Drawing.Size(60, 24);
+            this.GetBatch.Size = new System.Drawing.Size(120, 48);
             this.GetBatch.TabIndex = 221;
             this.GetBatch.Text = "获取批";
             this.GetBatch.UseVisualStyleBackColor = true;
@@ -361,10 +383,11 @@
             this.ob_prodcode.BackColor = System.Drawing.Color.White;
             this.ob_prodcode.Enabled = false;
             this.ob_prodcode.ID = null;
-            this.ob_prodcode.Location = new System.Drawing.Point(355, 120);
+            this.ob_prodcode.Location = new System.Drawing.Point(710, 240);
+            this.ob_prodcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_prodcode.Name = "ob_prodcode";
             this.ob_prodcode.Power = null;
-            this.ob_prodcode.Size = new System.Drawing.Size(144, 21);
+            this.ob_prodcode.Size = new System.Drawing.Size(284, 35);
             this.ob_prodcode.Str = null;
             this.ob_prodcode.Str1 = null;
             this.ob_prodcode.Str2 = null;
@@ -377,10 +400,11 @@
             this.ob_makecode.BackColor = System.Drawing.Color.White;
             this.ob_makecode.Enabled = false;
             this.ob_makecode.ID = null;
-            this.ob_makecode.Location = new System.Drawing.Point(88, 117);
+            this.ob_makecode.Location = new System.Drawing.Point(176, 234);
+            this.ob_makecode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_makecode.Name = "ob_makecode";
             this.ob_makecode.Power = null;
-            this.ob_makecode.Size = new System.Drawing.Size(160, 21);
+            this.ob_makecode.Size = new System.Drawing.Size(316, 35);
             this.ob_makecode.Str = null;
             this.ob_makecode.Str1 = null;
             this.ob_makecode.Str2 = null;
@@ -392,10 +416,11 @@
             this.ob_checkno.AllPower = "";
             this.ob_checkno.BackColor = System.Drawing.Color.White;
             this.ob_checkno.ID = null;
-            this.ob_checkno.Location = new System.Drawing.Point(88, 14);
+            this.ob_checkno.Location = new System.Drawing.Point(176, 28);
+            this.ob_checkno.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_checkno.Name = "ob_checkno";
             this.ob_checkno.Power = "";
-            this.ob_checkno.Size = new System.Drawing.Size(411, 21);
+            this.ob_checkno.Size = new System.Drawing.Size(818, 35);
             this.ob_checkno.Str = null;
             this.ob_checkno.Str1 = null;
             this.ob_checkno.Str2 = null;
@@ -408,10 +433,11 @@
             this.obd_outboxcode.AllPower = null;
             this.obd_outboxcode.BackColor = System.Drawing.Color.White;
             this.obd_outboxcode.ID = null;
-            this.obd_outboxcode.Location = new System.Drawing.Point(88, 46);
+            this.obd_outboxcode.Location = new System.Drawing.Point(176, 92);
+            this.obd_outboxcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.obd_outboxcode.Name = "obd_outboxcode";
             this.obd_outboxcode.Power = null;
-            this.obd_outboxcode.Size = new System.Drawing.Size(411, 21);
+            this.obd_outboxcode.Size = new System.Drawing.Size(818, 35);
             this.obd_outboxcode.Str = null;
             this.obd_outboxcode.Str1 = null;
             this.obd_outboxcode.Str2 = null;
@@ -424,10 +450,11 @@
             this.ms_sncode.AllPower = "";
             this.ms_sncode.BackColor = System.Drawing.Color.White;
             this.ms_sncode.ID = null;
-            this.ms_sncode.Location = new System.Drawing.Point(88, 80);
+            this.ms_sncode.Location = new System.Drawing.Point(176, 160);
+            this.ms_sncode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ms_sncode.Name = "ms_sncode";
             this.ms_sncode.Power = "";
-            this.ms_sncode.Size = new System.Drawing.Size(411, 21);
+            this.ms_sncode.Size = new System.Drawing.Size(818, 35);
             this.ms_sncode.Str = null;
             this.ms_sncode.Str1 = null;
             this.ms_sncode.Str2 = null;
@@ -441,10 +468,11 @@
             this.ob_nowcheckqty.BackColor = System.Drawing.Color.White;
             this.ob_nowcheckqty.Enabled = false;
             this.ob_nowcheckqty.ID = null;
-            this.ob_nowcheckqty.Location = new System.Drawing.Point(600, 233);
+            this.ob_nowcheckqty.Location = new System.Drawing.Point(1200, 466);
+            this.ob_nowcheckqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_nowcheckqty.Name = "ob_nowcheckqty";
             this.ob_nowcheckqty.Power = null;
-            this.ob_nowcheckqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_nowcheckqty.Size = new System.Drawing.Size(290, 35);
             this.ob_nowcheckqty.Str = null;
             this.ob_nowcheckqty.Str1 = null;
             this.ob_nowcheckqty.Str2 = null;
@@ -457,10 +485,11 @@
             this.ob_okqty.BackColor = System.Drawing.Color.White;
             this.ob_okqty.Enabled = false;
             this.ob_okqty.ID = null;
-            this.ob_okqty.Location = new System.Drawing.Point(600, 302);
+            this.ob_okqty.Location = new System.Drawing.Point(1200, 604);
+            this.ob_okqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_okqty.Name = "ob_okqty";
             this.ob_okqty.Power = null;
-            this.ob_okqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_okqty.Size = new System.Drawing.Size(290, 35);
             this.ob_okqty.Str = null;
             this.ob_okqty.Str1 = null;
             this.ob_okqty.Str2 = null;
@@ -473,10 +502,11 @@
             this.oi_checkqty.BackColor = System.Drawing.Color.White;
             this.oi_checkqty.Enabled = false;
             this.oi_checkqty.ID = null;
-            this.oi_checkqty.Location = new System.Drawing.Point(600, 267);
+            this.oi_checkqty.Location = new System.Drawing.Point(1200, 534);
+            this.oi_checkqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.oi_checkqty.Name = "oi_checkqty";
             this.oi_checkqty.Power = null;
-            this.oi_checkqty.Size = new System.Drawing.Size(147, 21);
+            this.oi_checkqty.Size = new System.Drawing.Size(290, 35);
             this.oi_checkqty.Str = null;
             this.oi_checkqty.Str1 = null;
             this.oi_checkqty.Str2 = null;
@@ -489,10 +519,11 @@
             this.ob_ngqty.BackColor = System.Drawing.Color.White;
             this.ob_ngqty.Enabled = false;
             this.ob_ngqty.ID = null;
-            this.ob_ngqty.Location = new System.Drawing.Point(600, 336);
+            this.ob_ngqty.Location = new System.Drawing.Point(1200, 672);
+            this.ob_ngqty.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_ngqty.Name = "ob_ngqty";
             this.ob_ngqty.Power = null;
-            this.ob_ngqty.Size = new System.Drawing.Size(147, 21);
+            this.ob_ngqty.Size = new System.Drawing.Size(290, 35);
             this.ob_ngqty.Str = null;
             this.ob_ngqty.Str1 = null;
             this.ob_ngqty.Str2 = null;
@@ -505,10 +536,11 @@
             this.ob_result.BackColor = System.Drawing.Color.White;
             this.ob_result.Enabled = false;
             this.ob_result.ID = null;
-            this.ob_result.Location = new System.Drawing.Point(600, 201);
+            this.ob_result.Location = new System.Drawing.Point(1200, 402);
+            this.ob_result.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_result.Name = "ob_result";
             this.ob_result.Power = null;
-            this.ob_result.Size = new System.Drawing.Size(147, 21);
+            this.ob_result.Size = new System.Drawing.Size(290, 35);
             this.ob_result.Str = null;
             this.ob_result.Str1 = null;
             this.ob_result.Str2 = null;
@@ -521,10 +553,11 @@
             this.ob_aqlcode.BackColor = System.Drawing.Color.White;
             this.ob_aqlcode.Enabled = false;
             this.ob_aqlcode.ID = null;
-            this.ob_aqlcode.Location = new System.Drawing.Point(600, 369);
+            this.ob_aqlcode.Location = new System.Drawing.Point(1200, 738);
+            this.ob_aqlcode.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ob_aqlcode.Name = "ob_aqlcode";
             this.ob_aqlcode.Power = null;
-            this.ob_aqlcode.Size = new System.Drawing.Size(147, 21);
+            this.ob_aqlcode.Size = new System.Drawing.Size(290, 35);
             this.ob_aqlcode.Str = null;
             this.ob_aqlcode.Str1 = null;
             this.ob_aqlcode.Str2 = null;
@@ -539,12 +572,13 @@
             this.WithdrawPass.Enabled = false;
             this.WithdrawPass.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.Image")));
             this.WithdrawPass.IsShowBorder = true;
-            this.WithdrawPass.Location = new System.Drawing.Point(435, 456);
+            this.WithdrawPass.Location = new System.Drawing.Point(870, 912);
+            this.WithdrawPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.WithdrawPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.MoveImage")));
             this.WithdrawPass.Name = "WithdrawPass";
             this.WithdrawPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawPass.NormalImage")));
             this.WithdrawPass.Power = "IFREAD";
-            this.WithdrawPass.Size = new System.Drawing.Size(68, 30);
+            this.WithdrawPass.Size = new System.Drawing.Size(136, 60);
             this.WithdrawPass.TabIndex = 167;
             this.WithdrawPass.Text = "撤销通过";
             this.WithdrawPass.UseVisualStyleBackColor = true;
@@ -558,12 +592,13 @@
             this.BatchRejection.Enabled = false;
             this.BatchRejection.Image = ((System.Drawing.Image)(resources.GetObject("BatchRejection.Image")));
             this.BatchRejection.IsShowBorder = true;
-            this.BatchRejection.Location = new System.Drawing.Point(31, 497);
+            this.BatchRejection.Location = new System.Drawing.Point(62, 994);
+            this.BatchRejection.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.BatchRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.MoveImage")));
             this.BatchRejection.Name = "BatchRejection";
             this.BatchRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchRejection.NormalImage")));
             this.BatchRejection.Power = "IFREAD";
-            this.BatchRejection.Size = new System.Drawing.Size(68, 30);
+            this.BatchRejection.Size = new System.Drawing.Size(136, 60);
             this.BatchRejection.TabIndex = 166;
             this.BatchRejection.Text = "批判退";
             this.BatchRejection.UseVisualStyleBackColor = true;
@@ -577,12 +612,13 @@
             this.ForcePass.Enabled = false;
             this.ForcePass.Image = ((System.Drawing.Image)(resources.GetObject("ForcePass.Image")));
             this.ForcePass.IsShowBorder = true;
-            this.ForcePass.Location = new System.Drawing.Point(295, 456);
+            this.ForcePass.Location = new System.Drawing.Point(590, 912);
+            this.ForcePass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ForcePass.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.MoveImage")));
             this.ForcePass.Name = "ForcePass";
             this.ForcePass.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForcePass.NormalImage")));
             this.ForcePass.Power = "ifspecial";
-            this.ForcePass.Size = new System.Drawing.Size(68, 30);
+            this.ForcePass.Size = new System.Drawing.Size(136, 60);
             this.ForcePass.TabIndex = 165;
             this.ForcePass.Text = "强制通过";
             this.ForcePass.UseVisualStyleBackColor = true;
@@ -596,12 +632,13 @@
             this.ForceRejection.Enabled = false;
             this.ForceRejection.Image = ((System.Drawing.Image)(resources.GetObject("ForceRejection.Image")));
             this.ForceRejection.IsShowBorder = true;
-            this.ForceRejection.Location = new System.Drawing.Point(295, 497);
+            this.ForceRejection.Location = new System.Drawing.Point(590, 994);
+            this.ForceRejection.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.ForceRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.MoveImage")));
             this.ForceRejection.Name = "ForceRejection";
             this.ForceRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("ForceRejection.NormalImage")));
             this.ForceRejection.Power = "ifspecial";
-            this.ForceRejection.Size = new System.Drawing.Size(68, 30);
+            this.ForceRejection.Size = new System.Drawing.Size(136, 60);
             this.ForceRejection.TabIndex = 164;
             this.ForceRejection.Text = "强制批退";
             this.ForceRejection.UseVisualStyleBackColor = true;
@@ -615,12 +652,13 @@
             this.WithdrawRejection.Enabled = false;
             this.WithdrawRejection.Image = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.Image")));
             this.WithdrawRejection.IsShowBorder = true;
-            this.WithdrawRejection.Location = new System.Drawing.Point(435, 497);
+            this.WithdrawRejection.Location = new System.Drawing.Point(870, 994);
+            this.WithdrawRejection.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.WithdrawRejection.MoveImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.MoveImage")));
             this.WithdrawRejection.Name = "WithdrawRejection";
             this.WithdrawRejection.NormalImage = ((System.Drawing.Image)(resources.GetObject("WithdrawRejection.NormalImage")));
             this.WithdrawRejection.Power = "IFREAD";
-            this.WithdrawRejection.Size = new System.Drawing.Size(68, 30);
+            this.WithdrawRejection.Size = new System.Drawing.Size(136, 60);
             this.WithdrawRejection.TabIndex = 163;
             this.WithdrawRejection.Text = "撤销判退";
             this.WithdrawRejection.UseVisualStyleBackColor = true;
@@ -634,12 +672,13 @@
             this.BatchPass.Enabled = false;
             this.BatchPass.Image = ((System.Drawing.Image)(resources.GetObject("BatchPass.Image")));
             this.BatchPass.IsShowBorder = true;
-            this.BatchPass.Location = new System.Drawing.Point(31, 455);
+            this.BatchPass.Location = new System.Drawing.Point(62, 910);
+            this.BatchPass.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.BatchPass.MoveImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.MoveImage")));
             this.BatchPass.Name = "BatchPass";
             this.BatchPass.NormalImage = ((System.Drawing.Image)(resources.GetObject("BatchPass.NormalImage")));
             this.BatchPass.Power = "IFREAD";
-            this.BatchPass.Size = new System.Drawing.Size(68, 30);
+            this.BatchPass.Size = new System.Drawing.Size(136, 60);
             this.BatchPass.TabIndex = 162;
             this.BatchPass.Text = "批判过";
             this.BatchPass.UseVisualStyleBackColor = true;
@@ -652,12 +691,13 @@
             this.Clean.DownImage = ((System.Drawing.Image)(resources.GetObject("Clean.DownImage")));
             this.Clean.Image = ((System.Drawing.Image)(resources.GetObject("Clean.Image")));
             this.Clean.IsShowBorder = true;
-            this.Clean.Location = new System.Drawing.Point(835, 485);
+            this.Clean.Location = new System.Drawing.Point(1670, 970);
+            this.Clean.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Clean.MoveImage = ((System.Drawing.Image)(resources.GetObject("Clean.MoveImage")));
             this.Clean.Name = "Clean";
             this.Clean.NormalImage = ((System.Drawing.Image)(resources.GetObject("Clean.NormalImage")));
             this.Clean.Power = null;
-            this.Clean.Size = new System.Drawing.Size(64, 29);
+            this.Clean.Size = new System.Drawing.Size(128, 58);
             this.Clean.TabIndex = 159;
             this.Clean.Text = "清除";
             this.Clean.UseVisualStyleBackColor = true;
@@ -665,9 +705,9 @@
             // 
             // OQC_BatchResultJudge
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(975, 537);
+            this.ClientSize = new System.Drawing.Size(1950, 1074);
             this.Controls.Add(this.normalButton1);
             this.Controls.Add(this.ob_maxngacceptqty);
             this.Controls.Add(this.ob_status_label);
@@ -711,6 +751,7 @@
             this.Controls.Add(this.ob_ngqty_label);
             this.Controls.Add(this.oi_checkqty_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.Name = "OQC_BatchResultJudge";
             this.Tag = "OQC!BatchResultJudge";
             this.Text = "抽检批维护";

UAS_MES_YD/FunctionCode/Query/Query_ExeProgress.Designer.cs

@@ -30,6 +30,12 @@
         {
             this.sn_code_label = new System.Windows.Forms.Label();
             this.SerialPanel = new System.Windows.Forms.Panel();
+            this.ma_code_label = new System.Windows.Forms.Label();
+            this.ma_code = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.ms_checkno = new System.Windows.Forms.Label();
+            this.label7 = new System.Windows.Forms.Label();
+            this.ms_firstsn = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.CraftInfDgv = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
             this.mp_sncode = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.mp_makecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -50,10 +56,6 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.sn_code = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
-            this.ma_code_label = new System.Windows.Forms.Label();
-            this.ma_code = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.ms_checkno = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.CraftInfDgv)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -66,9 +68,10 @@
             // 
             this.sn_code_label.AutoSize = true;
             this.sn_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.sn_code_label.Location = new System.Drawing.Point(10, 13);
+            this.sn_code_label.Location = new System.Drawing.Point(20, 26);
+            this.sn_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.sn_code_label.Name = "sn_code_label";
-            this.sn_code_label.Size = new System.Drawing.Size(58, 21);
+            this.sn_code_label.Size = new System.Drawing.Size(114, 41);
             this.sn_code_label.TabIndex = 183;
             this.sn_code_label.Text = "序列号";
             // 
@@ -78,14 +81,83 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.SerialPanel.AutoScroll = true;
             this.SerialPanel.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.SerialPanel.Location = new System.Drawing.Point(14, 106);
-            this.SerialPanel.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.SerialPanel.Location = new System.Drawing.Point(28, 212);
+            this.SerialPanel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.SerialPanel.Name = "SerialPanel";
-            this.SerialPanel.Size = new System.Drawing.Size(950, 254);
+            this.SerialPanel.Size = new System.Drawing.Size(1896, 504);
             this.SerialPanel.TabIndex = 194;
             this.SerialPanel.Scroll += new System.Windows.Forms.ScrollEventHandler(this.SerialPanel_Scroll);
             this.SerialPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.SerialPanel_Paint);
             // 
+            // ma_code_label
+            // 
+            this.ma_code_label.AutoSize = true;
+            this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_code_label.Location = new System.Drawing.Point(514, 24);
+            this.ma_code_label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_code_label.Name = "ma_code_label";
+            this.ma_code_label.Size = new System.Drawing.Size(114, 41);
+            this.ma_code_label.TabIndex = 195;
+            this.ma_code_label.Text = "工单号";
+            // 
+            // ma_code
+            // 
+            this.ma_code.AutoSize = true;
+            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.ma_code.Location = new System.Drawing.Point(664, 26);
+            this.ma_code.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ma_code.Name = "ma_code";
+            this.ma_code.Size = new System.Drawing.Size(0, 41);
+            this.ma_code.TabIndex = 196;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.label5.Location = new System.Drawing.Point(944, 26);
+            this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(146, 41);
+            this.label5.TabIndex = 197;
+            this.label5.Text = "抽检批号";
+            // 
+            // ms_checkno
+            // 
+            this.ms_checkno.AutoSize = true;
+            this.ms_checkno.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.ms_checkno.Location = new System.Drawing.Point(1124, 26);
+            this.ms_checkno.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.ms_checkno.Name = "ms_checkno";
+            this.ms_checkno.Size = new System.Drawing.Size(0, 41);
+            this.ms_checkno.TabIndex = 198;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label7.Location = new System.Drawing.Point(1386, 24);
+            this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(178, 41);
+            this.label7.TabIndex = 199;
+            this.label7.Text = "内部序列号";
+            // 
+            // ms_firstsn
+            // 
+            this.ms_firstsn.AllPower = null;
+            this.ms_firstsn.BackColor = System.Drawing.Color.White;
+            this.ms_firstsn.ID = null;
+            this.ms_firstsn.Location = new System.Drawing.Point(1576, 30);
+            this.ms_firstsn.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.ms_firstsn.Name = "ms_firstsn";
+            this.ms_firstsn.Power = null;
+            this.ms_firstsn.Size = new System.Drawing.Size(286, 35);
+            this.ms_firstsn.Str = null;
+            this.ms_firstsn.Str1 = null;
+            this.ms_firstsn.Str2 = null;
+            this.ms_firstsn.TabIndex = 201;
+            this.ms_firstsn.Tag = "NoAuto";
+            // 
             // CraftInfDgv
             // 
             this.CraftInfDgv.AllowUserToAddRows = false;
@@ -102,11 +174,11 @@
             this.mp_inman,
             this.em_name});
             this.CraftInfDgv.EnableContentClick = true;
-            this.CraftInfDgv.Location = new System.Drawing.Point(0, 388);
-            this.CraftInfDgv.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.CraftInfDgv.Location = new System.Drawing.Point(0, 776);
+            this.CraftInfDgv.Margin = new System.Windows.Forms.Padding(4);
             this.CraftInfDgv.Name = "CraftInfDgv";
             this.CraftInfDgv.RowTemplate.Height = 27;
-            this.CraftInfDgv.Size = new System.Drawing.Size(975, 190);
+            this.CraftInfDgv.Size = new System.Drawing.Size(1950, 380);
             this.CraftInfDgv.TabIndex = 193;
             // 
             // mp_sncode
@@ -184,11 +256,11 @@
             this.groupBoxWithBorder1.Controls.Add(this.label2);
             this.groupBoxWithBorder1.Controls.Add(this.label3);
             this.groupBoxWithBorder1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.groupBoxWithBorder1.Location = new System.Drawing.Point(12, 40);
-            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBoxWithBorder1.Location = new System.Drawing.Point(24, 80);
+            this.groupBoxWithBorder1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.groupBoxWithBorder1.Name = "groupBoxWithBorder1";
-            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.groupBoxWithBorder1.Size = new System.Drawing.Size(953, 40);
+            this.groupBoxWithBorder1.Padding = new System.Windows.Forms.Padding(6, 4, 6, 4);
+            this.groupBoxWithBorder1.Size = new System.Drawing.Size(1906, 80);
             this.groupBoxWithBorder1.TabIndex = 192;
             this.groupBoxWithBorder1.TabStop = false;
             this.groupBoxWithBorder1.Text = "颜色说明";
@@ -198,29 +270,30 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label1.Location = new System.Drawing.Point(850, 14);
+            this.label1.Location = new System.Drawing.Point(1700, 28);
+            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(74, 21);
+            this.label1.Size = new System.Drawing.Size(146, 41);
             this.label1.TabIndex = 193;
             this.label1.Text = "尚未执行";
             // 
             // pictureBox4
             // 
             this.pictureBox4.BackColor = System.Drawing.Color.White;
-            this.pictureBox4.Location = new System.Drawing.Point(776, 12);
-            this.pictureBox4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pictureBox4.Location = new System.Drawing.Point(1552, 24);
+            this.pictureBox4.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.pictureBox4.Name = "pictureBox4";
-            this.pictureBox4.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox4.Size = new System.Drawing.Size(120, 40);
             this.pictureBox4.TabIndex = 192;
             this.pictureBox4.TabStop = false;
             // 
             // pictureBox2
             // 
             this.pictureBox2.BackColor = System.Drawing.Color.Green;
-            this.pictureBox2.Location = new System.Drawing.Point(99, 12);
-            this.pictureBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pictureBox2.Location = new System.Drawing.Point(198, 24);
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox2.Size = new System.Drawing.Size(120, 40);
             this.pictureBox2.TabIndex = 187;
             this.pictureBox2.TabStop = false;
             // 
@@ -228,29 +301,30 @@
             // 
             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(655, 14);
+            this.label4.Location = new System.Drawing.Point(1310, 28);
+            this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(58, 21);
+            this.label4.Size = new System.Drawing.Size(114, 41);
             this.label4.TabIndex = 191;
             this.label4.Text = "已报废";
             // 
             // pictureBox1
             // 
             this.pictureBox1.BackColor = System.Drawing.Color.Red;
-            this.pictureBox1.Location = new System.Drawing.Point(338, 12);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pictureBox1.Location = new System.Drawing.Point(676, 24);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox1.Size = new System.Drawing.Size(120, 40);
             this.pictureBox1.TabIndex = 186;
             this.pictureBox1.TabStop = false;
             // 
             // pictureBox3
             // 
             this.pictureBox3.BackColor = System.Drawing.Color.Black;
-            this.pictureBox3.Location = new System.Drawing.Point(581, 12);
-            this.pictureBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pictureBox3.Location = new System.Drawing.Point(1162, 24);
+            this.pictureBox3.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(60, 20);
+            this.pictureBox3.Size = new System.Drawing.Size(120, 40);
             this.pictureBox3.TabIndex = 190;
             this.pictureBox3.TabStop = false;
             // 
@@ -258,9 +332,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(172, 14);
+            this.label2.Location = new System.Drawing.Point(344, 28);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(122, 21);
+            this.label2.Size = new System.Drawing.Size(242, 41);
             this.label2.TabIndex = 188;
             this.label2.Text = "已执行且为良品";
             // 
@@ -268,9 +343,10 @@
             // 
             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(412, 14);
+            this.label3.Location = new System.Drawing.Point(824, 28);
+            this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(138, 21);
+            this.label3.Size = new System.Drawing.Size(274, 41);
             this.label3.TabIndex = 189;
             this.label3.Text = "已执行且为不良品";
             // 
@@ -279,11 +355,11 @@
             this.sn_code.AllPower = null;
             this.sn_code.BackColor = System.Drawing.Color.White;
             this.sn_code.ID = null;
-            this.sn_code.Location = new System.Drawing.Point(92, 14);
-            this.sn_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sn_code.Location = new System.Drawing.Point(184, 28);
+            this.sn_code.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.sn_code.Name = "sn_code";
             this.sn_code.Power = null;
-            this.sn_code.Size = new System.Drawing.Size(145, 21);
+            this.sn_code.Size = new System.Drawing.Size(286, 35);
             this.sn_code.Str = null;
             this.sn_code.Str1 = null;
             this.sn_code.Str2 = null;
@@ -291,49 +367,13 @@
             this.sn_code.Tag = "NoAuto";
             this.sn_code.KeyDown += new System.Windows.Forms.KeyEventHandler(this.sn_code_KeyDown);
             // 
-            // ma_code_label
-            // 
-            this.ma_code_label.AutoSize = true;
-            this.ma_code_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code_label.Location = new System.Drawing.Point(257, 12);
-            this.ma_code_label.Name = "ma_code_label";
-            this.ma_code_label.Size = new System.Drawing.Size(58, 21);
-            this.ma_code_label.TabIndex = 195;
-            this.ma_code_label.Text = "工单号";
-            // 
-            // ma_code
-            // 
-            this.ma_code.AutoSize = true;
-            this.ma_code.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ma_code.Location = new System.Drawing.Point(332, 13);
-            this.ma_code.Name = "ma_code";
-            this.ma_code.Size = new System.Drawing.Size(0, 21);
-            this.ma_code.TabIndex = 196;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.label5.Location = new System.Drawing.Point(472, 13);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(74, 21);
-            this.label5.TabIndex = 197;
-            this.label5.Text = "抽检批号";
-            // 
-            // ms_checkno
-            // 
-            this.ms_checkno.AutoSize = true;
-            this.ms_checkno.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.ms_checkno.Location = new System.Drawing.Point(562, 13);
-            this.ms_checkno.Name = "ms_checkno";
-            this.ms_checkno.Size = new System.Drawing.Size(0, 21);
-            this.ms_checkno.TabIndex = 198;
-            // 
             // Query_ExeProgress
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(975, 578);
+            this.ClientSize = new System.Drawing.Size(1950, 1156);
+            this.Controls.Add(this.ms_firstsn);
+            this.Controls.Add(this.label7);
             this.Controls.Add(this.ms_checkno);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.ma_code);
@@ -344,7 +384,7 @@
             this.Controls.Add(this.sn_code);
             this.Controls.Add(this.sn_code_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.Name = "Query_ExeProgress";
             this.Tag = "Query!ExeProgress";
             this.Text = "工单执行进度";
@@ -389,5 +429,7 @@
         private System.Windows.Forms.Label ma_code;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label ms_checkno;
+        private System.Windows.Forms.Label label7;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox ms_firstsn;
     }
 }

UAS_MES_YD/FunctionCode/Query/Query_ExeProgress.cs

@@ -68,12 +68,12 @@ namespace UAS_MES_NEW.Query
                 if (ms_id.Rows.Count > 0)
                 {
                     //说明有过转号
-                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno from makeserial where ms_sncode='" + ms_id.Rows[0]["beforesn"].ToString() + "' or ms_sncode='" + ms_id.Rows[0]["sn"].ToString() + "' order by ms_id", "select");
+                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_firstsn,ms_checkno from makeserial where ms_sncode='" + ms_id.Rows[0]["beforesn"].ToString() + "' or ms_sncode='" + ms_id.Rows[0]["sn"].ToString() + "' order by ms_id", "select");
                 }
                 else
                 {
                     //没有过转号
-                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_checkno from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id", "select");
+                    ms_id = (DataTable)dh.ExecuteSql("select ms_id,ms_makecode,ms_firstsn,ms_checkno from makeserial where ms_sncode='" + sn_code.Text + "' order by ms_id", "select");
                 }
                 if (ms_id.Rows.Count == 0)
                 {
@@ -85,6 +85,7 @@ namespace UAS_MES_NEW.Query
                 //设置界面工单号
                 ma_code.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_makecode"].ToString();
                 ms_checkno.Text = ms_id.Rows[ms_id.Rows.Count - 1]["ms_checkno"].ToString();
+                ms_firstsn.Text= ms_id.Rows[ms_id.Rows.Count - 1]["ms_firstsn"].ToString();
                 int idCount = ms_id.Rows.Count;
                 for (int i = 0; i < idCount; i++)
                 {

UAS_MES_YD/FunctionCode/SystemSetting/SystemSetting_PrinterTest.cs

@@ -69,11 +69,17 @@ namespace UAS_MES_NEW.SystemSetting
                         {
                             case "SN":
                                 format.SubStrings[j].Value = (ma_code.Text.Replace("XX-", "") + lpad(4, (temp).ToString()));
-                                dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before')", "insert");
+                                if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "'"))
+                                {
+                                    dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before')", "insert");
+                                };
                                 break;
                             case "SN2":
                                 format.SubStrings[j].Value = (ma_code.Text.Replace("XX-", "") + lpad(4, (temp + 1).ToString()));
-                                dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before')", "insert");
+                                if (!dh.CheckExist("makesnlist", "msl_sncode='" + format.SubStrings[j].Value + "'"))
+                                {
+                                    dh.ExecuteSql("insert into makesnlist(msl_id,msl_indate,msl_makecode,msl_sncode,msl_type)values(makesnlist_seq.nextval,sysdate,'" + ma_code.Text + "','" + format.SubStrings[j].Value + "','before')", "insert");
+                                };
                                 break;
                             default:
                                 break;

UAS_MES_YD/Login.cs

@@ -146,7 +146,7 @@ namespace UAS_MES_NEW
         {
             //设置全局用户信息
             string[] field = { "em_code,em_depart,em_type,em_name,em_position,em_professname,em_type,ug_code,ug_name" };
-            UserInf = dh.getFieldsDataByCondition("Employee left join cs$userresource on ur_emcode=em_code left join cs$usergroup on ug_code=ur_groupcode", field, "upper(em_code)='" + UserName.Text.ToUpper() + "'");
+            UserInf = dh.getFieldsDataByCondition("Employee left join cs$userresource on ur_emcode=em_code left join cs$usergroup on ug_code=ur_groupcode", field, "upper(em_code)='" + UserName.Text.ToUpper() + "' or em_mobile='" + UserName.Text.ToUpper() + "'");
             DataTable dt = dh.getFieldsDataByCondition("source left join step on sc_stepcode=st_code", new string[] { "st_badgroupcode", "sc_wccode", "sc_code", "sc_stepcode", "sc_stepname", "sc_linecode" }, "upper(sc_code)='" + Source.Text.ToUpper() + "'");
             //存在岗位资源则要求添加
             if (dt.Rows.Count > 0)

UAS_MES_YD/PublicMethod/LogicHandler.cs

@@ -79,9 +79,9 @@ namespace UAS_MES_NEW.PublicMethod
         public static bool CheckUserLogin(string iUserCode, string iPassWord, out string oErrorMessage)
         {
             oErrorMessage = "";
-            string SQL = "select em_code from employee where upper(em_code)=:UserName and em_password =:PassWord";
+            string SQL = "select em_code from employee where (upper(em_code)=:UserName or em_mobile=:UserName) and em_password =:PassWord";
             DataTable dt;
-            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode.ToUpper(), iPassWord);
+            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode.ToUpper(), iUserCode.ToUpper(), iPassWord);
             if (dt.Rows.Count > 0)
                 return true;
             else
@@ -111,11 +111,12 @@ namespace UAS_MES_NEW.PublicMethod
             oErrorMessage = "";
             iUserCode = iUserCode.ToUpper();
             iSourceCode = iSourceCode.ToUpper();
-            string SQL = "select em_code,em_type from employee where upper(em_code)=:UserName ";
+            string SQL = "select em_code,em_type from employee where upper(em_code)=:UserName or em_mobile=:UserName";
             DataTable dt;
-            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode);
+            dt = (DataTable)dh.ExecuteSql(SQL, "select", iUserCode, iUserCode);
             if (dt.Rows.Count > 0)
             {
+                iUserCode= dt.Rows[0]["em_code"].ToString();
                 string em_type = dt.Rows[0]["em_type"].ToString();
                 if (iSourceCode == "")
                 {