Merge branch 'master' of ssh://10.10.100.21/source/mes-client

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

@@ -168,6 +168,7 @@
             this.MidLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.MidLabelCombox = new System.Windows.Forms.ComboBox();
             this.OutBoxLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.DiffCPN = new System.Windows.Forms.CheckBox();
             this.BoxCount = new System.Windows.Forms.Label();
             this.DiffLotNo = new System.Windows.Forms.CheckBox();
             this.DiffDC = new System.Windows.Forms.CheckBox();
@@ -182,7 +183,6 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.DiffCPN = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.groupBoxWithBorder2.SuspendLayout();
@@ -814,7 +814,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(7, 32);
+            this.Weight.Location = new System.Drawing.Point(6, 31);
             this.Weight.Name = "Weight";
             this.Weight.Size = new System.Drawing.Size(0, 52);
             this.Weight.TabIndex = 113;
@@ -1049,7 +1049,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(66, 124);
+            this.label18.Location = new System.Drawing.Point(65, 123);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(13, 17);
             this.label18.TabIndex = 90;
@@ -1083,7 +1083,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(64, 60);
+            this.label16.Location = new System.Drawing.Point(63, 59);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(13, 17);
             this.label16.TabIndex = 87;
@@ -1117,7 +1117,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(8, 90);
+            this.label12.Location = new System.Drawing.Point(7, 89);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(56, 17);
             this.label12.TabIndex = 77;
@@ -1127,7 +1127,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(6, 28);
+            this.label7.Location = new System.Drawing.Point(5, 27);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(56, 17);
             this.label7.TabIndex = 76;
@@ -1434,7 +1434,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(26, 176);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(-3, 175);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1449,7 +1449,7 @@
             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(12, 96);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(11, 95);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1496,7 +1496,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(84, 97);
+            this.CurrentRowOnly.Location = new System.Drawing.Point(83, 96);
             this.CurrentRowOnly.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CurrentRowOnly.Name = "CurrentRowOnly";
             this.CurrentRowOnly.Size = new System.Drawing.Size(87, 21);
@@ -1522,7 +1522,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(8, 124);
+            this.label2.Location = new System.Drawing.Point(7, 123);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(32, 17);
             this.label2.TabIndex = 92;
@@ -1545,7 +1545,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(8, 156);
+            this.label5.Location = new System.Drawing.Point(7, 155);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(32, 17);
             this.label5.TabIndex = 50;
@@ -1578,7 +1578,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(6, 96);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(5, 95);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1625,11 +1625,23 @@
             this.OutBoxLabel.TabStop = false;
             this.OutBoxLabel.Text = "外箱标签";
             // 
+            // DiffCPN
+            // 
+            this.DiffCPN.AutoSize = true;
+            this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 8F);
+            this.DiffCPN.Location = new System.Drawing.Point(124, 166);
+            this.DiffCPN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.DiffCPN.Name = "DiffCPN";
+            this.DiffCPN.Size = new System.Drawing.Size(72, 20);
+            this.DiffCPN.TabIndex = 98;
+            this.DiffCPN.Text = "区分CPN";
+            this.DiffCPN.UseVisualStyleBackColor = true;
+            // 
             // BoxCount
             // 
             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(7, 182);
+            this.BoxCount.Location = new System.Drawing.Point(130, 186);
             this.BoxCount.Name = "BoxCount";
             this.BoxCount.Size = new System.Drawing.Size(0, 17);
             this.BoxCount.TabIndex = 97;
@@ -1637,11 +1649,11 @@
             // DiffLotNo
             // 
             this.DiffLotNo.AutoSize = true;
-            this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.DiffLotNo.Location = new System.Drawing.Point(125, 148);
+            this.DiffLotNo.Font = new System.Drawing.Font("微软雅黑", 8F);
+            this.DiffLotNo.Location = new System.Drawing.Point(124, 142);
             this.DiffLotNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.DiffLotNo.Name = "DiffLotNo";
-            this.DiffLotNo.Size = new System.Drawing.Size(67, 21);
+            this.DiffLotNo.Size = new System.Drawing.Size(64, 20);
             this.DiffLotNo.TabIndex = 96;
             this.DiffLotNo.Text = "区分LN";
             this.DiffLotNo.UseVisualStyleBackColor = true;
@@ -1649,11 +1661,11 @@
             // DiffDC
             // 
             this.DiffDC.AutoSize = true;
-            this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.DiffDC.Location = new System.Drawing.Point(125, 121);
+            this.DiffDC.Font = new System.Drawing.Font("微软雅黑", 8F);
+            this.DiffDC.Location = new System.Drawing.Point(124, 116);
             this.DiffDC.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.DiffDC.Name = "DiffDC";
-            this.DiffDC.Size = new System.Drawing.Size(68, 21);
+            this.DiffDC.Size = new System.Drawing.Size(64, 20);
             this.DiffDC.TabIndex = 95;
             this.DiffDC.Text = "区分DC";
             this.DiffDC.UseVisualStyleBackColor = true;
@@ -1661,11 +1673,11 @@
             // OnlyOneRow
             // 
             this.OnlyOneRow.AutoSize = true;
-            this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OnlyOneRow.Location = new System.Drawing.Point(125, 96);
+            this.OnlyOneRow.Font = new System.Drawing.Font("微软雅黑", 8F);
+            this.OnlyOneRow.Location = new System.Drawing.Point(124, 92);
             this.OnlyOneRow.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OnlyOneRow.Name = "OnlyOneRow";
-            this.OnlyOneRow.Size = new System.Drawing.Size(63, 21);
+            this.OnlyOneRow.Size = new System.Drawing.Size(60, 20);
             this.OnlyOneRow.TabIndex = 94;
             this.OnlyOneRow.Text = "仅单行";
             this.OnlyOneRow.UseVisualStyleBackColor = true;
@@ -1674,7 +1686,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(10, 96);
+            this.AllLabel.Location = new System.Drawing.Point(9, 95);
             this.AllLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AllLabel.Name = "AllLabel";
             this.AllLabel.Size = new System.Drawing.Size(99, 21);
@@ -1685,7 +1697,7 @@
             // AddNewOutBox
             // 
             this.AddNewOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AddNewOutBox.Location = new System.Drawing.Point(3, 178);
+            this.AddNewOutBox.Location = new System.Drawing.Point(9, 177);
             this.AddNewOutBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AddNewOutBox.Name = "AddNewOutBox";
             this.AddNewOutBox.Size = new System.Drawing.Size(51, 26);
@@ -1697,7 +1709,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(114, 8);
+            this.LogingOut.Location = new System.Drawing.Point(113, 7);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(42, 21);
             this.LogingOut.TabIndex = 77;
@@ -1724,7 +1736,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(16, 153);
+            this.label10.Location = new System.Drawing.Point(15, 152);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(32, 17);
             this.label10.TabIndex = 90;
@@ -1734,7 +1746,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(16, 124);
+            this.label6.Location = new System.Drawing.Point(15, 123);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(32, 17);
             this.label6.TabIndex = 87;
@@ -1788,18 +1800,6 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // DiffCPN
-            // 
-            this.DiffCPN.AutoSize = true;
-            this.DiffCPN.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.DiffCPN.Location = new System.Drawing.Point(125, 177);
-            this.DiffCPN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.DiffCPN.Name = "DiffCPN";
-            this.DiffCPN.Size = new System.Drawing.Size(76, 21);
-            this.DiffCPN.TabIndex = 98;
-            this.DiffCPN.Text = "区分CPN";
-            this.DiffCPN.UseVisualStyleBackColor = true;
-            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

UAS-出货标签管理(贸易版)/CustomControl/Pagination.cs

@@ -254,7 +254,7 @@ namespace UAS_LabelMachine.CustomControl
                 string FolderPath = folderBrowserDialog1.SelectedPath;
                 ExcelHandler eh = new ExcelHandler();
                 //导出Excel的时候返回一个文件名，用户选择是否打开
-                string filePath = eh.ExportExcel(BaseUtil.GetExportDataTable(Dgv), BaseUtil.GetExportDataTable(Dgv), FolderPath, "客户标签","",100,false);
+                string filePath = eh.ExportExcel(BaseUtil.GetExportDataTable(Dgv), BaseUtil.GetExportDataTable(Dgv), FolderPath, "客户标签","",100,null);
                 //用户选择导出之后是否立即打开
                 MessageBoxButtons messButton = MessageBoxButtons.YesNo;
                 string openFile = MessageBox.Show(this.ParentForm, "是否打开文件", "提示", messButton).ToString();

UAS-出货标签管理(贸易版)/ExportExcel.Designer.cs

@@ -49,15 +49,18 @@
             this.FixRow = new System.Windows.Forms.RadioButton();
             this.label7 = new System.Windows.Forms.Label();
             this.FirstPage_WID = new System.Windows.Forms.CheckBox();
-            this.RowNum = new UAS_LabelMachine.CustomControl.NumOnlyTextBox();
             this.ExportFileDialog = new System.Windows.Forms.FolderBrowserDialog();
+            this.FirstPage_YIELD = new System.Windows.Forms.CheckBox();
+            this.FirstPage_REMARK = new System.Windows.Forms.CheckBox();
+            this.RowNum = new UAS_LabelMachine.CustomControl.NumOnlyTextBox();
             this.SuspendLayout();
             // 
             // Export
             // 
-            this.Export.Location = new System.Drawing.Point(479, 576);
+            this.Export.Location = new System.Drawing.Point(240, 288);
+            this.Export.Margin = new System.Windows.Forms.Padding(2);
             this.Export.Name = "Export";
-            this.Export.Size = new System.Drawing.Size(189, 49);
+            this.Export.Size = new System.Drawing.Size(94, 24);
             this.Export.TabIndex = 0;
             this.Export.Text = "导出";
             this.Export.UseVisualStyleBackColor = true;
@@ -69,9 +72,10 @@
             this.CH_BLUEFILM.Checked = true;
             this.CH_BLUEFILM.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_BLUEFILM.Font = new System.Drawing.Font("宋体", 10F);
-            this.CH_BLUEFILM.Location = new System.Drawing.Point(259, 115);
+            this.CH_BLUEFILM.Location = new System.Drawing.Point(130, 58);
+            this.CH_BLUEFILM.Margin = new System.Windows.Forms.Padding(2);
             this.CH_BLUEFILM.Name = "CH_BLUEFILM";
-            this.CH_BLUEFILM.Size = new System.Drawing.Size(125, 31);
+            this.CH_BLUEFILM.Size = new System.Drawing.Size(68, 18);
             this.CH_BLUEFILM.TabIndex = 1;
             this.CH_BLUEFILM.Text = "蓝膜号";
             this.CH_BLUEFILM.UseVisualStyleBackColor = true;
@@ -82,9 +86,10 @@
             this.CH_SPLITBATCH.Checked = true;
             this.CH_SPLITBATCH.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_SPLITBATCH.Font = new System.Drawing.Font("宋体", 10F);
-            this.CH_SPLITBATCH.Location = new System.Drawing.Point(701, 115);
+            this.CH_SPLITBATCH.Location = new System.Drawing.Point(350, 58);
+            this.CH_SPLITBATCH.Margin = new System.Windows.Forms.Padding(2);
             this.CH_SPLITBATCH.Name = "CH_SPLITBATCH";
-            this.CH_SPLITBATCH.Size = new System.Drawing.Size(152, 31);
+            this.CH_SPLITBATCH.Size = new System.Drawing.Size(82, 18);
             this.CH_SPLITBATCH.TabIndex = 3;
             this.CH_SPLITBATCH.Text = "扩散批号";
             this.CH_SPLITBATCH.UseVisualStyleBackColor = true;
@@ -95,9 +100,10 @@
             this.CH_PBCODE.Checked = true;
             this.CH_PBCODE.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_PBCODE.Font = new System.Drawing.Font("宋体", 10F);
-            this.CH_PBCODE.Location = new System.Drawing.Point(259, 189);
+            this.CH_PBCODE.Location = new System.Drawing.Point(130, 94);
+            this.CH_PBCODE.Margin = new System.Windows.Forms.Padding(2);
             this.CH_PBCODE.Name = "CH_PBCODE";
-            this.CH_PBCODE.Size = new System.Drawing.Size(98, 31);
+            this.CH_PBCODE.Size = new System.Drawing.Size(54, 18);
             this.CH_PBCODE.TabIndex = 8;
             this.CH_PBCODE.Text = "盒号";
             this.CH_PBCODE.UseVisualStyleBackColor = true;
@@ -108,9 +114,10 @@
             this.CH_REMARK.Checked = true;
             this.CH_REMARK.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_REMARK.Font = new System.Drawing.Font("宋体", 10F);
-            this.CH_REMARK.Location = new System.Drawing.Point(487, 189);
+            this.CH_REMARK.Location = new System.Drawing.Point(244, 94);
+            this.CH_REMARK.Margin = new System.Windows.Forms.Padding(2);
             this.CH_REMARK.Name = "CH_REMARK";
-            this.CH_REMARK.Size = new System.Drawing.Size(152, 31);
+            this.CH_REMARK.Size = new System.Drawing.Size(82, 18);
             this.CH_REMARK.TabIndex = 9;
             this.CH_REMARK.Text = "芯片备注";
             this.CH_REMARK.UseVisualStyleBackColor = true;
@@ -121,9 +128,10 @@
             this.ch_code.Checked = true;
             this.ch_code.CheckState = System.Windows.Forms.CheckState.Checked;
             this.ch_code.Font = new System.Drawing.Font("宋体", 10F);
-            this.ch_code.Location = new System.Drawing.Point(487, 115);
+            this.ch_code.Location = new System.Drawing.Point(244, 58);
+            this.ch_code.Margin = new System.Windows.Forms.Padding(2);
             this.ch_code.Name = "ch_code";
-            this.ch_code.Size = new System.Drawing.Size(125, 31);
+            this.ch_code.Size = new System.Drawing.Size(68, 18);
             this.ch_code.TabIndex = 10;
             this.ch_code.Text = "芯片号";
             this.ch_code.UseVisualStyleBackColor = true;
@@ -134,9 +142,10 @@
             this.CH_WATERID.Checked = true;
             this.CH_WATERID.CheckState = System.Windows.Forms.CheckState.Checked;
             this.CH_WATERID.Font = new System.Drawing.Font("宋体", 10F);
