提交修改

UAS-出货标签管理(泽天)/UAS_出货标签管理.Designer.cs

@@ -107,6 +107,8 @@
             this.贴标角度设置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.MenuManage = new System.Windows.Forms.Button();
             this.Connect = new System.Windows.Forms.Button();
+            this.MixPrCode = new System.Windows.Forms.CheckBox();
+            this.richTextAutoBottom1 = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
             this.groupBoxWithBorder2 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.CloseSerialPort = new System.Windows.Forms.Button();
             this.ConnectCom = new System.Windows.Forms.Button();
@@ -172,6 +174,8 @@
             this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.SingleLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.label14 = new System.Windows.Forms.Label();
+            this.CurrentOutBoxNum = new System.Windows.Forms.NumericUpDown();
             this.label13 = new System.Windows.Forms.Label();
             this.CurrentBoxNum = new System.Windows.Forms.NumericUpDown();
             this.SingleLabelPrinter = new UAS_LabelMachine.CustomControl.PrinterCombox();
@@ -205,7 +209,6 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.richTextAutoBottom1 = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.ShowMenu_Total.SuspendLayout();
@@ -214,6 +217,7 @@
             this.groupBoxWithBorder1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.LabelInf)).BeginInit();
             this.SingleLabel.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.CurrentOutBoxNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.CurrentBoxNum)).BeginInit();
             this.MidLabel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.MidboxCapacity)).BeginInit();
@@ -517,7 +521,7 @@
             // ChooseAll
             // 
             this.ChooseAll.Location = new System.Drawing.Point(0, 758);
-            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ChooseAll.Margin = new System.Windows.Forms.Padding(4);
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Size = new System.Drawing.Size(76, 44);
             this.ChooseAll.TabIndex = 84;
@@ -601,7 +605,7 @@
             // 
             this.pictureBox1.Image = global::UAS_LabelMachine.Properties.Resources.Status;
             this.pictureBox1.Location = new System.Drawing.Point(896, 200);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(6);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(244, 128);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -692,8 +696,8 @@
             // 
             this.Combindetail.AutoSize = true;
             this.Combindetail.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.Combindetail.Location = new System.Drawing.Point(592, 204);
-            this.Combindetail.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Combindetail.Location = new System.Drawing.Point(592, 155);
+            this.Combindetail.Margin = new System.Windows.Forms.Padding(4);
             this.Combindetail.Name = "Combindetail";
             this.Combindetail.Size = new System.Drawing.Size(156, 35);
             this.Combindetail.TabIndex = 104;
@@ -748,8 +752,8 @@
             // 
             this.CombindetailTwo.AutoSize = true;
             this.CombindetailTwo.Font = new System.Drawing.Font("微软雅黑", 9F);
-            this.CombindetailTwo.Location = new System.Drawing.Point(592, 260);
-            this.CombindetailTwo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.CombindetailTwo.Location = new System.Drawing.Point(592, 211);
+            this.CombindetailTwo.Margin = new System.Windows.Forms.Padding(4);
             this.CombindetailTwo.Name = "CombindetailTwo";
             this.CombindetailTwo.Size = new System.Drawing.Size(231, 35);
             this.CombindetailTwo.TabIndex = 109;
@@ -913,6 +917,26 @@
             this.Connect.UseVisualStyleBackColor = true;
             this.Connect.Click += new System.EventHandler(this.Connect_Click);
             // 
+            // MixPrCode
+            // 
+            this.MixPrCode.AutoSize = true;
+            this.MixPrCode.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.MixPrCode.Location = new System.Drawing.Point(592, 267);
+            this.MixPrCode.Margin = new System.Windows.Forms.Padding(4);
+            this.MixPrCode.Name = "MixPrCode";
+            this.MixPrCode.Size = new System.Drawing.Size(142, 35);
+            this.MixPrCode.TabIndex = 120;
+            this.MixPrCode.Text = "允许混料";
+            this.MixPrCode.UseVisualStyleBackColor = true;
+            // 
+            // richTextAutoBottom1
+            // 
+            this.richTextAutoBottom1.Location = new System.Drawing.Point(12, 1461);
+            this.richTextAutoBottom1.Name = "richTextAutoBottom1";
+            this.richTextAutoBottom1.Size = new System.Drawing.Size(2532, 156);
+            this.richTextAutoBottom1.TabIndex = 119;
+            this.richTextAutoBottom1.Text = "";
+            // 
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.Controls.Add(this.CloseSerialPort);
@@ -969,7 +993,7 @@
             this.Weight.AutoSize = true;
             this.Weight.Font = new System.Drawing.Font("微软雅黑", 30F);
             this.Weight.ForeColor = System.Drawing.Color.Red;