-            this.CH_WATERID.Location = new System.Drawing.Point(905, 115);
+            this.CH_WATERID.Location = new System.Drawing.Point(452, 58);
+            this.CH_WATERID.Margin = new System.Windows.Forms.Padding(2);
             this.CH_WATERID.Name = "CH_WATERID";
-            this.CH_WATERID.Size = new System.Drawing.Size(156, 31);
+            this.CH_WATERID.Size = new System.Drawing.Size(82, 18);
             this.CH_WATERID.TabIndex = 11;
             this.CH_WATERID.Text = "Wafer_ID";
             this.CH_WATERID.UseVisualStyleBackColor = true;
@@ -145,9 +154,10 @@
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("宋体", 10F);
-            this.label1.Location = new System.Drawing.Point(22, 52);
+            this.label1.Location = new System.Drawing.Point(11, 26);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(120, 27);
+            this.label1.Size = new System.Drawing.Size(63, 14);
             this.label1.TabIndex = 12;
             this.label1.Text = "打印选项";
             // 
@@ -155,9 +165,10 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("宋体", 10F);
-            this.label2.Location = new System.Drawing.Point(22, 119);
+            this.label2.Location = new System.Drawing.Point(11, 60);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(215, 27);
+            this.label2.Size = new System.Drawing.Size(112, 14);
             this.label2.TabIndex = 13;
             this.label2.Text = "请选择打印内容:";
             // 
@@ -165,9 +176,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 10F);
-            this.label3.Location = new System.Drawing.Point(22, 261);
+            this.label3.Location = new System.Drawing.Point(11, 130);
+            this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(216, 27);
+            this.label3.Size = new System.Drawing.Size(112, 14);
             this.label3.TabIndex = 14;
             this.label3.Text = "参数选择(机测):";
             // 
@@ -175,9 +187,10 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("宋体", 10F);
-            this.label4.Location = new System.Drawing.Point(22, 351);
+            this.label4.Location = new System.Drawing.Point(11, 176);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(216, 27);
+            this.label4.Size = new System.Drawing.Size(112, 14);
             this.label4.TabIndex = 15;
             this.label4.Text = "参数选择(手测):";
             // 
@@ -187,9 +200,10 @@
             this.BVCEO.Checked = true;
             this.BVCEO.CheckState = System.Windows.Forms.CheckState.Checked;
             this.BVCEO.Font = new System.Drawing.Font("宋体", 10F);
-            this.BVCEO.Location = new System.Drawing.Point(487, 347);
+            this.BVCEO.Location = new System.Drawing.Point(244, 174);
+            this.BVCEO.Margin = new System.Windows.Forms.Padding(2);
             this.BVCEO.Name = "BVCEO";
-            this.BVCEO.Size = new System.Drawing.Size(114, 31);
+            this.BVCEO.Size = new System.Drawing.Size(61, 18);
             this.BVCEO.TabIndex = 17;
             this.BVCEO.Text = "BVCEO";
             this.BVCEO.UseVisualStyleBackColor = true;
@@ -200,9 +214,10 @@
             this.TS.Checked = true;
             this.TS.CheckState = System.Windows.Forms.CheckState.Checked;
             this.TS.Font = new System.Drawing.Font("宋体", 10F);
-            this.TS.Location = new System.Drawing.Point(259, 347);
+            this.TS.Location = new System.Drawing.Point(130, 174);
+            this.TS.Margin = new System.Windows.Forms.Padding(2);
             this.TS.Name = "TS";
-            this.TS.Size = new System.Drawing.Size(72, 31);
+            this.TS.Size = new System.Drawing.Size(40, 18);
             this.TS.TabIndex = 18;
             this.TS.Text = "TS";
             this.TS.UseVisualStyleBackColor = true;
@@ -213,9 +228,10 @@
             this.percent.Checked = true;
             this.percent.CheckState = System.Windows.Forms.CheckState.Checked;
             this.percent.Font = new System.Drawing.Font("宋体", 10F);
-            this.percent.Location = new System.Drawing.Point(259, 257);
+            this.percent.Location = new System.Drawing.Point(130, 128);
+            this.percent.Margin = new System.Windows.Forms.Padding(2);
             this.percent.Name = "percent";
-            this.percent.Size = new System.Drawing.Size(86, 31);
+            this.percent.Size = new System.Drawing.Size(47, 18);
             this.percent.TabIndex = 19;
             this.percent.Text = "HFS";
             this.percent.UseVisualStyleBackColor = true;
@@ -224,9 +240,10 @@
             // 
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("宋体", 10F);
-            this.label5.Location = new System.Drawing.Point(22, 508);
+            this.label5.Location = new System.Drawing.Point(11, 254);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(188, 27);
+            this.label5.Size = new System.Drawing.Size(98, 14);
             this.label5.TabIndex = 20;
             this.label5.Text = "首页打印方式:";
             // 
@@ -234,9 +251,10 @@
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("宋体", 10F);
-            this.label6.Location = new System.Drawing.Point(22, 433);
+            this.label6.Location = new System.Drawing.Point(11, 216);
+            this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(188, 27);
+            this.label6.Size = new System.Drawing.Size(98, 14);
             this.label6.TabIndex = 21;
             this.label6.Text = "打印分页方式:";
             // 
@@ -244,9 +262,10 @@
             // 
             this.BatchCode.AutoSize = true;
             this.BatchCode.Font = new System.Drawing.Font("宋体", 10F);
-            this.BatchCode.Location = new System.Drawing.Point(259, 431);
+            this.BatchCode.Location = new System.Drawing.Point(130, 216);
+            this.BatchCode.Margin = new System.Windows.Forms.Padding(2);
             this.BatchCode.Name = "BatchCode";
-            this.BatchCode.Size = new System.Drawing.Size(124, 31);
+            this.BatchCode.Size = new System.Drawing.Size(67, 18);
             this.BatchCode.TabIndex = 22;
             this.BatchCode.Text = "扩散批";
             this.BatchCode.UseVisualStyleBackColor = true;
@@ -255,9 +274,10 @@
             // 
             this.BoxCode.AutoSize = true;
             this.BoxCode.Font = new System.Drawing.Font("宋体", 10F);
-            this.BoxCode.Location = new System.Drawing.Point(445, 431);
+            this.BoxCode.Location = new System.Drawing.Point(222, 216);
+            this.BoxCode.Margin = new System.Windows.Forms.Padding(2);
             this.BoxCode.Name = "BoxCode";
-            this.BoxCode.Size = new System.Drawing.Size(97, 31);
+            this.BoxCode.Size = new System.Drawing.Size(53, 18);
             this.BoxCode.TabIndex = 23;
             this.BoxCode.Text = "盒号";
             this.BoxCode.UseVisualStyleBackColor = true;
@@ -267,9 +287,10 @@
             this.FixRow.AutoSize = true;
             this.FixRow.Checked = true;
             this.FixRow.Font = new System.Drawing.Font("宋体", 10F);
-            this.FixRow.Location = new System.Drawing.Point(611, 431);
+            this.FixRow.Location = new System.Drawing.Point(306, 216);
+            this.FixRow.Margin = new System.Windows.Forms.Padding(2);
             this.FixRow.Name = "FixRow";
-            this.FixRow.Size = new System.Drawing.Size(151, 31);
+            this.FixRow.Size = new System.Drawing.Size(81, 18);
             this.FixRow.TabIndex = 24;
             this.FixRow.TabStop = true;
             this.FixRow.Text = "固定行号";
@@ -279,37 +300,68 @@
             // 
             this.label7.AutoSize = true;
             this.label7.Font = new System.Drawing.Font("宋体", 10F);
-            this.label7.Location = new System.Drawing.Point(810, 431);
+            this.label7.Location = new System.Drawing.Point(405, 216);
+            this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(134, 27);
+            this.label7.Size = new System.Drawing.Size(70, 14);
             this.label7.TabIndex = 25;
             this.label7.Text = "分页行数:";
             // 
             // FirstPage_WID
             // 
             this.FirstPage_WID.AutoSize = true;
+            this.FirstPage_WID.Checked = true;
+            this.FirstPage_WID.CheckState = System.Windows.Forms.CheckState.Checked;
             this.FirstPage_WID.Font = new System.Drawing.Font("宋体", 10F);
-            this.FirstPage_WID.Location = new System.Drawing.Point(259, 508);
+            this.FirstPage_WID.Location = new System.Drawing.Point(130, 254);
+            this.FirstPage_WID.Margin = new System.Windows.Forms.Padding(2);
             this.FirstPage_WID.Name = "FirstPage_WID";
-            this.FirstPage_WID.Size = new System.Drawing.Size(210, 31);
+            this.FirstPage_WID.Size = new System.Drawing.Size(110, 18);
             this.FirstPage_WID.TabIndex = 29;
             this.FirstPage_WID.Text = "打印Wafer id";
             this.FirstPage_WID.UseVisualStyleBackColor = true;
             // 
+            // FirstPage_YIELD
+            // 
+            this.FirstPage_YIELD.AutoSize = true;
+            this.FirstPage_YIELD.Font = new System.Drawing.Font("宋体", 10F);
+            this.FirstPage_YIELD.Location = new System.Drawing.Point(244, 254);
+            this.FirstPage_YIELD.Margin = new System.Windows.Forms.Padding(2);
+            this.FirstPage_YIELD.Name = "FirstPage_YIELD";
+            this.FirstPage_YIELD.Size = new System.Drawing.Size(54, 18);
+            this.FirstPage_YIELD.TabIndex = 31;
+            this.FirstPage_YIELD.Text = "良率";
+            this.FirstPage_YIELD.UseVisualStyleBackColor = true;
+            // 
+            // FirstPage_REMARK
+            // 
+            this.FirstPage_REMARK.AutoSize = true;
+            this.FirstPage_REMARK.Font = new System.Drawing.Font("宋体", 10F);
+            this.FirstPage_REMARK.Location = new System.Drawing.Point(304, 254);
+            this.FirstPage_REMARK.Margin = new System.Windows.Forms.Padding(2);
+            this.FirstPage_REMARK.Name = "FirstPage_REMARK";
+            this.FirstPage_REMARK.Size = new System.Drawing.Size(54, 18);
+            this.FirstPage_REMARK.TabIndex = 32;
+            this.FirstPage_REMARK.Text = "备注";
+            this.FirstPage_REMARK.UseVisualStyleBackColor = true;
+            // 
             // RowNum
             // 
-            this.RowNum.Location = new System.Drawing.Point(961, 431);
+            this.RowNum.Location = new System.Drawing.Point(480, 216);
+            this.RowNum.Margin = new System.Windows.Forms.Padding(2);
             this.RowNum.Name = "RowNum";
             this.RowNum.Negative = false;
-            this.RowNum.Size = new System.Drawing.Size(100, 35);
+            this.RowNum.Size = new System.Drawing.Size(52, 21);
             this.RowNum.TabIndex = 30;
             this.RowNum.Text = "10";
             // 
             // ExportExcel
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1144, 675);
+            this.ClientSize = new System.Drawing.Size(572, 338);
+            this.Controls.Add(this.FirstPage_REMARK);
+            this.Controls.Add(this.FirstPage_YIELD);
             this.Controls.Add(this.RowNum);
             this.Controls.Add(this.FirstPage_WID);
             this.Controls.Add(this.label7);
@@ -332,6 +384,7 @@
             this.Controls.Add(this.CH_SPLITBATCH);
             this.Controls.Add(this.CH_BLUEFILM);
             this.Controls.Add(this.Export);
+            this.Margin = new System.Windows.Forms.Padding(2);
             this.Name = "ExportExcel";
             this.Text = "导出数据";
             this.Load += new System.EventHandler(this.ExportExcel_Load);
@@ -365,5 +418,7 @@
         private System.Windows.Forms.CheckBox FirstPage_WID;
         private CustomControl.NumOnlyTextBox RowNum;
         private System.Windows.Forms.FolderBrowserDialog ExportFileDialog;
+        private System.Windows.Forms.CheckBox FirstPage_YIELD;
+        private System.Windows.Forms.CheckBox FirstPage_REMARK;
     }
 }

UAS-出货标签管理(贸易版)/ExportExcel.cs

@@ -27,10 +27,11 @@ namespace UAS_LabelMachine
         {
             ExportFileDialog.Description = "选择导出的路径";
             DialogResult result = ExportFileDialog.ShowDialog();
+            string custcode = dh.getFieldDataByCondition("prodinout", "pi_cardcode", "pi_inoutno='" + inoutno + "'").ToString();
             if (result == DialogResult.OK)
             {
                 StringBuilder sql = new StringBuilder();
-                string SqlField = "";
+                List<CheckBox> conditionbox = new List<CheckBox>();
                 if (!CH_PBCODE.Checked && BoxCode.Checked)
                 {
                     MessageBox.Show("勾选盒号分页，打印内容请勾选盒号");
@@ -41,43 +42,18 @@ namespace UAS_LabelMachine
                     MessageBox.Show("勾选扩撒批分页，打印内容请勾选扩撒批号");
                     return;
                 }
-                if (CH_BLUEFILM.Checked)
-                {
-                    SqlField += "CH_BLUEFILM " + CH_BLUEFILM.Text + ",";
-                }
-                if (CH_PBCODE.Checked)
-                {
-                    SqlField += "CH_PBCODE " + CH_PBCODE.Text + ",";
-                }
-                if (CH_REMARK.Checked)
-                {
-                    SqlField += "CH_REMARK " + CH_REMARK.Text + ",";
-                }
-                if (CH_SPLITBATCH.Checked)
-                {
-                    SqlField += "CH_SPLITBATCH " + CH_SPLITBATCH.Text + ",";
-                }
-                if (CH_WATERID.Checked)
-                {
-                    SqlField += "CH_WATERID " + CH_WATERID.Text + ",";
-                }
-                if (ch_code.Checked)
-                {
-                    SqlField += "ch_code " + ch_code.Text + ",";
-                }
-                if (percent.Checked)
-                {
-                    SqlField += "chw_percent1,chw_percent2,chw_itemname1,chw_itemname2,";
-                }
-                if (TS.Checked)
-                {
-                    SqlField += "TS1,TS2,TS3,";
-                }
-                if (BVCEO.Checked)
-                {
-                    SqlField += "BVCEO1,BVCEO2,BVCEO3,";
-                }
-                SqlField += "pd_ordercode,pr_spec,";
+                conditionbox.Add(CH_BLUEFILM);
+                conditionbox.Add(CH_PBCODE);
+                conditionbox.Add(CH_REMARK);
+                conditionbox.Add(CH_SPLITBATCH);
+                conditionbox.Add(CH_WATERID);
+                conditionbox.Add(ch_code);
+                conditionbox.Add(percent);
+                conditionbox.Add(TS);
+                conditionbox.Add(BVCEO);
+                conditionbox.Add(FirstPage_WID);
+                conditionbox.Add(FirstPage_YIELD);
+                conditionbox.Add(FirstPage_REMARK);
                 string SplitType = "";
                 if (FixRow.Checked)
                 {
@@ -91,20 +67,61 @@ namespace UAS_LabelMachine
                 {
                     SplitType = BoxCode.Name;
                 }
-
+                DataTable SQL1_ = (DataTable)dh.ExecuteSql("select es_filed,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='DataPage' and es_enable=-1 and es_custcode='" + custcode + "' order by es_detno", "select");
+                //没有置顶客户的取空的
+                if (SQL1_.Rows.Count == 0)
+                {
+                    SQL1_ = (DataTable)dh.ExecuteSql("select es_filed,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='DataPage' and es_enable=-1 and es_custcode is null order by es_detno", "select");
+                }
+                string es_field1 = "";
+                for (int i = 0; i < SQL1_.Rows.Count; i++)
+                {
+                    es_field1 += SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString() + ",";
+                }
                 //分页信息的DataTable
                 sql.Clear();
-                sql.Append("select '客户:'||pi_title,'出货单号:'||pi_inoutno,'型号'||pr_spec||' 销售类型:市场部','销售日期:'||pi_date,rownum 序号,io_qty,");
-                sql.Append("" + SqlField.Substring(0, SqlField.Length - 1) + " from  prodinout left join prodiodetail on pi_id=pd_piid left join chip_in_out ");
-                sql.Append("on pd_id=io_pdid left join chip on ch_code=io_chipcode left join CHIP_WAFERTEST_VIEW on ch_code=chw_chipcode ");
+                sql.Append("select " + es_field1.Substring(0, es_field1.Length - 1) + " from  prodinout left join prodiodetail on pi_id=pd_piid left join ");
+                sql.Append("chip_in_out on pd_id=io_pdid left join chip on ch_code=io_chipcode left join CHIP_WAFERTEST_VIEW on ch_code=chw_chipcode ");
                 sql.Append("left join CHIP_EDCDATA_VIEW on che_chipcode=ch_code left join product on pr_code=pd_prodcode where pi_inoutno='" + inoutno + "' order by io_detno");
                 DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
+
+                for (int i = 0; i < dt.Columns.Count; i++)
+                {
+                    if (dt.Columns[i].ColumnName == (SQL1_.Rows[i]["es_prefix"].ToString() + "||" + SQL1_.Rows[i]["es_filed"].ToString() + "||" + SQL1_.Rows[i]["es_suffix"].ToString()).ToUpper())
+                    {
+                        dt.Columns[i].ColumnName = SQL1_.Rows[i]["es_filed1"].ToString();
+                        dt.Columns[i].Caption = SQL1_.Rows[i]["es_caption"].ToString();
+                    }
+                }
+
+                //获取首页需要展示的字段
+                DataTable SQL_ = (DataTable)dh.ExecuteSql("select es_filed,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='First' and es_enable=-1 and es_custcode='" + custcode + "' order by es_detno", "select");
+                if (SQL_.Rows.Count == 0)
+                {
+                    SQL_ = (DataTable)dh.ExecuteSql("select es_filed,es_caption,es_prefix,es_suffix,es_filed1 from CS_EXPORTSETTING where es_type='First' and es_enable=-1 and es_custcode is null order by es_detno", "select");
+                }
+                string es_field = "";
+                for (int i = 0; i < SQL_.Rows.Count; i++)
+                {
+                    es_field += SQL_.Rows[i]["es_prefix"].ToString() + "||" + SQL_.Rows[i]["es_filed"].ToString() + "||" + SQL_.Rows[i]["es_suffix"].ToString() + ",";
+                }
                 //首页信息的DataTable
                 sql.Clear();
-                sql.Append("select '客户:'||pi_title 客户,'出货单号:'||pi_inoutno 出货单号,'型号'||pr_spec||' 销售类型:市场部' 型号,");
-                sql.Append("'销售日期:'||pi_date 销售日期,pd_ordercode,pr_spec,ch_splitbatch,ch_waterid,num,io_qty from FIRSTPAGE_BATCH_VIEW where pi_inoutno='" + inoutno + "'");
+                sql.Append("select " + es_field.Substring(0, es_field.Length - 1) + "  from FIRSTPAGE_BATCH_VIEW where pi_inoutno='" + inoutno + "'");
                 DataTable dt1 = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
-                eh.ExportExcel(dt1, dt, ExportFileDialog.SelectedPath, inoutno, SplitType, int.Parse(RowNum.Text), FirstPage_WID.Checked);
+                for (int i = 0; i < dt1.Columns.Count; i++)
+                {
+                    if (dt1.Columns[i].ColumnName == (SQL_.Rows[i]["es_prefix"].ToString() + "||" + SQL_.Rows[i]["es_filed"].ToString() + "||" + SQL_.Rows[i]["es_suffix"].ToString()).ToUpper())
+                    {
+                        dt1.Columns[i].ColumnName = SQL_.Rows[i]["es_filed1"].ToString();
+                        dt1.Columns[i].Caption = SQL_.Rows[i]["es_caption"].ToString();
+                    }
+                }
+                eh.ExportExcel(dt1, dt, ExportFileDialog.SelectedPath, inoutno, SplitType, int.Parse(RowNum.Text), conditionbox);
+                string close = MessageBox.Show(this.ParentForm, "导出成功，是否打开文件", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (close.ToString() == "Yes")
+                    System.Diagnostics.Process.Start(ExportFileDialog.SelectedPath + "\\" + inoutno + ".xls");
+                Close();
             }
         }
 
@@ -113,4 +130,4 @@ namespace UAS_LabelMachine
 
         }
     }
-}
+}

UAS-出货标签管理(贸易版)/PublicMethod/BaseUtil.cs

@@ -8,6 +8,7 @@ using UAS_LabelMachine.CustomControl;
 using UAS_LabelMachine.CustomControl.GroupBoxWithBorder;
 using static System.Windows.Forms.Control;
 using System.Text.RegularExpressions;
+using Seagull.BarTender.Print;
 
 namespace UAS_LabelMachine
 {
@@ -834,5 +835,57 @@ namespace UAS_LabelMachine
             }
             return Str;
         }
+
+        //设置控件不可见
+        public static void SetControlsVisible(params object[] sender)
+        {
+            foreach (object item in sender)
+            {
+                (item as DataGridViewColumn).Visible = false;
+            }
+        }
+
+        public static string GetOutBoxSQL(LabelFormatDocument OutFormat, DataTable OutLabelParam, string pi_inoutno, string pib_id, string pib_outboxcode2, bool iCustProdCode, bool iCustPo, bool iDC, bool iLotNo, bool iOrderCode)
+        {
+            StringBuilder sql = new StringBuilder();
+            sql.Clear();
+            for (int j = 0; j < OutFormat.SubStrings.Count; j++)
+            {
+                DataRow[] dr1 = OutLabelParam.Select("lp_name='" + OutFormat.SubStrings[j].Name + "'");
+                if (dr1.Length > 0 && (dr1[0]["lp_valuetype"].ToString() == "字符串" || dr1[0]["lp_valuetype"].ToString() == "text") && dr1[0]["lp_sql"].ToString() != "")
+                {
+                    sql.Append(dr1[0]["lp_sql"].ToString() + ",");
+                }
+            }
+            //界面设定的分组条件
+            string GroupByCondition = "";
+            if (iCustProdCode)
+            {
+                GroupByCondition += "pd_custprodcode,";
+            }
+            if (iCustPo)
+            {
+                GroupByCondition += "pd_pocode,";
+            }
+            if (iDC)
+            {
+                GroupByCondition += "pib_datecode,";
+            }
+            if (iLotNo)
+            {
+                GroupByCondition += "pib_lotno,";
+            }
+            if (iOrderCode)
+            {
+                GroupByCondition += "pd_ordercode,";
+            }
+            if (iCustProdCode || iCustPo || iDC || iLotNo|| iOrderCode)
+            {
+                GroupByCondition = " group by " + (GroupByCondition.Substring(0, GroupByCondition.Length - 1));
+            }
+            sql.Append("max(pib_id),");
+            Console.WriteLine("select " + sql.ToString().Substring(0, sql.Length - 1) + " from prodiobarcode where pib_inoutno = '" + pi_inoutno + "' and pib_outboxcode2 = " + (pib_outboxcode2 == "" ? "0" : pib_outboxcode2) + GroupByCondition);
+            return "select " + sql.ToString().Substring(0, sql.Length - 1) + " from prodiobarcode where pib_inoutno = '" + pi_inoutno + "' and pib_outboxcode2 = " + (pib_outboxcode2 == "" ? "0" : pib_outboxcode2) + GroupByCondition;
+        }
     }
 }

UAS-出货标签管理(贸易版)/PublicMethod/DataHelper.cs

@@ -11,11 +11,11 @@ namespace UAS_LabelMachine
     public class DataHelper
     {
 
-        //海创外网地址
+        //深爱地址
         private readonly string ConnectionStrings = "Data Source=172.16.0.22/orcl;User ID=SZSI_TEST;PassWord=select!#%*(";
-        //海创ERP地址
+        //深爱ERP地址
         public static readonly string ERPAddesss = "http://172.16.0.20:8099/ERP/";
-        //海创FTP
+        //深爱FTP
         public static readonly string FTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";
 
         public static readonly string InnerFTPAddress = "ftp://172.16.0.20|vsftpd|shenaftp";

UAS-出货标签管理(贸易版)/PublicMethod/ExcelHandler.cs

@@ -7,6 +7,8 @@ using NPOI.XSSF.UserModel;
 using System;
 using UAS_LabelMachine.Entity;
 using UAS_LabelMachine.PublicMethod;
+using System.Collections.Generic;
+using System.Windows.Forms;
 
 namespace UAS_LabelMachine
 {
@@ -37,11 +39,11 @@ namespace UAS_LabelMachine
         /// <summary>
         /// 导出Excel,返回文件在客户端的路径
         /// </summary>
-        public string ExportExcel(DataTable firstsdt, DataTable dt, string FolderPath, string FileName, string Type, int PageSize, bool PrintWID)
+        public string ExportExcel(DataTable firstsdt, DataTable dt, string FolderPath, string FileName, string Type, int PageSize, List<CheckBox> conditionbox)
         {
             //创建一个内存流，用来接收转换成Excel的内容
             MemoryStream ms;
-            ms = DataTableToExcel1(firstsdt, dt, Type, PageSize, PrintWID);
+            ms = DataTableToExcel1(firstsdt, dt, Type, PageSize, conditionbox);
             //以系统当前时间命名文件，FileMode.Create表示创建文件，FileAccess.Write表示拥有写的权限
             string filePath = @FolderPath + "\\" + FileName + ".xls";
             FileStream fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
@@ -54,8 +56,6 @@ namespace UAS_LabelMachine
             return filePath;
         }
 
-
-
         /// <summary>
         /// 导入Excel
         /// </summary>
@@ -186,7 +186,6 @@ namespace UAS_LabelMachine
             }
         }
 
-
         /// <summary>
         /// 将DataTable形式的数据转成Excel格式的，然后用字节流的形式写入文件
         /// </summary>
@@ -229,10 +228,10 @@ namespace UAS_LabelMachine
             style.FillPattern = FillPattern.BigSpots;
             style.FillBackgroundColor = HSSFColor.LightGreen.Index;
             //设置边框
-            style.BorderBottom = BorderStyle.Thick;
-            style.BorderLeft = BorderStyle.Thick;
-            style.BorderRight = BorderStyle.Thick;
-            style.BorderTop = BorderStyle.Thick;
+            style.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thick;
+            style.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thick;
+            style.BorderRight = NPOI.SS.UserModel.BorderStyle.Thick;
+            style.BorderTop = NPOI.SS.UserModel.BorderStyle.Thick;
             row.HeightInPoints = 20;
             //固定第一行
             //row.RowStyle.IsLocked=true;
@@ -242,8 +241,8 @@ namespace UAS_LabelMachine
                 row.CreateCell(j);
                 row.Cells[j].CellStyle = style;
                 row.Cells[j].CellStyle.VerticalAlignment = VerticalAlignment.Center;
-                row.Cells[j].CellStyle.Alignment = HorizontalAlignment.Center;
-                row.Cells[j].SetCellValue(DataTable.Columns[j].ColumnName);
+                row.Cells[j].CellStyle.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
+                row.Cells[j].SetCellValue(DataTable.Columns[j].Caption);
             }
             //将DataTable的值循环赋值给book，Aligment设置居中
             //之前已经画了带颜色的第一行，所以从i=1开始画
@@ -263,71 +262,115 @@ namespace UAS_LabelMachine
             return ms;
         }
 
-
         /// <summary>
         /// 将DataTable形式的数据转成Excel格式的，然后用字节流的形式写入文件
         /// </summary>
         /// <param name="DataTable"></param>
         /// <returns></returns>