-            this.Weight.Location = new System.Drawing.Point(22, 70);
+            this.Weight.Location = new System.Drawing.Point(28, 76);
             this.Weight.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.Weight.Name = "Weight";
             this.Weight.Size = new System.Drawing.Size(0, 104);
@@ -1215,7 +1239,7 @@
             // 
             this.label18.AutoSize = true;
             this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label18.Location = new System.Drawing.Point(138, 254);
+            this.label18.Location = new System.Drawing.Point(144, 260);
             this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(24, 31);
@@ -1250,7 +1274,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label16.Location = new System.Drawing.Point(134, 126);
+            this.label16.Location = new System.Drawing.Point(140, 132);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(24, 31);
@@ -1285,7 +1309,7 @@
             // 
             this.label12.AutoSize = true;
             this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label12.Location = new System.Drawing.Point(22, 186);
+            this.label12.Location = new System.Drawing.Point(28, 192);
             this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(110, 31);
@@ -1296,7 +1320,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(18, 62);
+            this.label7.Location = new System.Drawing.Point(24, 68);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(110, 31);
@@ -1621,6 +1645,8 @@
             // 
             // SingleLabel
             // 
+            this.SingleLabel.Controls.Add(this.label14);
+            this.SingleLabel.Controls.Add(this.CurrentOutBoxNum);
             this.SingleLabel.Controls.Add(this.label13);
             this.SingleLabel.Controls.Add(this.CurrentBoxNum);
             this.SingleLabel.Controls.Add(this.SingleLabelPrinter);
@@ -1637,11 +1663,31 @@
             this.SingleLabel.TabStop = false;
             this.SingleLabel.Text = "单盘标签";
             // 
+            // label14
+            // 
+            this.label14.AutoSize = true;
+            this.label14.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label14.Location = new System.Drawing.Point(30, 300);
+            this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label14.Name = "label14";
+            this.label14.Size = new System.Drawing.Size(155, 36);
+            this.label14.TabIndex = 121;
+            this.label14.Text = "当前箱数量";
+            // 
+            // CurrentOutBoxNum
+            // 
+            this.CurrentOutBoxNum.Location = new System.Drawing.Point(196, 284);
+            this.CurrentOutBoxNum.Margin = new System.Windows.Forms.Padding(6);
+            this.CurrentOutBoxNum.Name = "CurrentOutBoxNum";
+            this.CurrentOutBoxNum.Size = new System.Drawing.Size(104, 50);
+            this.CurrentOutBoxNum.TabIndex = 120;
+            this.CurrentOutBoxNum.KeyDown += new System.Windows.Forms.KeyEventHandler(this.CurrentOutBoxNum_KeyDown);
+            // 
             // label13
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(22, 284);
+            this.label13.Location = new System.Drawing.Point(30, 244);
             this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(155, 36);
@@ -1650,7 +1696,7 @@
             // 
             // CurrentBoxNum
             // 
-            this.CurrentBoxNum.Location = new System.Drawing.Point(194, 274);
+            this.CurrentBoxNum.Location = new System.Drawing.Point(196, 228);
             this.CurrentBoxNum.Margin = new System.Windows.Forms.Padding(6);
             this.CurrentBoxNum.Name = "CurrentBoxNum";
             this.CurrentBoxNum.Size = new System.Drawing.Size(104, 50);
@@ -1671,7 +1717,7 @@
             // 
             this.SingleLabelPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.SingleLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrint.Location = new System.Drawing.Point(154, 354);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(453, 357);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(136, 52);