-        public MemoryStream DataTableToExcel1(DataTable FirstDT, DataTable DataTable, string Type, int PageSize, bool PrintWID)
+        public MemoryStream DataTableToExcel1(DataTable FirstDT, DataTable DataTable, string Type, int PageSize, List<CheckBox> conditionbox)
         {
+            //转换为序列
+            CheckBox[] box = conditionbox.ToArray();
             //创建内存流
             MemoryStream ms = new MemoryStream();
             //创建一个Book，相当于一个Excel文件
             HSSFWorkbook book = new HSSFWorkbook();
             //Excel中的Sheet
             ISheet sheet = book.CreateSheet("分页");
-            //获取行数量和列数量
-            int rowNum = DataTable.Rows.Count;
-            int columnNum = DataTable.Columns.Count;
 
             ICellStyle style = book.CreateCellStyle();
             style.VerticalAlignment = VerticalAlignment.Center;
-            style.Alignment = HorizontalAlignment.Left;
+            style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Left;
 
             ICellStyle styleborder = book.CreateCellStyle();
-            styleborder.BorderBottom = BorderStyle.Thick;
-            styleborder.BorderTop = BorderStyle.Thick;
-            styleborder.BorderLeft = BorderStyle.Thick;
-            styleborder.BorderRight = BorderStyle.Thick;
+            styleborder.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thick;
+            styleborder.BorderTop = NPOI.SS.UserModel.BorderStyle.Thick;
+            styleborder.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thick;
+            styleborder.BorderRight = NPOI.SS.UserModel.BorderStyle.Thick;
             styleborder.VerticalAlignment = VerticalAlignment.Center;
-            styleborder.Alignment = HorizontalAlignment.Left;
+            styleborder.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Left;
             //设置列的宽度，根据首行的列的内容的长度来设置
-            for (int i = 0; i < columnNum; i++)
+            for (int i = DataTable.Columns.Count - 1; i > 0; i--)
             {
-                if (DataTable.Columns[i].ColumnName.Contains("客户"))
-                {
-                    DataTable.Columns[i].ColumnName = "客户";
-                }
-                if (DataTable.Columns[i].ColumnName.Contains("出货单号"))
-                {
-                    DataTable.Columns[i].ColumnName = "出货单号";
-                }
-                if (DataTable.Columns[i].ColumnName.Contains("型号"))
-                {
-                    DataTable.Columns[i].ColumnName = "型号";
-                }
-                if (DataTable.Columns[i].ColumnName.Contains("销售日期"))
-                {
-                    DataTable.Columns[i].ColumnName = "销售日期";
-                }
-                if (DataTable.Columns[i].ColumnName.ToLower().Contains("rownum"))
+                for (int j = 0; j < box.Length; j++)
                 {
-                    DataTable.Columns[i].ColumnName = "序号";
-                }
-                if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_code"))
-                {
-                    DataTable.Columns[i].ColumnName = "芯片号";
-                }
-                if (DataTable.Columns[i].ColumnName.ToLower().Contains("pib_lotno"))
-                {
-                    DataTable.Columns[i].ColumnName = "LotNo";
-                }
-                if (DataTable.Columns[i].ColumnName.ToLower().Contains("io_qty"))
-                {
-                    DataTable.Columns[i].ColumnName = "数量";
+                    if (box[j].Name.ToLower() == "ch_bluefilm" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_bluefilm"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "ch_code" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_code"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "ch_splitbatch" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_splitbatch"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "ch_waterid" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_waterid"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "ch_pbcode" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_pbcode"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "ch_remark" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower().Contains("ch_remark"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "percent" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower().Contains("chw_percent1") || DataTable.Columns[i].ColumnName.ToLower().Contains("chw_percent2") || DataTable.Columns[i].ColumnName.ToLower().Contains("chw_itemname1") || DataTable.Columns[i].ColumnName.ToLower().Contains("chw_itemname2"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "ts" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower() == ("ts1") || DataTable.Columns[i].ColumnName.ToLower() == ("ts2") || DataTable.Columns[i].ColumnName.ToLower() == ("ts3"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
+                    if (box[j].Name.ToLower() == "bvceo" && !box[j].Checked)
+                    {
+                        if (DataTable.Columns[i].ColumnName.ToLower() == "bvceo1" || DataTable.Columns[i].ColumnName.ToLower() == ("bvceo2") || DataTable.Columns[i].ColumnName.ToLower() == ("bvceo3"))
+                        {
+                            DataTable.Columns.RemoveAt(i);
+                            break;
+                        }
+                    }
                 }
             }
+            //获取行数量和列数量
+            int rowNum = DataTable.Rows.Count;
+            int columnNum = DataTable.Columns.Count;
             //首先画好第一行带颜色的，单独写出来，避免写在循环里面
             IRow row = sheet.CreateRow(0);
             //冻结第一行
@@ -376,9 +419,9 @@ namespace UAS_LabelMachine
                             First_Prspec += DataTable.Rows[i]["pr_spec"].ToString() + " ";
                         }
                         //不包含扩撒批号
-                        if (DataTable.Columns.Contains("扩散批号") && !First_Batch.Contains(DataTable.Rows[i]["扩散批号"].ToString()))
+                        if (DataTable.Columns.Contains("ch_splitbatch") && !First_Batch.Contains(DataTable.Rows[i]["ch_splitbatch"].ToString()))
                         {
-                            First_Batch += DataTable.Rows[i]["扩散批号"].ToString() + " ";
+                            First_Batch += DataTable.Rows[i]["ch_splitbatch"].ToString() + " ";
                         }
                         //不包含Wafer_id
                         if (DataTable.Columns.Contains("Wafer_ID") && !First_WID.Contains(DataTable.Rows[i]["Wafer_ID"].ToString()))
@@ -388,10 +431,10 @@ namespace UAS_LabelMachine
                         if (i / PageSize >= 1 && i % PageSize == 0)
                         {
                             DataRow dr = FirstDT.NewRow();
-                            dr["型号"] = DataTable.Rows[i]["型号"].ToString();
-                            dr["出货单号"] = DataTable.Rows[i]["出货单号"].ToString();
-                            dr["客户"] = DataTable.Rows[i]["客户"].ToString();
-                            dr["销售日期"] = DataTable.Rows[i]["销售日期"].ToString();
+                            dr["pr_spec"] = DataTable.Rows[i]["pr_spec"].ToString();
+                            dr["pi_inoutno"] = DataTable.Rows[i]["pi_inoutno"].ToString();
+                            dr["pi_title"] = DataTable.Rows[i]["pi_title"].ToString();
+                            dr["pi_date"] = DataTable.Rows[i]["pi_date"].ToString();
                             dr["pd_ordercode"] = First_OrderCode;
                             dr["pr_spec"] = First_Prspec;
                             dr["ch_splitbatch"] = First_Batch;
@@ -436,12 +479,17 @@ namespace UAS_LabelMachine
                                     if (j == 0)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["客户"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_title"].ToString());
                                     }
-                                    else if (j == columnNum - 4)
+                                    else if (j > 5 && j == columnNum - 5)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["出货单号"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_inoutno"].ToString());
+                                    }
+                                    else if (columnNum > 5 && j == columnNum - 5)
+                                    {
+                                        row1.CreateCell(j);
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_inoutno"].ToString());
                                     }
                                     else
                                     {
@@ -457,12 +505,17 @@ namespace UAS_LabelMachine
                                     if (j == 0)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["型号"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pr_spec"].ToString());
                                     }
-                                    else if (j == columnNum - 4)
+                                    else if (columnNum > 5 && j == columnNum - 5)
+                                    {
+                                        row1.CreateCell(j);
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_date"].ToString());
+                                    }
+                                    else if (columnNum <= 5 && j == columnNum - 4)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["销售日期"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_date"].ToString());
                                     }
                                     else
                                     {
@@ -486,7 +539,7 @@ namespace UAS_LabelMachine
                                         row1.Cells[j - 4].SetCellValue(DataTable.Rows[i]["chw_itemname2"].ToString());
                                     }
                                     else
-                                        row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].ColumnName);
+                                        row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
                                     //如果chw_itemname1的值为空，则值为100和0，其中一列不显示，不显示
                                     if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_spec") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode"))
                                     {
@@ -504,25 +557,26 @@ namespace UAS_LabelMachine
                             row1.CreateCell(j - 4);
                             row1.Cells[j - 4].SetCellValue(Data);
                             row1.GetCell(j - 4).CellStyle = styleborder;
-                            if (DataTable.Columns[j].ColumnName == "数量")
+                            if (DataTable.Columns[j].ColumnName == "io_qty")
                             {
                                 sumCount += int.Parse(DataTable.Rows[i][j].ToString());
                                 totalCount += int.Parse(DataTable.Rows[i][j].ToString());
                             }
-                            if (DataTable.Columns[j].ColumnName == "序号")
+                            if (DataTable.Columns[j].ColumnName == "rownum")
                             {
                                 row1.Cells[j - 4].SetCellValue(i + 1);
                             }
                         }
+                        //固定行号分组的时候自动拼接新的DataTable
                         if (i == rowNum - 1)
                         {
                             DataRow dr = FirstDT.NewRow();
-                            dr["型号"] = DataTable.Rows[i]["型号"].ToString();
-                            dr["出货单号"] = DataTable.Rows[i]["出货单号"].ToString();
-                            dr["客户"] = DataTable.Rows[i]["客户"].ToString();
-                            dr["销售日期"] = DataTable.Rows[i]["销售日期"].ToString();
+                            dr["pr_spec"] = DataTable.Rows[i]["pr_spec"].ToString();
+                            dr["pi_inoutno"] = DataTable.Rows[i]["pi_inoutno"].ToString();
+                            dr["pi_title"] = DataTable.Rows[i]["pi_title"].ToString();
+                            dr["pi_date"] = DataTable.Rows[i]["pi_date"].ToString();
                             dr["pd_ordercode"] = First_OrderCode;
-                            dr["pr_spec"] = First_Prspec;
+                            dr["pr_spec1"] = First_Prspec;
                             dr["ch_splitbatch"] = First_Batch;
                             dr["ch_waterid"] = BaseUtil.GetArrStr(First_WID, " ");
                             dr["num"] = (i % PageSize) + 1;
@@ -564,12 +618,17 @@ namespace UAS_LabelMachine
                                     row1.Cells[j].SetCellValue(totalCount);
                                 }
                                 //原本是j == columnNum - 5因为还有spec和order两列隐藏列，所以需要在往后移动
-                                else if (j == columnNum - 7)
+                                else if (j == columnNum - 6)
                                 {
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue(rowNum);
                                 }
-                                else if (j == columnNum - 4)
+                                else if (j > 5 && j == columnNum - 5)
+                                {
+                                    row1.CreateCell(j);
+                                    row1.Cells[j].SetCellValue("片");
+                                }
+                                else if (columnNum > 5 && j == columnNum - 5)
                                 {
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue("片");
@@ -599,7 +658,7 @@ namespace UAS_LabelMachine
                         PaintIndex = PaintIndex + 1;
                         row1.HeightInPoints = 20;
                         //如果批号不相等的时候
-                        if (LastBatchCode != "" && LastBatchCode != DataTable.Rows[i]["扩散批号"].ToString())
+                        if (LastBatchCode != "" && LastBatchCode != DataTable.Rows[i]["ch_splitbatch"].ToString())
                         {
                             for (int j = 0; j < columnNum - 4; j++)
                             {
@@ -624,9 +683,9 @@ namespace UAS_LabelMachine
                             PaintIndex = PaintIndex + 1;
                         }
                         //每次到了页数开始分页
-                        if (LastBatchCode == "" || (LastBatchCode != "" && LastBatchCode != DataTable.Rows[i]["扩散批号"].ToString()) || i == rowNum - 1)
+                        if (LastBatchCode == "" || (LastBatchCode != "" && LastBatchCode != DataTable.Rows[i]["ch_splitbatch"].ToString()) || i == rowNum - 1)
                         {
-                            LastBatchCode = DataTable.Rows[i]["扩散批号"].ToString();
+                            LastBatchCode = DataTable.Rows[i]["ch_splitbatch"].ToString();
                             //第一行添加客户信息
                             if (i != rowNum - 1)
                             {
@@ -635,12 +694,12 @@ namespace UAS_LabelMachine
                                     if (j == 0)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["客户"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_title"].ToString());
                                     }
                                     else if (j == columnNum - 4)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["出货单号"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_inoutno"].ToString());
                                     }
                                     else
                                     {
@@ -656,12 +715,12 @@ namespace UAS_LabelMachine
                                     if (j == 0)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["型号"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pr_spec"].ToString());
                                     }
                                     else if (j == columnNum - 4)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["销售日期"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_date"].ToString());
                                     }
                                     else
                                     {
@@ -685,7 +744,7 @@ namespace UAS_LabelMachine
                                         row1.Cells[j - 4].SetCellValue(DataTable.Rows[i]["chw_itemname2"].ToString());
                                     }
                                     else
-                                        row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].ColumnName);
+                                        row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
                                     if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_spec") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode"))
                                     {
                                         sheet.SetColumnHidden(j - 4, true);
@@ -702,12 +761,12 @@ namespace UAS_LabelMachine
                             row1.CreateCell(j - 4);
                             row1.Cells[j - 4].SetCellValue(Data);
                             row1.GetCell(j - 4).CellStyle = styleborder;
-                            if (DataTable.Columns[j].ColumnName == "数量")
+                            if (DataTable.Columns[j].ColumnName == "io_qty")
                             {
                                 sumCount += int.Parse(DataTable.Rows[i][j].ToString());
                                 totalCount += int.Parse(DataTable.Rows[i][j].ToString());
                             }
-                            if (DataTable.Columns[j].ColumnName == "序号")
+                            if (DataTable.Columns[j].ColumnName == "rownum")
                             {
                                 row1.Cells[j - 4].SetCellValue(i + 1);
                             }
@@ -734,7 +793,7 @@ namespace UAS_LabelMachine
                                 }
                                 row1.Cells[j].CellStyle = styleborder;
                             }
-
+                            //创建备注内容
                             row1 = sheet.CreateRow(PaintIndex);
                             PaintIndex = PaintIndex + 1;
                             for (int j = 0; j < columnNum - 3; j++)
@@ -749,12 +808,17 @@ namespace UAS_LabelMachine
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue(totalCount);
                                 }
-                                else if (j == columnNum - 7)
+                                else if (j == columnNum - 6)
                                 {
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue(rowNum);
                                 }
-                                else if (j == columnNum - 4)
+                                else if (j > 5 && j == columnNum - 5)
+                                {
+                                    row1.CreateCell(j);
+                                    row1.Cells[j].SetCellValue("片");
+                                }
+                                else if (columnNum > 5 && j == columnNum - 5)
                                 {
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue("片");
@@ -784,9 +848,8 @@ namespace UAS_LabelMachine
                         PaintIndex = PaintIndex + 1;
                         row1.HeightInPoints = 20;
                         //如果批号不相等的时候
-                        if (LastBoxCode != "" && LastBoxCode != DataTable.Rows[i]["盒号"].ToString())
+                        if (LastBoxCode != "" && LastBoxCode != DataTable.Rows[i]["CH_PBCODE"].ToString())
                         {
-
                             for (int j = 0; j < columnNum - 4; j++)
                             {
                                 if (j == 0)
@@ -810,9 +873,9 @@ namespace UAS_LabelMachine
                             PaintIndex = PaintIndex + 1;
                         }
                         //每次到了页数开始分页
-                        if (LastBoxCode == "" || (LastBoxCode != "" && LastBoxCode != DataTable.Rows[i]["盒号"].ToString()) || i == rowNum - 1)
+                        if (LastBoxCode == "" || (LastBoxCode != "" && LastBoxCode != DataTable.Rows[i]["ch_pbcode"].ToString()) || i == rowNum - 1)
                         {
-                            LastBoxCode = DataTable.Rows[i]["盒号"].ToString();
+                            LastBoxCode = DataTable.Rows[i]["CH_PBCODE"].ToString();
                             //第一行添加客户信息
                             if (i != rowNum - 1)
                             {
@@ -821,12 +884,17 @@ namespace UAS_LabelMachine
                                     if (j == 0)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["客户"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_title"].ToString());
                                     }
-                                    else if (j == columnNum - 4)
+                                    else if (j > 5 && j == columnNum - 5)
+                                    {
+                                        row1.CreateCell(j);
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_inoutno"].ToString());
+                                    }
+                                    else if (columnNum > 5 && j == columnNum - 5)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["出货单号"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_inoutno"].ToString());
                                     }
                                     else
                                     {
@@ -842,12 +910,17 @@ namespace UAS_LabelMachine
                                     if (j == 0)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["型号"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pr_spec"].ToString());
                                     }
-                                    else if (j == columnNum - 4)
+                                    else if (j > 5 && j == columnNum - 5)
                                     {
                                         row1.CreateCell(j);
-                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["销售日期"].ToString());
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_date"].ToString());
+                                    }
+                                    else if (columnNum > 5 && j == columnNum - 5)
+                                    {
+                                        row1.CreateCell(j);
+                                        row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_date"].ToString());
                                     }
                                     else
                                     {
@@ -860,6 +933,7 @@ namespace UAS_LabelMachine
                                 PaintIndex = PaintIndex + 1;
                                 for (int j = 4; j < columnNum; j++)
                                 {
+                                    //设定固定的列名
                                     row1.CreateCell(j - 4);
                                     row1.Cells[j - 4].CellStyle = styleborder;
                                     if (DataTable.Columns[j].ColumnName.ToLower() == "chw_percent1")
@@ -871,7 +945,7 @@ namespace UAS_LabelMachine
                                         row1.Cells[j - 4].SetCellValue(DataTable.Rows[i]["chw_itemname2"].ToString());
                                     }
                                     else
-                                        row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].ColumnName);
+                                        row1.Cells[j - 4].SetCellValue(DataTable.Columns[j].Caption);
                                     if (DataTable.Columns[j].ColumnName.ToLower().Contains("chw_itemname") || DataTable.Columns[j].ColumnName.ToLower().Contains("pr_spec") || DataTable.Columns[j].ColumnName.ToLower().Contains("pd_ordercode"))
                                     {
                                         sheet.SetColumnHidden(j - 4, true);
@@ -888,12 +962,12 @@ namespace UAS_LabelMachine
                             row1.CreateCell(j - 4);
                             row1.Cells[j - 4].SetCellValue(Data);
                             row1.GetCell(j - 4).CellStyle = styleborder;
-                            if (DataTable.Columns[j].ColumnName == "数量")
+                            if (DataTable.Columns[j].ColumnName == "io_qty")
                             {
                                 sumCount += int.Parse(DataTable.Rows[i][j].ToString());
                                 totalCount += int.Parse(DataTable.Rows[i][j].ToString());
                             }
-                            if (DataTable.Columns[j].ColumnName == "序号")
+                            if (DataTable.Columns[j].ColumnName == "rownum")
                             {
                                 row1.Cells[j - 4].SetCellValue(i + 1);
                             }
@@ -935,12 +1009,17 @@ namespace UAS_LabelMachine
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue(totalCount);
                                 }
-                                else if (j == columnNum - 7)
+                                else if (j == columnNum - 6)
                                 {
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue(rowNum);
                                 }
-                                else if (j == columnNum - 4)
+                                else if (j > 5 && j == columnNum - 5)
+                                {
+                                    row1.CreateCell(j);
+                                    row1.Cells[j].SetCellValue("片");
+                                }
+                                else if (columnNum > 5 && j == columnNum - 5)
                                 {
                                     row1.CreateCell(j);
                                     row1.Cells[j].SetCellValue("片");
@@ -975,35 +1054,35 @@ namespace UAS_LabelMachine
             row.Cells[0].SetCellValue("                     深爱半导体有限公司芯片出货清单");
             row.GetCell(0).CellStyle = style;
             rowNum = FirstDT.Rows.Count;
-            columnNum = FirstDT.Columns.Count;
-
-            for (int i = 0; i < columnNum; i++)
+            //不需要显示的列移除
+            for (int i = FirstDT.Columns.Count - 1; i > 0; i--)
             {
-                if (FirstDT.Columns[i].ColumnName.ToLower().Contains("pd_ordercode"))
-                {
-                    FirstDT.Columns[i].ColumnName = "订单号";
-                }
-                if (FirstDT.Columns[i].ColumnName.ToLower().Contains("pr_spec"))
-                {
-                    FirstDT.Columns[i].ColumnName = "产品型号";
-                }
-                if (FirstDT.Columns[i].ColumnName.ToLower().Contains("ch_splitbatch"))
-                {
-                    FirstDT.Columns[i].ColumnName = "批号";
-                }
-                if (FirstDT.Columns[i].ColumnName.ToLower().Contains("ch_waterid"))
-                {
-                    FirstDT.Columns[i].ColumnName = "片号";
-                }
-                if (FirstDT.Columns[i].ColumnName.ToLower().Contains("num"))
-                {
-                    FirstDT.Columns[i].ColumnName = "片数";
-                }
-                if (FirstDT.Columns[i].ColumnName.ToLower().Contains("io_qty"))
+                for (int j = 0; j < box.Length; j++)
                 {
-                    FirstDT.Columns[i].ColumnName = "管芯数";
+                    if (box[j].Name == "FirstPage_WID" && !box[j].Checked)
+                    {
+                        if (FirstDT.Columns[i].ColumnName.ToLower().Contains("ch_waterid"))
+                        {
+                            FirstDT.Columns.RemoveAt(i);
+                        }
+                    }
+                    if (box[j].Name == "FirstPage_YIELD" && !box[j].Checked)
+                    {
+                        if (FirstDT.Columns[i].ColumnName.ToLower().Contains("ch_yeild"))
+                        {
+                            FirstDT.Columns.RemoveAt(i);
+                        }
+                    }
+                    if (box[j].Name == "FirstPage_REMARK" && !box[j].Checked)
+                    {
+                        if (FirstDT.Columns[i].ColumnName.ToLower().Contains("ch_remark"))
+                        {
+                            FirstDT.Columns.RemoveAt(i);
+                        }
+                    }
                 }
             }
+            columnNum = FirstDT.Columns.Count;
 
             for (int i = 0; i < rowNum; i++)
             {
@@ -1018,12 +1097,17 @@ namespace UAS_LabelMachine
                         if (j == 0)
                         {
                             row1.CreateCell(j);
-                            row1.Cells[j].SetCellValue(FirstDT.Rows[i]["客户"].ToString());
+                            row1.Cells[j].SetCellValue(FirstDT.Rows[i]["pi_title"].ToString());
                         }
-                        else if (j == columnNum - 4)
+                        else if (j > 5 && j == columnNum - 5)
                         {
                             row1.CreateCell(j);
-                            row1.Cells[j].SetCellValue(FirstDT.Rows[i]["出货单号"].ToString());
+                            row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_inoutno"].ToString());
+                        }
+                        else if (columnNum > 5 && j == columnNum - 5)
+                        {
+                            row1.CreateCell(j);
+                            row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_inoutno"].ToString());
                         }
                         else
                         {
@@ -1039,12 +1123,17 @@ namespace UAS_LabelMachine
                         if (j == 0)
                         {
                             row1.CreateCell(j);
-                            row1.Cells[j].SetCellValue(FirstDT.Rows[i]["型号"].ToString());
+                            row1.Cells[j].SetCellValue(FirstDT.Rows[i]["pr_spec"].ToString());
                         }
-                        else if (j == columnNum - 4)
+                        else if (j > 5 && j == columnNum - 5)
                         {
                             row1.CreateCell(j);
-                            row1.Cells[j].SetCellValue(FirstDT.Rows[i]["销售日期"].ToString());
+                            row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_date"].ToString());
+                        }
+                        else if (columnNum > 5 && j == columnNum - 5)
+                        {
+                            row1.CreateCell(j);
+                            row1.Cells[j].SetCellValue(DataTable.Rows[i]["pi_date"].ToString());
                         }
                         else
                         {
@@ -1059,7 +1148,7 @@ namespace UAS_LabelMachine
                     {
                         row1.CreateCell(j - 4);
                         row1.Cells[j - 4].CellStyle = styleborder;
-                        row1.Cells[j - 4].SetCellValue(FirstDT.Columns[j].ColumnName);
+                        row1.Cells[j - 4].SetCellValue(FirstDT.Columns[j].Caption);
                     }
                     row1 = sheet2.CreateRow(PaintIndex);
                     PaintIndex = PaintIndex + 1;
@@ -1071,11 +1160,11 @@ namespace UAS_LabelMachine
                     row1.CreateCell(j - 4);
                     row1.Cells[j - 4].SetCellValue(Data);
                     row1.GetCell(j - 4).CellStyle = styleborder;
-                    if (FirstDT.Columns[j].ColumnName == "片数")
+                    if (FirstDT.Columns[j].ColumnName == "num")
                     {
                         sumCount += int.Parse(Data);
                     }
-                    if (FirstDT.Columns[j].ColumnName == "管芯数")
+                    if (FirstDT.Columns[j].ColumnName == "io_qty")
                     {
                         totalCount += int.Parse(Data);
                     }
@@ -1121,7 +1210,6 @@ namespace UAS_LabelMachine
                     sheet2.SetColumnWidth(i, sheet2.GetColumnWidth(i) + 1000);
                 }
             }
-
             //将book的内容写入内存流中返回
             book.Write(ms);
             return ms;

UAS-出货标签管理(贸易版)/PublicMethod/LogicHandler.cs

@@ -138,7 +138,6 @@ namespace UAS_LabelMachine.PublicMethod
             sql.Append("insert into prodiobarcode (pib_id,pib_piid,pib_inoutno,pib_pdno,pib_custbarcode,pib_gk,pib_weigh,pib_qty,pib_outboxcode1,pib_prodcode) values(prodiobarcode_seq.nextval,'" + iPiID + "',");
             sql.Append("'" + iInOutNo + "',:pib_pdno,:pib_lotno,:pib_gk,:pib_weiht,:pib_qty,:pib_outboxcode1,'" + prcode + "')");
             dh.BatchInsert(sql.ToString(), new string[] { "pib_pdno", "pib_lotno", "pib_gk", "pib_weiht", "pib_qty", "pib_outboxcode1" }, detno.ToArray(), batch.ToArray(), gk.ToArray(), weigh.ToArray(), qty.ToArray(), outboxcode1.ToArray());
-
         }
 
         //海创的导入方法
@@ -196,6 +195,8 @@ namespace UAS_LabelMachine.PublicMethod
                 //累计Excel该型号的数量
                 sumqty[pr_spec] += decimal.Parse(qty);
             }
+            dt.DefaultView.Sort = "箱号,DC ";
+            dt = dt.DefaultView.ToTable();
             for (int i = 0; i < dt1.Rows.Count; i++)
             {
                 //不包含型号则进行添加
@@ -216,7 +217,7 @@ namespace UAS_LabelMachine.PublicMethod
             //上一个的最小外箱号，如果箱号没有发生变化则外箱条码也不变化
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim();
+                string pr_spec = dt.Rows[i]["规格型号"].ToString().Trim().ToUpper();
                 string 品牌 = dt.Rows[i]["品牌"].ToString().Trim();
                 string 产地 = dt.Rows[i]["产地"].ToString().Trim();
                 string 尺寸 = dt.Rows[i]["尺寸"].ToString().Trim();

UAS-出货标签管理(贸易版)/PublicMethod/Print.cs

@@ -143,7 +143,7 @@ namespace UAS_LabelMachine.PublicMethod
                 {
                     GroupByCondition += "pd_ordercode,";
                 }
-                if (iCustProdCode || iCustPo || iDC || iLotNo)
+                if (iCustProdCode || iCustPo || iDC || iLotNo || iOrderCode)
                 {
                     GroupByCondition = " group by " + (GroupByCondition.Substring(0, GroupByCondition.Length - 1));
                 }
@@ -371,7 +371,7 @@ namespace UAS_LabelMachine.PublicMethod
                 {
                     GroupByCondition += "pd_ordercode,";
                 }
-                if (iCustProdCode || iCustPo || iDC || iLotNo)
+                if (iCustProdCode || iCustPo || iDC || iLotNo || iOrderCode)
                 {
                     GroupByCondition = " group by " + (GroupByCondition.Substring(0, GroupByCondition.Length - 1));
                 }
@@ -382,7 +382,7 @@ namespace UAS_LabelMachine.PublicMethod
                     for (int j = 0; j < OutFormat.SubStrings.Count; j++)
                     {
                         DataRow[] dr1 = OutLabelParam.Select("lp_name='" + OutFormat.SubStrings[j].Name + "'");
-                        if (dr1.Length > 0 && (dr1[0]["lp_valuetype"].ToString() == "字符串"||dr1[0]["lp_valuetype"].ToString() == "text") && dr1[0]["lp_sql"].ToString() != "")
+                        if (dr1.Length > 0 && (dr1[0]["lp_valuetype"].ToString() == "字符串" || dr1[0]["lp_valuetype"].ToString() == "text") && dr1[0]["lp_sql"].ToString() != "")
                         {
                             OutFormat.SubStrings[j].Value = dt.Rows[m][dr1[0]["lp_sql"].ToString()].ToString();
                         }
@@ -440,4 +440,4 @@ namespace UAS_LabelMachine.PublicMethod
             }
         }
     }
-}
+}