@@ -1683,10 +1729,8 @@
             // SingleLabelAutoPrint
             // 
             this.SingleLabelAutoPrint.AutoSize = true;
-            this.SingleLabelAutoPrint.Checked = true;
-            this.SingleLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.SingleLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(30, 198);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(36, 204);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -1733,7 +1777,7 @@
             this.CurrentRowOnly.Checked = true;
             this.CurrentRowOnly.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CurrentRowOnly.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CurrentRowOnly.Location = new System.Drawing.Point(174, 202);
+            this.CurrentRowOnly.Location = new System.Drawing.Point(180, 208);
             this.CurrentRowOnly.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.CurrentRowOnly.Name = "CurrentRowOnly";
             this.CurrentRowOnly.Size = new System.Drawing.Size(166, 35);
@@ -1759,7 +1803,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label2.Location = new System.Drawing.Point(22, 254);
+            this.label2.Location = new System.Drawing.Point(28, 260);
             this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(62, 31);
@@ -1783,7 +1827,7 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label5.Location = new System.Drawing.Point(22, 318);
+            this.label5.Location = new System.Drawing.Point(28, 324);
             this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(62, 31);
@@ -1817,7 +1861,7 @@
             this.MidLabelAutoPrint.Checked = true;
             this.MidLabelAutoPrint.CheckState = System.Windows.Forms.CheckState.Checked;
             this.MidLabelAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.MidLabelAutoPrint.Location = new System.Drawing.Point(18, 198);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(24, 204);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(142, 35);
@@ -1869,7 +1913,7 @@
             // 
             this.DiffDetno.AutoSize = true;
             this.DiffDetno.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDetno.Location = new System.Drawing.Point(258, 386);
+            this.DiffDetno.Location = new System.Drawing.Point(264, 392);
             this.DiffDetno.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffDetno.Name = "DiffDetno";
             this.DiffDetno.Size = new System.Drawing.Size(133, 34);
@@ -1881,7 +1925,7 @@
             // 
             this.DiffCPN.AutoSize = true;
             this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffCPN.Location = new System.Drawing.Point(258, 342);
+            this.DiffCPN.Location = new System.Drawing.Point(264, 348);
             this.DiffCPN.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffCPN.Name = "DiffCPN";
             this.DiffCPN.Size = new System.Drawing.Size(135, 34);
@@ -1893,7 +1937,7 @@
             // 
             this.BoxCount.AutoSize = true;
             this.BoxCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.BoxCount.Location = new System.Drawing.Point(270, 382);
+            this.BoxCount.Location = new System.Drawing.Point(276, 388);
             this.BoxCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.BoxCount.Name = "BoxCount";
             this.BoxCount.Size = new System.Drawing.Size(0, 31);
@@ -1903,7 +1947,7 @@
             // 
             this.DiffLotNo.AutoSize = true;
             this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffLotNo.Location = new System.Drawing.Point(258, 294);
+            this.DiffLotNo.Location = new System.Drawing.Point(264, 300);
             this.DiffLotNo.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffLotNo.Name = "DiffLotNo";
             this.DiffLotNo.Size = new System.Drawing.Size(118, 34);
@@ -1915,7 +1959,7 @@
             // 
             this.DiffDC.AutoSize = true;
             this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.DiffDC.Location = new System.Drawing.Point(258, 242);
+            this.DiffDC.Location = new System.Drawing.Point(264, 248);
             this.DiffDC.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.DiffDC.Name = "DiffDC";
             this.DiffDC.Size = new System.Drawing.Size(121, 34);
@@ -1927,7 +1971,7 @@
             // 
             this.OnlyOneRow.AutoSize = true;
             this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 8F);
-            this.OnlyOneRow.Location = new System.Drawing.Point(258, 194);
+            this.OnlyOneRow.Location = new System.Drawing.Point(264, 200);
             this.OnlyOneRow.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.OnlyOneRow.Name = "OnlyOneRow";
             this.OnlyOneRow.Size = new System.Drawing.Size(111, 34);
@@ -1939,7 +1983,7 @@
             // 
             this.AllLabel.AutoSize = true;
             this.AllLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AllLabel.Location = new System.Drawing.Point(26, 198);
+            this.AllLabel.Location = new System.Drawing.Point(32, 204);
             this.AllLabel.Margin = new System.Windows.Forms.Padding(6, 4, 6, 4);
             this.AllLabel.Name = "AllLabel";
             this.AllLabel.Size = new System.Drawing.Size(190, 35);
@@ -1962,7 +2006,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(234, 22);
+            this.LogingOut.Location = new System.Drawing.Point(240, 28);
             this.LogingOut.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(82, 41);
@@ -1990,7 +2034,7 @@
             // 
             this.label10.AutoSize = true;
             this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label10.Location = new System.Drawing.Point(38, 314);
+            this.label10.Location = new System.Drawing.Point(44, 320);
             this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(62, 31);
@@ -2001,7 +2045,7 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label6.Location = new System.Drawing.Point(38, 254);
+            this.label6.Location = new System.Drawing.Point(44, 260);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(62, 31);
@@ -2056,20 +2100,13 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // richTextAutoBottom1
-            // 
-            this.richTextAutoBottom1.Location = new System.Drawing.Point(12, 1461);
-            this.richTextAutoBottom1.Name = "richTextAutoBottom1";
-            this.richTextAutoBottom1.Size = new System.Drawing.Size(2532, 156);
-            this.richTextAutoBottom1.TabIndex = 119;
-            this.richTextAutoBottom1.Text = "";
-            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(2556, 1629);
+            this.Controls.Add(this.MixPrCode);
             this.Controls.Add(this.richTextAutoBottom1);
             this.Controls.Add(this.Connect);
             this.Controls.Add(this.MenuManage);
@@ -2135,6 +2172,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.LabelInf)).EndInit();
             this.SingleLabel.ResumeLayout(true);
             this.SingleLabel.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.CurrentOutBoxNum)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.CurrentBoxNum)).EndInit();
             this.MidLabel.ResumeLayout(true);
             this.MidLabel.PerformLayout();
@@ -2323,5 +2361,8 @@
         private System.Windows.Forms.NumericUpDown CurrentBoxNum;
         private System.Windows.Forms.Label label13;
         private CustomControl.RichText.RichTextAutoBottom richTextAutoBottom1;
+        private System.Windows.Forms.CheckBox MixPrCode;
+        private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.NumericUpDown CurrentOutBoxNum;
     }
 }

UAS-出货标签管理(泽天)/UAS_出货标签管理.cs

@@ -218,7 +218,8 @@ namespace UAS_LabelMachine
             {
                 if (Input.Text == "")
                 {
-                    MessageBox.Show("采集的数据不能为空");
+                    richTextAutoBottom1.AppendText("采集的数据不能为空\n");
+                    receiveClient.Client.Send(Encoding.ASCII.GetBytes("ReadId1|,|NG|,|Y"));
                     return;
                 }
                 CollectInputData();
@@ -278,24 +279,50 @@ namespace UAS_LabelMachine
                         break;
                 }
             }
-            //校验DateCode是否过期
-            if (!CheckDateCode(Data["DATECODE"]))
+            if (Data["PRCODE"] != CurrentPrCode)
             {
-                richTextAutoBottom1.AppendText("物料" + Data["PRCODE"] + "【DateCode】超出校验日期,是否继续\n");
-                Input.SelectAll();
-                receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|NG|,|Y")));
-                return;
+                if (!MixPrCode.Checked)
+                {
+                    richTextAutoBottom1.AppendText("当前采集【物料编号" + Data["PRCODE"] + "】不对应，请重新采集\n");
+                    Input.SelectAll();
+                    receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|NG|,|Y")));
+                    return;
+                }
+                else
+                {
+                    bool FindProd = false;
+                    for (int i = 0; i < GridPrcode.Rows.Count; i++)
+                    {
+                        string prodcode = GridPrcode.Rows[i].Cells["pd_prodcode"].Value.ToString();
+                        string outqty = GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString();
+                        string collectnum = GridPrcode.Rows[i].Cells["collectednum"].Value.ToString();
+                        //判断其他行是否有料可以匹配
+                        if (prodcode == Data["PRCODE"] && decimal.Parse(outqty) > decimal.Parse(collectnum))
+                        {
+                            GridPrcode.Rows[i].Selected = true;
+                            FindProd = true;
+                        }
+                    }
+                    if (!FindProd)
+                    {
+                        richTextAutoBottom1.AppendText("当前采集【物料编号" + Data["PRCODE"] + "】没有需要采集的内容\n");
+                        Input.SelectAll();
+                        receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|NG|,|Y")));
+                        return;
+                    }
+                }
             }