UAS-出货标签管理(贸易版)/UAS_出货标签管理.Designer.cs

@@ -133,6 +133,34 @@
             this.sg_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.MessageLog = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
             this.LabelInf = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pr_midboxcapacity_user = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_ordercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_year = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_month = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_day = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pi_inoutno = new UAS_LabelMachine.CustomControl.BlurSearch();
             this.SingleLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.LabelSpace = new System.Windows.Forms.CheckBox();
@@ -156,6 +184,7 @@
             this.MidLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.MidLabelCombox = new System.Windows.Forms.ComboBox();
             this.OutBoxLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
+            this.DiffCustOutBoxCode = new System.Windows.Forms.CheckBox();
             this.groupBoxWithBorder2 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.cu_print_ordercode = new System.Windows.Forms.CheckBox();
             this.cu_print_outpo = new System.Windows.Forms.CheckBox();
@@ -173,34 +202,6 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pr_midboxcapacity_user = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_ifpick = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
-            this.pib_id1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_ordercode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_madein = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_year = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_month = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_day = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_barcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_pocode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodspec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_outboxcode2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.Menu.SuspendLayout();
@@ -726,7 +727,7 @@
             // 
             // ChooseAll
             // 
-            this.ChooseAll.Location = new System.Drawing.Point(4, 252);
+            this.ChooseAll.Location = new System.Drawing.Point(4, 260);
             this.ChooseAll.Margin = new System.Windows.Forms.Padding(2);
             this.ChooseAll.Name = "ChooseAll";
             this.ChooseAll.Size = new System.Drawing.Size(38, 22);
@@ -908,7 +909,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(69, 138);
+            this.label18.Location = new System.Drawing.Point(68, 137);
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(13, 17);
             this.label18.TabIndex = 90;
@@ -942,7 +943,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(68, 65);
+            this.label16.Location = new System.Drawing.Point(67, 64);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(13, 17);
             this.label16.TabIndex = 87;
@@ -976,7 +977,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(10, 111);
+            this.label12.Location = new System.Drawing.Point(9, 110);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(56, 17);
             this.label12.TabIndex = 77;
@@ -986,7 +987,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(10, 40);
+            this.label7.Location = new System.Drawing.Point(9, 39);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(56, 17);
             this.label7.TabIndex = 76;
@@ -1039,7 +1040,7 @@
             // 
             this.Capacity.AutoSize = true;
             this.Capacity.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Capacity.Location = new System.Drawing.Point(59, 68);
+            this.Capacity.Location = new System.Drawing.Point(58, 67);
             this.Capacity.Name = "Capacity";
             this.Capacity.Size = new System.Drawing.Size(0, 17);
             this.Capacity.TabIndex = 75;
@@ -1048,7 +1049,7 @@
             // 
             this.Process_midboxcode.AutoSize = true;
             this.Process_midboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_midboxcode.Location = new System.Drawing.Point(59, 112);
+            this.Process_midboxcode.Location = new System.Drawing.Point(58, 111);
             this.Process_midboxcode.Name = "Process_midboxcode";
             this.Process_midboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_midboxcode.TabIndex = 74;
@@ -1058,7 +1059,7 @@
             // 
             this.Process_outboxcode.AutoSize = true;
             this.Process_outboxcode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process_outboxcode.Location = new System.Drawing.Point(59, 88);
+            this.Process_outboxcode.Location = new System.Drawing.Point(58, 87);
             this.Process_outboxcode.Name = "Process_outboxcode";
             this.Process_outboxcode.Size = new System.Drawing.Size(15, 17);
             this.Process_outboxcode.TabIndex = 73;
@@ -1069,7 +1070,7 @@
             this.TotalCount.AutoSize = true;
             this.TotalCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.TotalCount.ForeColor = System.Drawing.Color.Blue;
-            this.TotalCount.Location = new System.Drawing.Point(93, 20);
+            this.TotalCount.Location = new System.Drawing.Point(92, 19);
             this.TotalCount.Name = "TotalCount";
             this.TotalCount.Size = new System.Drawing.Size(15, 17);
             this.TotalCount.TabIndex = 72;
@@ -1079,7 +1080,7 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label17.Location = new System.Drawing.Point(79, 20);
+            this.label17.Location = new System.Drawing.Point(78, 19);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(13, 17);
             this.label17.TabIndex = 71;
@@ -1090,7 +1091,7 @@
             this.CollectedCount.AutoSize = true;
             this.CollectedCount.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.CollectedCount.ForeColor = System.Drawing.Color.Red;
-            this.CollectedCount.Location = new System.Drawing.Point(61, 20);
+            this.CollectedCount.Location = new System.Drawing.Point(60, 19);
             this.CollectedCount.Name = "CollectedCount";
             this.CollectedCount.Size = new System.Drawing.Size(15, 17);
             this.CollectedCount.TabIndex = 70;
@@ -1100,7 +1101,7 @@
             // 
             this.label14.AutoSize = true;
             this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label14.Location = new System.Drawing.Point(9, 88);
+            this.label14.Location = new System.Drawing.Point(8, 87);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(32, 17);
             this.label14.TabIndex = 69;
@@ -1110,7 +1111,7 @@
             // 
             this.label11.AutoSize = true;
             this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label11.Location = new System.Drawing.Point(9, 111);
+            this.label11.Location = new System.Drawing.Point(8, 110);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(32, 17);
             this.label11.TabIndex = 68;
@@ -1120,7 +1121,7 @@
             // 
             this.label13.AutoSize = true;
             this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label13.Location = new System.Drawing.Point(9, 48);
+            this.label13.Location = new System.Drawing.Point(8, 47);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(44, 17);
             this.label13.TabIndex = 67;
@@ -1130,7 +1131,7 @@
             // 
             this.Installed.AutoSize = true;
             this.Installed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Installed.Location = new System.Drawing.Point(59, 48);
+            this.Installed.Location = new System.Drawing.Point(58, 47);
             this.Installed.Name = "Installed";
             this.Installed.Size = new System.Drawing.Size(0, 17);
             this.Installed.TabIndex = 66;
@@ -1139,7 +1140,7 @@
             // 
             this.Process.AutoSize = true;
             this.Process.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Process.Location = new System.Drawing.Point(9, 20);
+            this.Process.Location = new System.Drawing.Point(8, 19);
             this.Process.Name = "Process";
             this.Process.Size = new System.Drawing.Size(44, 17);
             this.Process.TabIndex = 65;
@@ -1261,6 +1262,228 @@
             this.LabelInf.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.LabelInf_CellValueChanged);
             this.LabelInf.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.LabelInf_DataError);
             // 
+            // Choose
+            // 
+            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.Choose.HeaderText = "勾选";
+            this.Choose.Name = "Choose";
+            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.Choose.Width = 55;
+            // 
+            // pr_midboxcapacity_user
+            // 
+            this.pr_midboxcapacity_user.DataPropertyName = "pr_midboxcapacity_user";
+            this.pr_midboxcapacity_user.HeaderText = "pr_midboxcapacity_user";
+            this.pr_midboxcapacity_user.Name = "pr_midboxcapacity_user";
+            this.pr_midboxcapacity_user.Visible = false;
+            this.pr_midboxcapacity_user.Width = 162;
+            // 
+            // pib_ifpick
+            // 
+            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifpick.DataPropertyName = "pib_ifpick";
+            this.pib_ifpick.HeaderText = "已采集";
+            this.pib_ifpick.Name = "pib_ifpick";
+            this.pib_ifpick.Width = 60;
+            // 
+            // pib_ifprint
+            // 
+            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_ifprint.DataPropertyName = "pib_ifprint";
+            this.pib_ifprint.HeaderText = "已打印";
+            this.pib_ifprint.Name = "pib_ifprint";
+            this.pib_ifprint.Width = 60;
+            // 
+            // pib_id1
+            // 
+            this.pib_id1.DataPropertyName = "pib_id";
+            this.pib_id1.HeaderText = "pib_id";
+            this.pib_id1.Name = "pib_id1";
+            this.pib_id1.Visible = false;
+            this.pib_id1.Width = 66;
+            // 
+            // pib_pdno
+            // 
+            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pib_pdno.DataPropertyName = "pib_pdno";
+            this.pib_pdno.HeaderText = "明细序号";
+            this.pib_pdno.Name = "pib_pdno";
+            this.pib_pdno.ReadOnly = true;
+            this.pib_pdno.Width = 78;
+            // 
+            // pib_prodcode
+            // 
+            this.pib_prodcode.DataPropertyName = "pib_prodcode";
+            this.pib_prodcode.HeaderText = "物料编号";
+            this.pib_prodcode.Name = "pib_prodcode";
+            this.pib_prodcode.ReadOnly = true;
+            this.pib_prodcode.Width = 78;
+            // 
+            // pd_ordercode
+            // 
+            this.pd_ordercode.DataPropertyName = "pd_ordercode";
+            this.pd_ordercode.HeaderText = "订单编号";
+            this.pd_ordercode.Name = "pd_ordercode";
+            this.pd_ordercode.Width = 78;
+            // 
+            // pr_orispeccode
+            // 
+            this.pr_orispeccode.DataPropertyName = "pr_orispeccode";
+            this.pr_orispeccode.HeaderText = "MPN";
+            this.pr_orispeccode.Name = "pr_orispeccode";
+            this.pr_orispeccode.ReadOnly = true;
+            this.pr_orispeccode.Width = 48;
+            // 
+            // pib_brand
+            // 
+            this.pib_brand.DataPropertyName = "pib_brand";
+            this.pib_brand.HeaderText = "品牌";
+            this.pib_brand.Name = "pib_brand";
+            this.pib_brand.ReadOnly = true;
+            this.pib_brand.Width = 54;
+            // 
+            // pib_madein
+            // 
+            this.pib_madein.DataPropertyName = "pib_madein";
+            this.pib_madein.HeaderText = "产地";
+            this.pib_madein.Name = "pib_madein";
+            this.pib_madein.Width = 54;
+            // 
+            // pr_zxbzs
+            // 
+            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
+            this.pr_zxbzs.HeaderText = "最小包装数";
+            this.pr_zxbzs.Name = "pr_zxbzs";
+            this.pr_zxbzs.Visible = false;
+            this.pr_zxbzs.Width = 90;
+            // 
+            // pr_unit
+            // 
+            this.pr_unit.DataPropertyName = "pr_unit";
+            this.pr_unit.HeaderText = "单位";
+            this.pr_unit.Name = "pr_unit";
+            this.pr_unit.Visible = false;
+            this.pr_unit.Width = 54;
+            // 
+            // pib_lotno
+            // 
+            this.pib_lotno.DataPropertyName = "pib_lotno";
+            this.pib_lotno.HeaderText = "LotNo";
+            this.pib_lotno.Name = "pib_lotno";
+            this.pib_lotno.Width = 60;
+            // 
+            // pib_datecode
+            // 
+            this.pib_datecode.DataPropertyName = "pib_datecode";
+            this.pib_datecode.HeaderText = "DateCode";
+            this.pib_datecode.Name = "pib_datecode";
+            this.pib_datecode.Width = 78;
+            // 
+            // pib_year
+            // 
+            this.pib_year.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+            this.pib_year.DataPropertyName = "pib_year";
+            this.pib_year.HeaderText = "年";
+            this.pib_year.Name = "pib_year";
+            this.pib_year.Width = 42;
+            // 
+            // pib_month
+            // 
+            this.pib_month.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_month.DataPropertyName = "pib_month";
+            this.pib_month.HeaderText = "月";
+            this.pib_month.Name = "pib_month";
+            this.pib_month.Width = 42;
+            // 
+            // pib_day
+            // 
+            this.pib_day.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_day.DataPropertyName = "pib_day";
+            this.pib_day.HeaderText = "日";
+            this.pib_day.Name = "pib_day";
+            this.pib_day.Width = 42;
+            // 
+            // pib_qty
+            // 
+            this.pib_qty.DataPropertyName = "pib_qty";
+            this.pib_qty.HeaderText = "数量";
+            this.pib_qty.Name = "pib_qty";
+            this.pib_qty.ReadOnly = true;
+            this.pib_qty.Width = 54;
+            // 
+            // pib_barcode
+            // 
+            this.pib_barcode.DataPropertyName = "pib_barcode";
+            this.pib_barcode.HeaderText = "唯一条码";
+            this.pib_barcode.Name = "pib_barcode";
+            this.pib_barcode.ReadOnly = true;
+            this.pib_barcode.Visible = false;
+            this.pib_barcode.Width = 78;
+            // 
+            // pib_custbarcode
+            // 
+            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
+            this.pib_custbarcode.HeaderText = "料盘条码";
+            this.pib_custbarcode.Name = "pib_custbarcode";
+            this.pib_custbarcode.ReadOnly = true;
+            this.pib_custbarcode.Width = 78;
+            // 
+            // pib_custoutboxcode
+            // 
+            this.pib_custoutboxcode.DataPropertyName = "pib_custoutboxcode";
+            this.pib_custoutboxcode.HeaderText = "外箱条码";
+            this.pib_custoutboxcode.Name = "pib_custoutboxcode";
+            this.pib_custoutboxcode.Width = 78;
+            // 
+            // pd_pocode
+            // 
+            this.pd_pocode.DataPropertyName = "pd_pocode";
+            this.pd_pocode.HeaderText = "客户PO";
+            this.pd_pocode.Name = "pd_pocode";
+            this.pd_pocode.ReadOnly = true;
+            this.pd_pocode.Width = 66;
+            // 
+            // pd_custprodcode
+            // 
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "客户料号";
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.ReadOnly = true;
+            this.pd_custprodcode.Width = 78;
+            // 
+            // pd_custprodspec
+            // 
+            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
+            this.pd_custprodspec.HeaderText = "客户型号";
+            this.pd_custprodspec.Name = "pd_custprodspec";
+            this.pd_custprodspec.ReadOnly = true;
+            this.pd_custprodspec.Width = 78;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "规格";
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.Width = 54;
+            // 
+            // pib_outboxcode1
+            // 
+            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
+            this.pib_outboxcode1.HeaderText = "中盒号";
+            this.pib_outboxcode1.Name = "pib_outboxcode1";
+            this.pib_outboxcode1.Width = 90;
+            // 
+            // pib_outboxcode2
+            // 
+            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
+            this.pib_outboxcode2.HeaderText = "外箱号";
+            this.pib_outboxcode2.Name = "pib_outboxcode2";
+            this.pib_outboxcode2.Width = 90;
+            // 
             // pi_inoutno
             // 
             this.pi_inoutno.Condition = null;