-            if (Data["PRCODE"] != CurrentPrCode)
+            //校验DateCode是否过期
+            if (!CheckDateCode(Data["DATECODE"]))
             {
-                richTextAutoBottom1.AppendText("当前采集【物料编号" + Data["PRCODE"] + "】不对应，请重新采集\n");
+                richTextAutoBottom1.AppendText("物料" + Data["PRCODE"] + "【DateCode】超出校验日期\n");
                 Input.SelectAll();
                 receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|NG|,|Y")));
                 return;
             }
             if (Data["BRAND"] != CurrentBrand)
             {
-                richTextAutoBottom1.AppendText("当前采集【品牌"+ Data["BRAND"] + "】不对应，是否继续采集\n");
+                richTextAutoBottom1.AppendText("当前采集【品牌" + Data["BRAND"] + "】不对应\n");
                 Input.SelectAll();
                 receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|NG|,|Y")));
                 return;
@@ -370,6 +397,7 @@ namespace UAS_LabelMachine
                 if (close != "Yes")
                 {
                     Input.SelectAll();
+                    receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|NG|,|Y")));
                     return;
                 }
             }
@@ -378,7 +406,8 @@ namespace UAS_LabelMachine
             double CollectQty = (collectqty == "" ? 0 : double.Parse(collectqty));
             if (Convert.ToDouble((CollectQty + CollectNum).ToString("0.000")) > Convert.ToDouble(double.Parse(CurrentPrCount).ToString("0.000")))
             {
-                MessageBox.Show("物料" + Data["PRCODE"] + "采集后数量为" + (CollectQty + CollectNum) + ",【超出】本行出货数量" + CurrentPrCount, "提示");
+                richTextAutoBottom1.AppendText("物料" + Data["PRCODE"] + "采集后数量为" + (CollectQty + CollectNum) + ",【超出】本行出货数量" + CurrentPrCount+"\n");
+                receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|NG|,|Y")));
                 Input.SelectAll();
                 return;
             }
@@ -443,10 +472,10 @@ namespace UAS_LabelMachine
             }
             if (SingleLabelAutoPrint.Checked)
             {
-                //thread = new Thread(AutoPrintSingleLabel);
-                //stw = new SetLoadingWindow(thread, "正在打印单盘标签");
-                //BaseUtil.SetFormCenter(stw);
-                //stw.ShowDialog();
+                thread = new Thread(AutoPrintSingleLabel);
+                stw = new SetLoadingWindow(thread, "正在打印单盘标签");
+                BaseUtil.SetFormCenter(stw);
+                stw.ShowDialog();
                 receiveClient.Client.Send(Encoding.ASCII.GetBytes(GetSendCode("ReadId1|,|OK|,|Y")));
             }
             else