@@ -1298,7 +1521,7 @@
             // 
             this.LabelSpace.AutoSize = true;
             this.LabelSpace.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LabelSpace.Location = new System.Drawing.Point(5, 130);
+            this.LabelSpace.Location = new System.Drawing.Point(8, 138);
             this.LabelSpace.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LabelSpace.Name = "LabelSpace";
             this.LabelSpace.Size = new System.Drawing.Size(75, 21);
@@ -1311,7 +1534,7 @@
             // 
             this.label8.AutoSize = true;
             this.label8.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label8.Location = new System.Drawing.Point(5, 20);
+            this.label8.Location = new System.Drawing.Point(4, 19);
             this.label8.Name = "label8";
             this.label8.Size = new System.Drawing.Size(55, 20);
             this.label8.TabIndex = 116;
@@ -1320,7 +1543,7 @@
             // SingleDocRefresh
             // 
             this.SingleDocRefresh.AutoSize = true;
-            this.SingleDocRefresh.Location = new System.Drawing.Point(59, 20);
+            this.SingleDocRefresh.Location = new System.Drawing.Point(58, 19);
             this.SingleDocRefresh.Name = "SingleDocRefresh";
             this.SingleDocRefresh.Size = new System.Drawing.Size(42, 21);
             this.SingleDocRefresh.TabIndex = 89;
@@ -1342,7 +1565,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(80, 206);
+            this.SingleLabelPrint.Location = new System.Drawing.Point(80, 208);
             this.SingleLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelPrint.Name = "SingleLabelPrint";
             this.SingleLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1355,7 +1578,7 @@
             // 
             this.SingleLabelAutoPrint.AutoSize = true;
             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(6, 102);
+            this.SingleLabelAutoPrint.Location = new System.Drawing.Point(9, 110);
             this.SingleLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.SingleLabelAutoPrint.Name = "SingleLabelAutoPrint";
             this.SingleLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1415,7 +1638,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label9.Location = new System.Drawing.Point(5, 20);
+            this.label9.Location = new System.Drawing.Point(4, 19);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(55, 20);
             this.label9.TabIndex = 117;
@@ -1424,7 +1647,7 @@
             // MidDocRefresh
             // 
             this.MidDocRefresh.AutoSize = true;
-            this.MidDocRefresh.Location = new System.Drawing.Point(57, 20);
+            this.MidDocRefresh.Location = new System.Drawing.Point(56, 19);
             this.MidDocRefresh.Name = "MidDocRefresh";
             this.MidDocRefresh.Size = new System.Drawing.Size(42, 21);
             this.MidDocRefresh.TabIndex = 90;
@@ -1449,7 +1672,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(8, 174);
+            this.label5.Location = new System.Drawing.Point(7, 173);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(32, 17);
             this.label5.TabIndex = 50;
@@ -1459,7 +1682,7 @@
             // 
             this.label4.AutoSize = true;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label4.Location = new System.Drawing.Point(8, 143);
+            this.label4.Location = new System.Drawing.Point(7, 142);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(32, 17);
             this.label4.TabIndex = 49;
@@ -1479,7 +1702,7 @@
             // 
             this.label15.AutoSize = true;
             this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label15.Location = new System.Drawing.Point(99, 144);
+            this.label15.Location = new System.Drawing.Point(98, 143);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(20, 17);
             this.label15.TabIndex = 40;
@@ -1511,7 +1734,7 @@
             // 
             this.MidLabelAutoPrint.AutoSize = true;
             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(5, 106);
+            this.MidLabelAutoPrint.Location = new System.Drawing.Point(4, 105);
             this.MidLabelAutoPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MidLabelAutoPrint.Name = "MidLabelAutoPrint";
             this.MidLabelAutoPrint.Size = new System.Drawing.Size(75, 21);
@@ -1533,6 +1756,7 @@
             // 
             // OutBoxLabel
             // 
+            this.OutBoxLabel.Controls.Add(this.DiffCustOutBoxCode);
             this.OutBoxLabel.Controls.Add(this.groupBoxWithBorder2);
             this.OutBoxLabel.Controls.Add(this.label19);
             this.OutBoxLabel.Controls.Add(this.OutDocRefresh);
@@ -1555,6 +1779,18 @@
             this.OutBoxLabel.TabStop = false;
             this.OutBoxLabel.Text = "外箱标签";
             // 
+            // DiffCustOutBoxCode
+            // 
+            this.DiffCustOutBoxCode.AutoSize = true;
+            this.DiffCustOutBoxCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.DiffCustOutBoxCode.Location = new System.Drawing.Point(96, 165);
+            this.DiffCustOutBoxCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.DiffCustOutBoxCode.Name = "DiffCustOutBoxCode";
+            this.DiffCustOutBoxCode.Size = new System.Drawing.Size(75, 21);
+            this.DiffCustOutBoxCode.TabIndex = 96;
+            this.DiffCustOutBoxCode.Text = "区分流水";
+            this.DiffCustOutBoxCode.UseVisualStyleBackColor = true;
+            // 
             // groupBoxWithBorder2
             // 
             this.groupBoxWithBorder2.Controls.Add(this.cu_print_ordercode);
@@ -1576,7 +1812,7 @@
             // 
             this.cu_print_ordercode.AutoSize = true;
             this.cu_print_ordercode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_ordercode.Location = new System.Drawing.Point(6, 67);
+            this.cu_print_ordercode.Location = new System.Drawing.Point(5, 66);
             this.cu_print_ordercode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cu_print_ordercode.Name = "cu_print_ordercode";
             this.cu_print_ordercode.Size = new System.Drawing.Size(75, 21);
@@ -1588,7 +1824,7 @@
             // 
             this.cu_print_outpo.AutoSize = true;
             this.cu_print_outpo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outpo.Location = new System.Drawing.Point(6, 44);
+            this.cu_print_outpo.Location = new System.Drawing.Point(5, 43);
             this.cu_print_outpo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cu_print_outpo.Name = "cu_print_outpo";
             this.cu_print_outpo.Size = new System.Drawing.Size(75, 21);
@@ -1600,7 +1836,7 @@
             // 
             this.cu_print_outdc.AutoSize = true;
             this.cu_print_outdc.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outdc.Location = new System.Drawing.Point(6, 115);
+            this.cu_print_outdc.Location = new System.Drawing.Point(5, 114);
             this.cu_print_outdc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cu_print_outdc.Name = "cu_print_outdc";
             this.cu_print_outdc.Size = new System.Drawing.Size(44, 21);
@@ -1612,7 +1848,7 @@
             // 
             this.cu_print_outlotno.AutoSize = true;
             this.cu_print_outlotno.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outlotno.Location = new System.Drawing.Point(6, 90);
+            this.cu_print_outlotno.Location = new System.Drawing.Point(5, 89);
             this.cu_print_outlotno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cu_print_outlotno.Name = "cu_print_outlotno";
             this.cu_print_outlotno.Size = new System.Drawing.Size(63, 21);
@@ -1624,7 +1860,7 @@
             // 
             this.cu_print_outprod.AutoSize = true;
             this.cu_print_outprod.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.cu_print_outprod.Location = new System.Drawing.Point(6, 19);
+            this.cu_print_outprod.Location = new System.Drawing.Point(5, 18);
             this.cu_print_outprod.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cu_print_outprod.Name = "cu_print_outprod";
             this.cu_print_outprod.Size = new System.Drawing.Size(75, 21);
@@ -1636,7 +1872,7 @@
             // 
             this.label19.AutoSize = true;
             this.label19.Font = new System.Drawing.Font("微软雅黑", 10F);
-            this.label19.Location = new System.Drawing.Point(3, 21);
+            this.label19.Location = new System.Drawing.Point(2, 20);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(55, 20);
             this.label19.TabIndex = 118;
@@ -1645,7 +1881,7 @@
             // OutDocRefresh
             // 
             this.OutDocRefresh.AutoSize = true;
-            this.OutDocRefresh.Location = new System.Drawing.Point(56, 21);
+            this.OutDocRefresh.Location = new System.Drawing.Point(55, 20);
             this.OutDocRefresh.Name = "OutDocRefresh";
             this.OutDocRefresh.Size = new System.Drawing.Size(42, 21);
             this.OutDocRefresh.TabIndex = 91;
@@ -1656,7 +1892,7 @@
             // LogingOut
             // 
             this.LogingOut.AutoSize = true;
-            this.LogingOut.Location = new System.Drawing.Point(100, 2);
+            this.LogingOut.Location = new System.Drawing.Point(99, 1);
             this.LogingOut.Name = "LogingOut";
             this.LogingOut.Size = new System.Drawing.Size(42, 21);
             this.LogingOut.TabIndex = 77;
@@ -1667,7 +1903,7 @@
             // GetOutBoxCode
             // 
             this.GetOutBoxCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.GetOutBoxCode.Location = new System.Drawing.Point(101, 170);
+            this.GetOutBoxCode.Location = new System.Drawing.Point(101, 188);
             this.GetOutBoxCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.GetOutBoxCode.Name = "GetOutBoxCode";
             this.GetOutBoxCode.Size = new System.Drawing.Size(68, 26);
@@ -1693,7 +1929,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(89, 137);
+            this.label10.Location = new System.Drawing.Point(92, 141);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(32, 17);
             this.label10.TabIndex = 90;
@@ -1703,7 +1939,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(89, 107);
+            this.label6.Location = new System.Drawing.Point(91, 111);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(32, 17);
             this.label6.TabIndex = 87;
@@ -1737,7 +1973,7 @@
             // OutBoxLabelPrint
             // 
             this.OutBoxLabelPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.OutBoxLabelPrint.Location = new System.Drawing.Point(101, 205);
+            this.OutBoxLabelPrint.Location = new System.Drawing.Point(101, 218);
             this.OutBoxLabelPrint.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.OutBoxLabelPrint.Name = "OutBoxLabelPrint";
             this.OutBoxLabelPrint.Size = new System.Drawing.Size(68, 26);
@@ -1758,234 +1994,6 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // Choose
-            // 
-            this.Choose.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.Choose.HeaderText = "勾选";
-            this.Choose.Name = "Choose";
-            this.Choose.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.Choose.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.Choose.Width = 55;
-            // 
-            // pr_midboxcapacity_user
-            // 
-            this.pr_midboxcapacity_user.DataPropertyName = "pr_midboxcapacity_user";
-            this.pr_midboxcapacity_user.HeaderText = "pr_midboxcapacity_user";
-            this.pr_midboxcapacity_user.Name = "pr_midboxcapacity_user";
-            this.pr_midboxcapacity_user.Visible = false;
-            this.pr_midboxcapacity_user.Width = 162;
-            // 
-            // pib_ifpick
-            // 
-            this.pib_ifpick.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifpick.DataPropertyName = "pib_ifpick";
-            this.pib_ifpick.HeaderText = "已采集";
-            this.pib_ifpick.Name = "pib_ifpick";
-            this.pib_ifpick.Width = 60;
-            // 
-            // pib_ifprint
-            // 
-            this.pib_ifprint.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_ifprint.DataPropertyName = "pib_ifprint";
-            this.pib_ifprint.HeaderText = "已打印";
-            this.pib_ifprint.Name = "pib_ifprint";
-            this.pib_ifprint.Width = 60;
-            // 
-            // pib_id1
-            // 
-            this.pib_id1.DataPropertyName = "pib_id";
-            this.pib_id1.HeaderText = "pib_id";
-            this.pib_id1.Name = "pib_id1";
-            this.pib_id1.Visible = false;
-            this.pib_id1.Width = 66;
-            // 
-            // pib_pdno
-            // 
-            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pib_pdno.DataPropertyName = "pib_pdno";
-            this.pib_pdno.HeaderText = "明细序号";
-            this.pib_pdno.Name = "pib_pdno";
-            this.pib_pdno.ReadOnly = true;
-            this.pib_pdno.Width = 78;
-            // 
-            // pib_prodcode
-            // 
-            this.pib_prodcode.DataPropertyName = "pib_prodcode";
-            this.pib_prodcode.HeaderText = "物料编号";
-            this.pib_prodcode.Name = "pib_prodcode";
-            this.pib_prodcode.ReadOnly = true;
-            this.pib_prodcode.Width = 78;
-            // 
-            // pd_ordercode
-            // 
-            this.pd_ordercode.DataPropertyName = "pd_ordercode";
-            this.pd_ordercode.HeaderText = "订单编号";
-            this.pd_ordercode.Name = "pd_ordercode";
-            this.pd_ordercode.Width = 78;
-            // 
-            // pr_orispeccode
-            // 
-            this.pr_orispeccode.DataPropertyName = "pr_orispeccode";
-            this.pr_orispeccode.HeaderText = "MPN";
-            this.pr_orispeccode.Name = "pr_orispeccode";
-            this.pr_orispeccode.ReadOnly = true;
-            this.pr_orispeccode.Width = 48;
-            // 
-            // pib_brand
-            // 
-            this.pib_brand.DataPropertyName = "pib_brand";
-            this.pib_brand.HeaderText = "品牌";
-            this.pib_brand.Name = "pib_brand";
-            this.pib_brand.ReadOnly = true;
-            this.pib_brand.Visible = false;
-            this.pib_brand.Width = 54;
-            // 
-            // pib_madein
-            // 
-            this.pib_madein.DataPropertyName = "pib_madein";
-            this.pib_madein.HeaderText = "产地";
-            this.pib_madein.Name = "pib_madein";
-            this.pib_madein.Width = 54;
-            // 
-            // pr_zxbzs
-            // 
-            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
-            this.pr_zxbzs.HeaderText = "最小包装数";
-            this.pr_zxbzs.Name = "pr_zxbzs";
-            this.pr_zxbzs.Visible = false;
-            this.pr_zxbzs.Width = 90;
-            // 
-            // pr_unit
-            // 
-            this.pr_unit.DataPropertyName = "pr_unit";
-            this.pr_unit.HeaderText = "单位";
-            this.pr_unit.Name = "pr_unit";
-            this.pr_unit.Visible = false;
-            this.pr_unit.Width = 54;
-            // 
-            // pib_lotno
-            // 
-            this.pib_lotno.DataPropertyName = "pib_lotno";
-            this.pib_lotno.HeaderText = "LotNo";
-            this.pib_lotno.Name = "pib_lotno";
-            this.pib_lotno.Width = 60;
-            // 
-            // pib_datecode
-            // 
-            this.pib_datecode.DataPropertyName = "pib_datecode";
-            this.pib_datecode.HeaderText = "DateCode";
-            this.pib_datecode.Name = "pib_datecode";
-            this.pib_datecode.Width = 78;
-            // 
-            // pib_year
-            // 
-            this.pib_year.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-            this.pib_year.DataPropertyName = "pib_year";
-            this.pib_year.HeaderText = "年";
-            this.pib_year.Name = "pib_year";
-            this.pib_year.Visible = false;
-            this.pib_year.Width = 42;
-            // 
-            // pib_month
-            // 
-            this.pib_month.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_month.DataPropertyName = "pib_month";
-            this.pib_month.HeaderText = "月";
-            this.pib_month.Name = "pib_month";
-            this.pib_month.Visible = false;
-            this.pib_month.Width = 42;
-            // 
-            // pib_day
-            // 
-            this.pib_day.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_day.DataPropertyName = "pib_day";
-            this.pib_day.HeaderText = "日";
-            this.pib_day.Name = "pib_day";
-            this.pib_day.Visible = false;
-            this.pib_day.Width = 42;
-            // 
-            // pib_qty
-            // 
-            this.pib_qty.DataPropertyName = "pib_qty";
-            this.pib_qty.HeaderText = "数量";
-            this.pib_qty.Name = "pib_qty";
-            this.pib_qty.ReadOnly = true;
-            this.pib_qty.Width = 54;
-            // 
-            // pib_barcode
-            // 
-            this.pib_barcode.DataPropertyName = "pib_barcode";
-            this.pib_barcode.HeaderText = "唯一条码";
-            this.pib_barcode.Name = "pib_barcode";
-            this.pib_barcode.ReadOnly = true;
-            this.pib_barcode.Visible = false;
-            this.pib_barcode.Width = 78;
-            // 
-            // pib_custbarcode
-            // 
-            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
-            this.pib_custbarcode.HeaderText = "料盘条码";
-            this.pib_custbarcode.Name = "pib_custbarcode";
-            this.pib_custbarcode.ReadOnly = true;
-            this.pib_custbarcode.Width = 78;
-            // 
-            // pib_custoutboxcode
-            // 
-            this.pib_custoutboxcode.DataPropertyName = "pib_custoutboxcode";
-            this.pib_custoutboxcode.HeaderText = "外箱条码";
-            this.pib_custoutboxcode.Name = "pib_custoutboxcode";
-            this.pib_custoutboxcode.Visible = false;
-            this.pib_custoutboxcode.Width = 78;
-            // 
-            // pd_pocode
-            // 
-            this.pd_pocode.DataPropertyName = "pd_pocode";
-            this.pd_pocode.HeaderText = "客户PO";
-            this.pd_pocode.Name = "pd_pocode";
-            this.pd_pocode.ReadOnly = true;
-            this.pd_pocode.Width = 66;
-            // 
-            // pd_custprodcode
-            // 
-            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode.HeaderText = "客户料号";
-            this.pd_custprodcode.Name = "pd_custprodcode";
-            this.pd_custprodcode.ReadOnly = true;
-            this.pd_custprodcode.Width = 78;
-            // 
-            // pd_custprodspec
-            // 
-            this.pd_custprodspec.DataPropertyName = "pd_custprodspec";
-            this.pd_custprodspec.HeaderText = "客户型号";
-            this.pd_custprodspec.Name = "pd_custprodspec";
-            this.pd_custprodspec.ReadOnly = true;
-            this.pd_custprodspec.Visible = false;
-            this.pd_custprodspec.Width = 78;
-            // 
-            // pr_spec
-            // 
-            this.pr_spec.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-            this.pr_spec.DataPropertyName = "pr_spec";
-            this.pr_spec.HeaderText = "规格";
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.Width = 54;
-            // 
-            // pib_outboxcode1
-            // 
-            this.pib_outboxcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode1.DataPropertyName = "pib_outboxcode1";
-            this.pib_outboxcode1.HeaderText = "中盒号";
-            this.pib_outboxcode1.Name = "pib_outboxcode1";
-            this.pib_outboxcode1.Width = 90;
-            // 
-            // pib_outboxcode2
-            // 
-            this.pib_outboxcode2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_outboxcode2.DataPropertyName = "pib_outboxcode2";
-            this.pib_outboxcode2.HeaderText = "外箱号";
-            this.pib_outboxcode2.Name = "pib_outboxcode2";
-            this.pib_outboxcode2.Width = 90;
-            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -2209,6 +2217,7 @@
         private System.Windows.Forms.Button GetMidBoxCode;
         private System.Windows.Forms.CheckBox cu_print_ordercode;
         private System.Windows.Forms.CheckBox LabelSpace;
+        private System.Windows.Forms.CheckBox DiffCustOutBoxCode;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_midboxcapacity_user;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifpick;

UAS-出货标签管理(贸易版)/UAS_出货标签管理.cs

@@ -172,6 +172,27 @@ namespace UAS_LabelMachine
             PropertyInfo pi = dgvType.GetProperty("DoubleBuffered", BindingFlags.Instance | BindingFlags.NonPublic);
             pi.SetValue(this.LabelInf, true, null);
             Text = Text + "-" + Master;
+            InitCustView();
+        }
+
+        public void InitCustView()
+        {
+            switch (SystemInf.Master)
+            {
+                case "N_HC":
+                    DiffCustOutBoxCode.Checked = true;
+                    break;
+                case "SZSI_TEST":
+                    BaseUtil.SetControlsVisible(pib_year, pib_month, pib_day, pib_custoutboxcode);
+                    pib_custbarcode.HeaderText = "芯片号";
+                    break;
+                case "SZSI":
+                    BaseUtil.SetControlsVisible(pib_year, pib_month, pib_day, pib_custoutboxcode);
+                    pib_custbarcode.HeaderText = "芯片号";
+                    break;
+                default:
+                    break;
+            }
         }
 
         protected override void WndProc(ref System.Windows.Forms.Message m)
@@ -1039,7 +1060,6 @@ namespace UAS_LabelMachine
                 {
                     SingleDoc = lbl.Documents.Open(ftpOperater.DownLoadTo + SingleLabelCombox.Text);
                     SingleDoc.Printer.SwitchTo(SingleLabelPrinter.Text);
-
                 }
                 else
                 {
@@ -1555,6 +1575,43 @@ namespace UAS_LabelMachine
                 Print.CodeSoft.OutPrint(OutBoxDoc, OutLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode2, cu_print_outprod.Checked, cu_print_outpo.Checked, cu_print_outdc.Checked, cu_print_outlotno.Checked, cu_print_ordercode.Checked);
             else
             {
+                if (DiffCustOutBoxCode.Checked)
+                {
+                    //执行本地SQL，获取需要更新的DataCode
+                    DataTable dt = (DataTable)sdh.ExecuteSql(BaseUtil.GetOutBoxSQL(OutFormat, OutLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode2, cu_print_outprod.Checked, cu_print_outpo.Checked, cu_print_outdc.Checked, cu_print_outlotno.Checked, cu_print_ordercode.Checked), "select");
+                    //大于1行表示有需要分组的数据
+                    if (dt.Rows.Count > 1)
+                    {
+                        for (int i = 0; i < dt.Rows.Count; i++)
+                        {
+                            GetCustRule();
+                            string custoutboxcode = LogicHandler.BarcodeMethod1(Prefix, Suffix, SerialNumIndex, SerialNumLength, Radix);
+                            //勾选了这些参数并且打印的时候需要才进行更新
+                            if (cu_print_outprod.Checked && dt.Columns.Contains("pd_custprodcode"))
+                            {
+                                dh.ExecuteSql("update prodiobarcode set pib_custoutboxcode='" + custoutboxcode + "' where pib_id in(select pib_id from prodiobarcode left join prodinout on pib_inoutno=pi_inoutno left join prodiodetail on pd_piid=pi_id and pib_prodcode=pd_prodcode where pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode2='" + pib_outboxcode2 + "' and pd_custprodcode='" + dt.Rows[i]["pd_custprodcode"].ToString() + "')", "update");
+                            }
+                            if (cu_print_outpo.Checked && dt.Columns.Contains("pd_pocode"))
+                            {
+                                dh.ExecuteSql("update prodiobarcode set pib_custoutboxcode='" + custoutboxcode + "' where pib_id in(select pib_id from prodiobarcode left join prodinout on pib_inoutno=pi_inoutno left join prodiodetail on pd_piid=pi_id and pib_prodcode=pd_prodcode where pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode2='" + pib_outboxcode2 + "' and pd_pocode='" + dt.Rows[i]["pd_pocode"].ToString() + "')", "update");
+                            }
+                            if (cu_print_ordercode.Checked && dt.Columns.Contains("pd_ordercode"))
+                            {
+                                dh.ExecuteSql("update prodiobarcode set pib_custoutboxcode='" + custoutboxcode + "' where pib_id in(select pib_id from prodiobarcode left join prodinout on pib_inoutno=pi_inoutno left join prodiodetail on pd_piid=pi_id and pib_prodcode=pd_prodcode where pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode2='" + pib_outboxcode2 + "' and pd_ordercode='" + dt.Rows[i]["pd_ordercode"].ToString() + "')", "update");
+                            }
+                            if (cu_print_outdc.Checked && dt.Columns.Contains("pib_datecode"))
+                            {
+                                dh.ExecuteSql("update prodiobarcode set pib_custoutboxcode='" + custoutboxcode + "' where pib_id in(select pib_id from prodiobarcode left join prodinout on pib_inoutno=pi_inoutno left join prodiodetail on pd_piid=pi_id and pib_prodcode=pd_prodcode where pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode2='" + pib_outboxcode2 + "' and pib_datecode='" + dt.Rows[i]["pib_datecode"].ToString() + "')", "update");
+                            }
+                            if (cu_print_outlotno.Checked && dt.Columns.Contains("pib_lotno"))
+                            {
+                                dh.ExecuteSql("update prodiobarcode set pib_custoutboxcode='" + custoutboxcode + "' where pib_id in(select pib_id from prodiobarcode left join prodinout on pib_inoutno=pi_inoutno left join prodiodetail on pd_piid=pi_id and pib_prodcode=pd_prodcode where pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode2='" + pib_outboxcode2 + "' and pib_lotno='" + dt.Rows[i]["pib_lotno"].ToString() + "')", "update");
+                            }
+                            dh.UpdateByCondition("RuleMaxNum", "rmn_maxnumber='" + custserialnum + "'", "rmn_nrcode='" + NrCode + "' and rmn_prefix='" + Prefix + "'");
+                        }
+                    }
+                }
+                LoadGridData(true);
                 Print.BarTender.OutPrint(OutFormat, OutLabelParam, pi_inoutno.Text, pib_id, pib_outboxcode2, cu_print_outprod.Checked, cu_print_outpo.Checked, cu_print_outdc.Checked, cu_print_outlotno.Checked, cu_print_ordercode.Checked);
                 if (LabelSpace.Checked)
                 {
@@ -1641,9 +1698,9 @@ namespace UAS_LabelMachine
             }
         }
 
-        private void LoadGridData()
+        private void LoadGridData(bool AllCollect)
         {
-            LoadGridData(new object(), new EventArgs());
+            LoadGridData(AllCollect, new EventArgs());
         }
         DataTable LabelInfDataTable;
         /// <summary>
@@ -1653,10 +1710,10 @@ namespace UAS_LabelMachine
         /// <param name="e"></param>
         private void LoadGridData(object sender, EventArgs e)
         {
-            AllCollect = false;
+            AllCollect = sender.Equals(true);
             //查询Oracle数据库
             sql.Clear();
-            sql.Append("select t.*,rownum from prodiobarcode_view t where pib_inoutno='" + pi_inoutno.Text + "' order by to_number(pib_id)");
+            sql.Append("select t.*,rownum from prodiobarcode_view t where pib_inoutno='" + pi_inoutno.Text + "' ");
             LabelInfDataTable = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             //查询本地数据库
             sql.Clear();
@@ -1693,7 +1750,7 @@ namespace UAS_LabelMachine
                 sdh.BatchInsert("prodiobarcode", LabelInfDataTable);
             }
             sql.Clear();
-            sql.Append("select * from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' order by pib_id ");
+            sql.Append("select * from prodiobarcode where pib_inoutno='" + pi_inoutno.Text + "' order by pib_id");
             LabelInfDataTable = (DataTable)sdh.ExecuteSql(sql.ToString(), "select");
             bindingsource(LabelInf, LabelInfDataTable);
             //有数据的话默认取第一条的品牌去取采集策略
@@ -2575,7 +2632,7 @@ namespace UAS_LabelMachine
             {
                 GetCustRule();
                 LogicHandler.ImportExcel(SystemInf.Master, ImportExcel.FileName, PI_ID, pi_inoutno.Text, cu_code.Text);
-                LoadGridData();
+                LoadGridData(false);
             }
             catch (Exception ex)
             {
@@ -2629,7 +2686,7 @@ namespace UAS_LabelMachine
                 sql += " limit 0," + nums + ")";
             }
             sdh.ExecuteSql(sql, "update");
-            LoadGridData();
+            LoadGridData(false);
             setvalue.FindForm().Close();
         }
 
@@ -2689,7 +2746,7 @@ namespace UAS_LabelMachine
             string SQL = "";
             LogicHandler.CustBarCode(pi_inoutno.Text, out SQL);
             sdh.ExecuteSql(SQL, "update");
-            LoadGridData();
+            LoadGridData(false);
         }
 
         private void GetMidBoxCode_Click(object sender, EventArgs e)