@@ -1833,7 +1862,7 @@ namespace UAS_LabelMachine
             if (GridPrcode.SelectedRows.Count > 0)
             {
                 DataGridViewSelectedRowCollection dsc = GridPrcode.SelectedRows;
-                MachineCollectRowIndex = GridPrcode.SelectedRows[0].Index;
+                //MachineCollectRowIndex = GridPrcode.SelectedRows[0].Index;
                 CurrentPrCode = GridPrcode.Rows[dsc[0].Index].Cells["pd_prodcode"].Value.ToString();
                 CurrentZXBZ = GridPrcode.Rows[dsc[0].Index].Cells["pjd_zxbzs_user"].Value.ToString();
                 CurrentUnit = GridPrcode.Rows[dsc[0].Index].Cells["pr_unit"].Value.ToString();
@@ -2515,11 +2544,50 @@ namespace UAS_LabelMachine
                     {
                         pr_code = temp.Split('*')[0];
                     }
-                    bool SendLast = false;
-                    for (int i = 0; i < GridPrcode.Rows.Count; i++)
+                    //如果允许混料的话
+                    if (MixPrCode.Checked)
+                    {
+                        bool SendLast = false;
+                        for (int i = 0; i < GridPrcode.Rows.Count; i++)
+                        {
+                            //获取复核的数据
+                            int checknum = int.Parse(GridPrcode.Rows[i].Cells["checknum"].Value.ToString());
+                            double outqty = double.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString());
+                            double zxbzs = double.Parse(GridPrcode.Rows[i].Cells["PJD_ZXBZS_USER"].Value.ToString());
+                            string Prcode = GridPrcode.Rows[i].Cells["pd_prodcode"].Value.ToString();
+                            string pdno = GridPrcode.Rows[i].Cells["pd_pdno"].Value.ToString();
+                            if (checknum < outqty / zxbzs)
+                            {
+                                checknum = checknum + 1;
+                                GridPrcode.Rows[i].Cells["checknum"].Value = checknum;
+                                dh.ExecuteSql("update CS$InoutPrcode set checknum=nvl(checknum,0)+1 where pd_inoutno='" + pi_inoutno.Text + "' and pd_pdno='" + pdno + "' and combined=" + combined, "update");
+                                if (i == GridPrcode.Rows.Count - 1 && checknum == outqty / zxbzs)
+                                    SendLast = true;
+                                break;
+                            }
+                        }
+                        if (PassTenCount == MidboxCapacity.Value)
+                        {
+                            Console.WriteLine("ReadId3|,|OK|,|1");
+                            sendClient.Client.Send(Encoding.ASCII.GetBytes("ReadId3|,|OK|,|1"));
+                            PassTenCount = 0;
+                        }
+                        else
+                        {
+                            if (SendLast)
+                            {
+                                sendClient.Client.Send(Encoding.ASCII.GetBytes("ReadId3|,|OK|,|1"));
+                            }
+                            else
+                            {
+                                sendClient.Client.Send(Encoding.ASCII.GetBytes("ReadId3|,|OK|,|0"));
+                            }
+                        }
+                    }
+                    else
                     {
-                        //采集哪行复核哪行
-                        if (i == MachineCollectRowIndex)
+                        bool SendLast = false;
+                        for (int i = 0; i < GridPrcode.Rows.Count; i++)
                         {
                             //获取复核的数据
                             int checknum = int.Parse(GridPrcode.Rows[i].Cells["checknum"].Value.ToString());
@@ -2546,20 +2614,21 @@ namespace UAS_LabelMachine
                                 break;
                             }
                         }
-                    }
-                    //DataGridViewSelectedRowCollection selectrow = GridPrcode.SelectedRows;
-                    //达到了中盒容量之后
-                    if (PassTenCount == MidboxCapacity.Value)
-                    {
-                        sendClient.Client.Send(Encoding.ASCII.GetBytes("ReadId3|,|OK|,|1"));
-                        PassTenCount = 0;
-                    }
-                    else
-                    {
-                        //如果发送了最后一盒，则不发送继续堆叠的指令
-                        if (!SendLast)
+                        //达到了中盒容量之后
+                        if (PassTenCount == MidboxCapacity.Value)
+                        {
+                            Console.WriteLine("ReadId3|,|OK|,|1");
+                            sendClient.Client.Send(Encoding.ASCII.GetBytes("ReadId3|,|OK|,|1"));
+                            PassTenCount = 0;
+                        }
+                        else
                         {
-                            sendClient.Client.Send(Encoding.ASCII.GetBytes("ReadId3|,|OK|,|0"));
+                            //如果发送了最后一盒，则不发送继续堆叠的指令
+                            if (!SendLast)
+                            {
+                                Console.WriteLine("ReadId3|,|OK|,|0");
+                                sendClient.Client.Send(Encoding.ASCII.GetBytes("ReadId3|,|OK|,|0"));
+                            }
                         }
                     }
                     CurrentBoxNum.Value = PassTenCount;