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

PLCDataReader/DataOperate/DataHelper.cs

@@ -12,7 +12,7 @@ namespace UAS_PLCDataReader.DataOperate
         //系统默认的的连接字符串
         private string ConnectionStrings = Properties.Settings.Default.Properties["MES"].DefaultValue.ToString();
         //用户选择的数据库的连接字符串
-        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_MES_PROD;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.253.6)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
+        public static string DBConnectionString = "Connection Timeout=0;Pooling=false;Password=select!#%*(;User ID=UAS_DEV;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.253.6)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));";
         public static OracleConnection connection = null;
         OracleCommand command = null;
         /// <summary>
@@ -815,9 +815,16 @@ namespace UAS_PLCDataReader.DataOperate
                     DateTime[] time = new DateTime[names[i].Length];
                     for (int j = 0; j < names[i].Length; j++)
                     {
-                        time[j] = Convert.ToDateTime(names[i][j]);
+                        try
+                        {
+                            time[j] = Convert.ToDateTime(names[i][j]);
+                            command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Date, time, ParameterDirection.Input));
+                        }
+                        catch (Exception)
+                        {
+                            command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
+                        }
                     }
-                    command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Date, time, ParameterDirection.Input));
                 }
                 else
                 {

PLCDataReader/Main.cs

@@ -155,7 +155,7 @@ namespace UAS_PLCDataReader
             GridPollingSetting.GetDataSQL = "SELECT '' POLLSETTINGSTATUSCOLUMN,0 CHECKEDCOLUMN,DPC_MAN,DPC_ID,DPC_DECODE,de_name DPC_DENAME ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , nvl(DPC_ENABLE,0)DPC_ENABLE,DPC_STATUS,DPC_REMARK,EM_NAME FROM DEVICEPOLLINGCONFIG left join EMPLOYEE on em_code=dpc_man left join device on de_code=dpc_decode WHERE DPC_MAN='" + User.UserCode + "' ORDER BY DPC_ID";
             GridPollingSetting.ID = "DPC_ID";
             GridPollingSetting.TableName = "DEVICEPOLLINGCONFIG";
-            GridPollingSetting.InsertSQL = "insert into DEVICEPOLLINGCONFIG(DPC_ID,DPC_DECODE, DPC_DENAME ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , DPC_ENABLE,DPC_STATUS ,DPC_REMARK,DPC_MAN) values(DEVICEPOLLINGCONFIG_seq.nextval,:DPC_DECODE  ,:DPC_INTERVAL ,:DPC_DCCODE ,:DPC_FUNCTION , :DPC_ENABLE,:DPC_STATUS ,:DPC_REMARK,'" + User.UserCode + "')";
+            GridPollingSetting.InsertSQL = "insert into DEVICEPOLLINGCONFIG(DPC_ID,DPC_DECODE, DPC_DENAME ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , DPC_ENABLE,DPC_STATUS ,DPC_REMARK,DPC_MAN) values(DEVICEPOLLINGCONFIG_seq.nextval,:DPC_DECODE,:DPC_DENAME,:DPC_INTERVAL ,:DPC_DCCODE ,:DPC_FUNCTION , :DPC_ENABLE,:DPC_STATUS ,:DPC_REMARK,'" + User.UserCode + "')";
             ButtonSaveCommandSet.Grid = GridPollingSetting;
             ButtonNewCommandSet.Grid = GridPollingSetting;
             ButtonDeleteCommandSet.Grid = GridPollingSetting;
@@ -597,6 +597,7 @@ namespace UAS_PLCDataReader
                     client[DpcID].Returnvalue.Remove(IP);
                 }
             }
+            else LogicHandler.UpdateDeviceStatus(pl.Dh, pl.DeviceCode, pl.DeviceName, DeviceStatus.Disconnect);
         }
 
         /// <summary>

UAS-出货标签管理(吉利通)/CustomControl/SerialPortWithTag.Designer.cs

@@ -0,0 +1,36 @@
+namespace UAS_LabelMachine.CustomControl
+{
+    partial class SerialPortWithTag
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            components = new System.ComponentModel.Container();
+        }
+
+        #endregion
+    }
+}

UAS-出货标签管理(吉利通)/CustomControl/SerialPortWithTag.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using System.IO.Ports;
+
+namespace UAS_LabelMachine.CustomControl
+{
+    public partial class SerialPortWithTag : SerialPort
+    {
+
+        private string tag;
+
+        public SerialPortWithTag()
+        {
+            InitializeComponent();
+        }
+
+        public string Tag
+        {
+            get
+            {
+                return tag;
+            }
+
+            set
+            {
+                tag = value;
+            }
+        }
+    }
+}

UAS-出货标签管理(吉利通)/ParamSetting.Designer.cs

@@ -189,6 +189,7 @@
             this.COM5.Str1 = null;
             this.COM5.Str2 = null;
             this.COM5.TabIndex = 6;
+            this.COM5.Tag = "ManBackendCheck";
             // 
             // label13
             // 
@@ -277,6 +278,7 @@
             this.COM4.Str1 = null;
             this.COM4.Str2 = null;
             this.COM4.TabIndex = 6;
+            this.COM4.Tag = "BackendCheck";
             // 
             // label17
             // 
@@ -374,6 +376,7 @@
             this.COM3.Str1 = null;
             this.COM3.Str2 = null;
             this.COM3.TabIndex = 5;
+            this.COM3.Tag = "FrontendCheck";
             // 
             // label16
             // 
@@ -458,6 +461,7 @@
             this.COM2.Str1 = null;
             this.COM2.Str2 = null;
             this.COM2.TabIndex = 4;
+            this.COM2.Tag = "PLC2";
             // 
             // label4
             // 
@@ -533,6 +537,7 @@
             this.COM1.Str1 = null;
             this.COM1.Str2 = null;
             this.COM1.TabIndex = 3;
+            this.COM1.Tag = "PLC1";
             // 
             // label3
             // 

UAS-出货标签管理(吉利通)/ParamSetting.cs

@@ -80,6 +80,7 @@ namespace UAS_LabelMachine
             for (int i = 1; i < 6; i++)
             {
                 COMINFO.Rows[i - 1]["COM"] =  Controls["GP"].Controls["GP" + i].Controls["COM" + i].Text;
+                COMINFO.Rows[i - 1]["COMTYPE"] = Controls["GP"].Controls["GP" + i].Controls["COM" + i].Tag.ToString();
                 COMINFO.Rows[i - 1]["BaudRate"]= Controls["GP"].Controls["GP" + i].Controls["BaudRate" + i].Text ;
                 COMINFO.Rows[i - 1]["Datawait"]=Controls["GP"].Controls["GP" + i].Controls["Datawait" + i].Text  ;
                 if (Controls["GP"].Controls["GP" + i].Controls["OutTime" + i] != null)

UAS-出货标签管理(吉利通)/PublicMethod/DataGridViewVirtualModel.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+
+namespace UAS_LabelMachine.PublicMethod
+{
+    class DataGridViewVirtualModel
+    {
+        public interface IDataPageRetriever
+        {
+            DataTable ApplyPageOfData(int lowPageBoundary, int rowsPerPage);
+        }
+
+        internal class DataRetriever : IDataPageRetriever
+        {
+
+            private DataColumnCollection columns;
+
+            private string commaSeparatedColumnNames;
+
+            public DataTable ApplyPageOfData(int lowPageBoundary, int rowsPerPage)
+            {
+                return new DataTable();
+            }
+
+            #region IDataPageRetriver 
+            #endregion
+        }
+
+        internal class Cache
+        {
+            private struct DataPage
+            {
+                public DataTable table;
+                private int lowIndex;
+                private int highIndex;
+
+                public DataPage(DataTable table, int rowIndex)
+                {
+                    this.table = table;
+                    this.lowIndex = MapLowerBoundary(rowIndex);
+                    this.highIndex = MapUpperBoundary(rowIndex);
+                }
+                public int LowIndex
+                {
+                    get { return this.lowIndex; }
+                }
+                public int HighIndex
+                {
+                    get { return this.highIndex; }
+                }
+
+                public static int MapLowerBoundary(int rowIndex)
+                {
+                    return (rowIndex / RowPerPage) * RowPerPage;
+                }
+                public static int MapUpperBoundary(int rowIndex)
+                {
+                    return MapLowerBoundary(rowIndex) + RowPerPage - 1;
+                }
+            }
+            IDataPageRetriever dataSupply;
+            static int RowPerPage;
+            DataPage[] catchPages = new DataPage[2];
+
+            public Cache(IDataPageRetriever dataSupplier, int rowsPerPage)
+            {
+                this.dataSupply = dataSupplier;
+                RowPerPage = rowsPerPage;
+                PreLoadDataPages();
+            }
+            private void PreLoadDataPages()
+            {
+                catchPages[0] = new DataPage(dataSupply.ApplyPageOfData(0, RowPerPage), 0);
+                catchPages[1] = new DataPage(dataSupply.ApplyPageOfData(RowPerPage, RowPerPage), RowPerPage);
+            }
+            public string RetrieveElement(int rowIndex, int colIndex)
+            {
+                string element = "";
+                if (IfPageCatched_TheSetElement(rowIndex, colIndex, ref element))
+                {
+                    return element;
+                }
+                else
+                {
+                    element = RetrieveData_CatchIt_ReturnElement(rowIndex, colIndex);
+                }
+                return element;
+            }
+
+            private bool IfPageCatched_TheSetElement(int rowIndex, int colIndex, ref string element)
+            {
+                if (IsRowCatchedInPage(0, rowIndex))
+                {
+                    element = catchPages[0].table.Rows[rowIndex % RowPerPage][colIndex].ToString();
+                    return true;
+                }
+                else if (IsRowCatchedInPage(1, rowIndex))
+                {
+                    element = catchPages[1].table.Rows[rowIndex % RowPerPage][colIndex].ToString();
+                    return true;
+                }
+                return false;
+            }
+
+            private string RetrieveData_CatchIt_ReturnElement(int rowIndex, int colIndex)
+            {
+
+                DataPage newPage = new DataPage(dataSupply.ApplyPageOfData(DataPage.MapLowerBoundary(rowIndex), RowPerPage), rowIndex);
+
+                //which old datapage should be replaced?
+                catchPages[GetIndexOfReplacedPage(rowIndex)] = newPage;
+
+                return RetrieveElement(rowIndex, colIndex);
+            }
+
+            private bool IsRowCatchedInPage(int pageNum, int rowIndex)
+            {
+                return catchPages[pageNum].LowIndex <= rowIndex &&
+                    catchPages[pageNum].HighIndex >= rowIndex;
+            }
+
+            private int GetIndexOfReplacedPage(int rowIndex)
+            {
+                if (catchPages[0].HighIndex < rowIndex && catchPages[1].HighIndex < rowIndex)
+                {
+                    int offsetFromPage0 = rowIndex - catchPages[0].HighIndex;
+                    int offsetFromPage1 = rowIndex - catchPages[1].HighIndex;
+                    if (offsetFromPage0 < offsetFromPage1)
+                        return 1;
+                    else
+                        return 0;
+                }
+                else
+                {
+                    int offsetFromPage0 = catchPages[0].LowIndex - rowIndex;
+                    int offsetFromPage1 = catchPages[1].LowIndex - rowIndex;
+                    if (offsetFromPage0 < offsetFromPage1)
+                        return 1;
+                    return 0;
+                }
+            }
+        }
+    }
+}

UAS-出货标签管理(吉利通)/PublicMethod/DataHelper.cs

@@ -813,7 +813,6 @@ namespace UAS_LabelMachine
         {
             object result = null;
             command = new OracleCommand(SQL, connection);
-            Console.WriteLine(SQL);
             //用来拼接参数的
             if (names.Length > 0)
             {
@@ -967,7 +966,7 @@ namespace UAS_LabelMachine
                         command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Date, time, ParameterDirection.Input));
                     }
                     catch (Exception)
-                    {
+                    {   
                         command.Parameters.Add(new OracleParameter(names[0][i - 1].ToString(), OracleDbType.Varchar2, names[i], ParameterDirection.Input));
                     }
                 }

UAS-出货标签管理(吉利通)/UAS-出货标签管理(吉利通).csproj

@@ -214,6 +214,12 @@
     <Compile Include="CustomControl\SearchTextBox.Designer.cs">
       <DependentUpon>SearchTextBox.cs</DependentUpon>
     </Compile>
+    <Compile Include="CustomControl\SerialPortWithTag.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="CustomControl\SerialPortWithTag.Designer.cs">
+      <DependentUpon>SerialPortWithTag.cs</DependentUpon>
+    </Compile>
     <Compile Include="DbFind.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -249,6 +255,7 @@
     <Compile Include="PublicMethod\ArrayList.cs" />
     <Compile Include="PublicMethod\AutoSizeFormClass.cs" />
     <Compile Include="PublicMethod\BaseUtil.cs" />
+    <Compile Include="PublicMethod\DataGridViewVirtualModel.cs" />
     <Compile Include="PublicMethod\DataHelper.cs" />
     <Compile Include="PublicMethod\ExcelHandler.cs" />
     <Compile Include="PublicMethod\ftpOperater.cs" />

UAS-出货标签管理(吉利通)/UAS_出货标签管理.Designer.cs

@@ -36,7 +36,7 @@
             this.label22 = new System.Windows.Forms.Label();
             this.AutoMatch = new System.Windows.Forms.CheckBox();
             this.pr_code_label = new System.Windows.Forms.Label();
-            this.label24 = new System.Windows.Forms.Label();
+            this.后端复核 = new System.Windows.Forms.Label();
             this.CollectionUnit = new System.Windows.Forms.ComboBox();
             this.CollectionUnit_label = new System.Windows.Forms.Label();
             this.GenerateBarCode = new System.Windows.Forms.Button();
@@ -93,6 +93,7 @@
             this.CleanBarCode = new System.Windows.Forms.Button();
             this.ListButtonMenu = new System.Windows.Forms.ListBox();
             this.ButtonSetting = new System.Windows.Forms.Button();
+            this.FrontendCheck = new UAS_LabelMachine.CustomControl.SerialPortWithTag();
             this.groupBoxWithBorder1 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.ExportData = new System.Windows.Forms.Button();
             this.label18 = new System.Windows.Forms.Label();
@@ -117,7 +118,7 @@
             this.Installed = new System.Windows.Forms.Label();
             this.Process = new System.Windows.Forms.Label();
             this.sg_separator = new UAS_LabelMachine.CustomControl.EnterTextBox();
-            this.Input = new UAS_LabelMachine.CustomControl.EnterTextBox();
+            this.BackCheck = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.griddetno = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.sg_code = new UAS_LabelMachine.CustomControl.SearchTextBox();
             this.MessageLog = new UAS_LabelMachine.CustomControl.RichText.RichTextAutoBottom();
@@ -174,6 +175,9 @@
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxLabelAutoPrint = new System.Windows.Forms.CheckBox();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
+            this.BackendCheck = new UAS_LabelMachine.CustomControl.SerialPortWithTag();
+            this.label8 = new System.Windows.Forms.Label();
+            this.FrontCollect = new UAS_LabelMachine.CustomControl.EnterTextBox();
             ((System.ComponentModel.ISupportInitialize)(this.Si_ItemDGV)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.MidSource)).BeginInit();
             this.groupBoxWithBorder1.SuspendLayout();
@@ -248,15 +252,15 @@
             this.pr_code_label.TabIndex = 51;
             this.pr_code_label.Text = "物料编号";
             // 
-            // label24
+            // 后端复核
             // 
-            this.label24.AutoSize = true;
-            this.label24.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label24.Location = new System.Drawing.Point(9, 218);
-            this.label24.Name = "label24";
-            this.label24.Size = new System.Drawing.Size(51, 20);
-            this.label24.TabIndex = 55;
-            this.label24.Text = "输入框";
+            this.后端复核.AutoSize = true;
+            this.后端复核.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.后端复核.Location = new System.Drawing.Point(7, 218);
+            this.后端复核.Name = "后端复核";
+            this.后端复核.Size = new System.Drawing.Size(65, 20);
+            this.后端复核.TabIndex = 55;
+            this.后端复核.Text = "后端复核";
             // 
             // CollectionUnit
             // 
@@ -757,6 +761,10 @@
             this.ButtonSetting.UseVisualStyleBackColor = true;
             this.ButtonSetting.Click += new System.EventHandler(this.ButtonSetting_Click);
             // 
+            // FrontendCheck
+            // 
+            this.FrontendCheck.Tag = null;
+            // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.Controls.Add(this.ExportData);
@@ -885,7 +893,7 @@
             this.pr_code.Condition = null;
             this.pr_code.DBTitle = null;
             this.pr_code.FormName = null;
-            this.pr_code.Location = new System.Drawing.Point(76, 182);
+            this.pr_code.Location = new System.Drawing.Point(290, 102);
             this.pr_code.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.pr_code.Name = "pr_code";
             this.pr_code.Power = null;
@@ -896,6 +904,7 @@
             this.pr_code.TabIndex = 68;
             this.pr_code.TableName = null;
             this.pr_code.TextBoxEnable = false;
+            this.pr_code.Visible = false;
             this.pr_code.UserControlTextChanged += new UAS_LabelMachine.CustomControl.SearchTextBox.OnTextChange(this.pr_code_UserControlTextChanged);
             this.pr_code.SearchIconClick += new UAS_LabelMachine.CustomControl.SearchTextBox.Icon_Click(this.pr_code_SearchIconClick);
             // 
@@ -1044,18 +1053,19 @@
             this.sg_separator.Str2 = null;
             this.sg_separator.TabIndex = 62;
             // 
-            // Input
+            // BackCheck
             // 
-            this.Input.ID = null;
-            this.Input.Location = new System.Drawing.Point(76, 218);
-            this.Input.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Input.Name = "Input";
-            this.Input.Size = new System.Drawing.Size(150, 21);
-            this.Input.Str = null;
-            this.Input.Str1 = null;
-            this.Input.Str2 = null;
-            this.Input.TabIndex = 54;
-            this.Input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Input_KeyDown);
+            this.BackCheck.Enabled = false;
+            this.BackCheck.ID = null;
+            this.BackCheck.Location = new System.Drawing.Point(76, 218);
+            this.BackCheck.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.BackCheck.Name = "BackCheck";
+            this.BackCheck.Size = new System.Drawing.Size(150, 21);
+            this.BackCheck.Str = null;
+            this.BackCheck.Str1 = null;
+            this.BackCheck.Str2 = null;
+            this.BackCheck.TabIndex = 54;
+            this.BackCheck.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Input_KeyDown);
             // 
             // griddetno
             // 
@@ -1674,12 +1684,41 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
+            // BackendCheck
+            // 
+            this.BackendCheck.Tag = null;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label8.Location = new System.Drawing.Point(7, 192);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(65, 20);
+            this.label8.TabIndex = 91;
+            this.label8.Text = "前端采集";
+            // 
+            // FrontCollect
+            // 
+            this.FrontCollect.Enabled = false;
+            this.FrontCollect.ID = null;
+            this.FrontCollect.Location = new System.Drawing.Point(76, 192);
+            this.FrontCollect.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.FrontCollect.Name = "FrontCollect";
+            this.FrontCollect.Size = new System.Drawing.Size(150, 21);
+            this.FrontCollect.Str = null;
+            this.FrontCollect.Str1 = null;
+            this.FrontCollect.Str2 = null;
+            this.FrontCollect.TabIndex = 90;
+            // 
             // UAS_出货标签打印
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(1389, 711);
+            this.Controls.Add(this.label8);
+            this.Controls.Add(this.FrontCollect);
             this.Controls.Add(this.ButtonSetting);
             this.Controls.Add(this.ListButtonMenu);
             this.Controls.Add(this.CleanBarCode);
@@ -1702,8 +1741,8 @@
             this.Controls.Add(this.GenerateBarCode);
             this.Controls.Add(this.CollectionUnit_label);
             this.Controls.Add(this.CollectionUnit);
-            this.Controls.Add(this.label24);
-            this.Controls.Add(this.Input);
+            this.Controls.Add(this.后端复核);
+            this.Controls.Add(this.BackCheck);
             this.Controls.Add(this.pr_code_label);
             this.Controls.Add(this.griddetno);
             this.Controls.Add(this.AutoMatch);
@@ -1801,8 +1840,8 @@
         private System.Windows.Forms.CheckBox AutoMatch;
         private CustomControl.EnterTextBox griddetno;
         private System.Windows.Forms.Label pr_code_label;
-        private CustomControl.EnterTextBox Input;
-        private System.Windows.Forms.Label label24;
+        private CustomControl.EnterTextBox BackCheck;
+        private System.Windows.Forms.Label 后端复核;
         private System.Windows.Forms.ComboBox CollectionUnit;
         private System.Windows.Forms.Label CollectionUnit_label;
         private System.Windows.Forms.Button GenerateBarCode;
@@ -1893,5 +1932,9 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
+        private CustomControl.SerialPortWithTag FrontendCheck;
+        private CustomControl.SerialPortWithTag BackendCheck;
+        private System.Windows.Forms.Label label8;
+        private CustomControl.EnterTextBox FrontCollect;
     }
 }

UAS-出货标签管理(吉利通)/UAS_出货标签管理.cs

@@ -15,6 +15,8 @@ using UAS_LabelMachine.PublicForm;
 using System.Threading;
 using System.IO;
 using System.Globalization;
+using System.IO.Ports;
+using UAS_LabelMachine.CustomControl;
 
 namespace UAS_LabelMachine
 {
@@ -205,6 +207,55 @@ namespace UAS_LabelMachine
             }
             RefreshDBConnect.Interval = 60000;
             RefreshDBConnect.Start();
+
+            DataTable dt = (DataTable)adh.ExecuteSql("select * from cominfo", "select");
+            DataRow[] dr = dt.Select("comtype='FrontendCheck'");
+            if (dr.Length > 0)
+            {
+                FrontendCheck.PortName = dr[0]["COM"].ToString();
+                FrontendCheck.Tag = "FrontendCheck";
+                FrontendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
+                FrontendCheck.DataReceived += Serial_DataReceived;
+                FrontendCheck.Open();
+            }
+            dr = dt.Select("comtype='BackendCheck'");
+            if (dr.Length > 0)
+            {
+                BackendCheck.PortName = dr[0]["COM"].ToString();
+                BackendCheck.Tag = "BackendCheck";
+                BackendCheck.BaudRate = int.Parse(dr[0]["BaudRate"].ToString());
+                BackendCheck.DataReceived += Serial_DataReceived;
+                BackendCheck.Open();
+            }
+        }
+
+        //获取串口数据
+        private void Serial_DataReceived(object sender, SerialDataReceivedEventArgs e)
+        {
+            try
+            {
+                SerialPortWithTag port = sender as SerialPortWithTag;
+                int len = port.BytesToRead;
+                byte[] readBuffer = new byte[len];
+                port.Read(readBuffer, 0, len); //将数据读入缓存
+                string msg = Encoding.ASCII.GetString(readBuffer, 0, len); //获取出入库产品编号
+                switch (port.Tag)
+                {
+                    case "FrontendCheck":
+                        FrontCollect.Text = msg;
+                        break;
+                    case "BackendCheck":
+                        BackCheck.Text = msg;
+                        break;
+                    default:
+                        break;
+                }
+                Console.WriteLine(msg);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("提示信息", "接收返回消息异常！具体原因：" + ex.Message);
+            }
         }
 
         private void Sg_code_DbChange(object sender, EventArgs e)
@@ -331,7 +382,7 @@ namespace UAS_LabelMachine
         {
             if (e.KeyCode == Keys.Enter)
             {
-                if (Input.Text == "")
+                if (BackCheck.Text == "")
                 {
                     MessageBox.Show("采集的数据不能为空");
                     return;
@@ -357,12 +408,12 @@ namespace UAS_LabelMachine
             {
                 for (int i = 0; i < arr.Length; i++)
                 {
-                    arr[i] = Input.Text;
+                    arr[i] = BackCheck.Text;
                 }
             }
             else
             {
-                arr = Input.Text.Split(sg_separator.Text.ToCharArray()).ToArray();
+                arr = BackCheck.Text.Split(sg_separator.Text.ToCharArray()).ToArray();
             }
             bool FindAutoMatch = false;
             for (int i = 0; i < LabelInf.RowCount; i++)
@@ -386,7 +437,7 @@ namespace UAS_LabelMachine
         /// </summary>
         private void CollectInputData()
         {
-            LogManager.DoLog("采集数据【" + Input.Text + "】,使用采集策略编号【" + sg_code.Text + "】");
+            LogManager.DoLog("采集数据【" + BackCheck.Text + "】,使用采集策略编号【" + sg_code.Text + "】");
             //按DetNo排列之后的采集项
             ScanData = new ArrayList<ArrayList<string>>();
             //每个采集项目的子项
@@ -422,11 +473,11 @@ namespace UAS_LabelMachine
             if (sg_separator.Text == "")
             {
                 for (int i = 0; i < ItemData.Length; i++)
-                    CollectData.Add(ItemData[i].ToString().ToUpper(), Input.Text);
+                    CollectData.Add(ItemData[i].ToString().ToUpper(), BackCheck.Text);
             }
             else
             {
-                int DataCount = Input.Text.Split(sg_separator.Text.ToCharArray()).Length;
+                int DataCount = BackCheck.Text.Split(sg_separator.Text.ToCharArray()).Length;
                 if (DataCount > ItemData.Length)
                 {
                     MessageBox.Show("采集数据大于采集项次");
@@ -438,13 +489,13 @@ namespace UAS_LabelMachine
                     return;
                 }
                 for (int i = 0; i < DataCount; i++)
-                    CollectData.Add(ItemData[i].ToString().ToUpper(), Input.Text.Split(sg_separator.Text.ToCharArray())[i]);
+                    CollectData.Add(ItemData[i].ToString().ToUpper(), BackCheck.Text.Split(sg_separator.Text.ToCharArray())[i]);
             }
             //首先判断当前采集的个数，如果采集的个数为1则不对数据进行分隔符验证
             if (ItemData.Length == 1)
             {
                 CollectData.Clear();
-                CollectData.Add(ItemData[0].ToString().ToUpper(), Input.Text);
+                CollectData.Add(ItemData[0].ToString().ToUpper(), BackCheck.Text);
                 //勾选了自动匹配调用该函数
                 if (AutoMatch.Checked)
                     SetAutoMatchRow();
@@ -580,7 +631,7 @@ namespace UAS_LabelMachine
             //提醒用户需要采集的数据
             RemindUser();
             RefreshProcessData();
-            MessageLog.AppendText(">>扫描到数据" + Input.Text + "\n", Color.Blue);
+            MessageLog.AppendText(">>扫描到数据" + BackCheck.Text + "\n", Color.Blue);
             //如果所采集的行的物料不一样的话，重新计算箱内容量
             if (CurrentRowIndex - 1 > 0)
             {

UAS-出货标签管理(吉利通)/UAS_出货标签管理.resx

@@ -150,6 +150,9 @@
   <metadata name="ExportFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>294, 17</value>
   </metadata>
+  <metadata name="FrontendCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>442, 17</value>
+  </metadata>
   <metadata name="pib_ifmodify.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -183,6 +186,9 @@
   <metadata name="pr_spec.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="BackendCheck.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>584, 18</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

UAS-出货标签管理(吉利通)/贴标机条码打印.resx

@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="si_detno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_index.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_kind.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_indexstring.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_length.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_expression.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="si_item.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="DateCode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAABAAAACEAAABBAAAATAAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAA
-        AE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAA
-        AE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAATQAAAE0AAABNAAAASgAA
-        ADQAAAAQAAAAAQAAAAAAAAACAAAAJAAAAHYAAACrAAAAtQAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAA
-        ALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAA
-        ALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAAALQAAAC0AAAAtAAA
-        ALQAAAC0AAAAswAAAJgAAABOAAAADAAAAAAAAAAKAAAAWQAAANYAAAD5AAAA+wAAAPsAAAD7AAAA+wAA
-        APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAA
-        APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPsAAAD7AAAA+wAA
-        APsAAAD7AAAA+wAAAPsAAAD7AAAA+wAAAPEAAACiAAAAJAAAAAAAAAANAAAAjAAAAP0AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADfAAAAOwAAAAAAAAANAAAAogAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAA
-        AP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAAD/AAAA/wAAAP8AAADxAAAARgAA
-        AAAAAAANAQEBowICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wIC
-        Av8CAgL/AQAA/wAAAP8FBgX/DRMR/xkrJP8iQDX/J01A/ydPQf8nTkH/JUg7/x01Lf8SHBn/BwoK/wIB
-        Af8AAAD/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wICAv8CAgL/AgIC/wIC
-        Av8CAgLxAQEBRwICAgAAAAANAwMDowQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQE
-        BP8EBAT/BAQE/wMDA/8DAgL/DRMR/yA/NP8ydF3/OJl2/zeqgf81soX/M7SG/zO0hv8ztIb/NLOG/zau
-        hP84on3/NYdq/ylYR/8VJR//BgUF/wMCAv8EBAT/BAQE/wQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQE
-        BP8EBAT/BAQE/wQEBP8EBATxAgICRwQEBAAAAAANAwMDowQEBP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQE
-        BP8EBAT/BAQE/wQEBP8EBAT/AwIC/wgJCf8hQDX/NYpt/zWvhP8wt4f/K7SE/yqygv8qsYL/KrGC/yux
-        gv8rsYL/KrGC/yqxgv8qs4P/LbaG/zO1h/83n3v/LWVS/xEbF/8DAgL/BAQE/wQEBP8EBAT/BAQE/wQE
-        BP8EBAT/BAQE/wQEBP8EBAT/BAQE/wQEBP8EBATxAgICRwQEBAAAAAANBQUFowcHB/8HBwf/BwcH/wcH
-        B/8HBwf/BwcH/wcHB/8HBwf/BwcH/wcHB/8FBAT/DRcT/y5tWP82rob/LbaI/yqyhf8qsYT/K7GF/yux
-        hf8rsYX/K7GF/yuxhf8rsYX/K7GF/yuxhf8rsYX/K7GE/yqxhP8rtIf/MbaK/zaUdP8cOS//BQQF/wcG
-        Bv8HBwf/BwcH/wcHB/8HBwf/BwcH/wcHB/8HBwf/BwcH/wcHB/8GBgbxAgICRwcHBwAAAAANBgYHowgI
-        CP8ICAj/CAgI/wgICP8ICAj/CAgI/wgICP8ICAj/CAgI/wcFBv8RHBj/Mn9l/zS1iv8tsob/LbGF/y6x
-        hf8usYX/LrGF/y6xhf8usYX/LrGF/y6xhf8usYX/LrGF/y6xhf8usYX/LrGF/y6xhf8usYX/LbGF/y+1
-        iP83pYD/IEQ5/wgGB/8IBwj/CAgI/wgICP8ICAj/CAgI/wgICP8ICAj/CAgI/wgICP8ICAjxAwMDRwgI
-        CAAAAAANBwcIowoKCv8KCgv/CgoL/woKC/8KCgv/CgoL/woKC/8KCgv/CQcJ/w4WE/8ygGb/NLaK/y6x
-        hf8vsYX/L7GF/y+xhf8vsYX/L7GF/y+xhf8vsYX/L7KG/y+yhv8vsob/L7KF/y+xhf8vsYX/L7GF/y+x
-        hf8vsYX/L7GF/y+xhf8wtYj/N6eB/x9BNf8IBgf/CgoK/woKC/8KCgv/CgoL/woKC/8KCgv/CgoL/woK
-        C/8JCQrxBAQERwoKCgAAAAANCQkJowwMDP8MDAz/DAwM/wwMDP8MDAz/DAwM/wwMDP8MCwz/DAwM/yhk
-        T/80tYn/L7KF/y+xhf8vsYX/L7GF/y+xhf8vsYX/L7KF/zC0h/8vs4b/LauA/yymfP8sp33/Lq6D/zC1
-        h/8vs4b/L7GF/y+xhf8vsYX/L7GF/y+xhf8vsYX/MLWI/zWceP8VJiH/CwkK/wwMDP8MDAz/DAwM/wwM
-        DP8MDAz/DAwM/wwMDP8LCwzxBQUFRwwMDAAAAAANCgoKow0NDf8NDQ3/DQ0N/w0NDf8NDQ3/DQ0N/w0N
-        Df8LCQr/Gzgu/zSqgf8vt4f/L7WG/y+1hv8vtYb/L7WG/y+1hv8vtof/L7WG/yiUbv8dX0n/FTsv/xMv
-        Jv8TMSj/F0Q2/yF0V/8spnv/L7eH/y+1hv8vtYb/L7WG/y+1hv8vtYb/L7SG/zK6iv8sdl3/DhAP/w0M
-        DP8NDQ3/DQ0N/w0NDf8NDQ3/DQ0N/w0NDf8MDA3xBgYGRw0NDgAAAAANDQ0NoxEREf8QEBH/EBAR/xAQ
-        Ef8QEBH/EBAR/xAQEP8PEBH/K3pg/zK6jv8vtYn/L7WJ/y+1if8vtYn/L7WJ/y+2iv8usof/InVZ/xQn
-        IP8QDg//DwwO/xANDv8QDQ7/DwwO/xATEv8YQDL/KJdy/y+3i/8vtYn/L7WJ/y+1if8vtYn/L7WJ/y+3
-        i/8zq4T/Gjcu/w8MDv8QEBH/EBAR/xAQEf8QEBH/EBAR/xAQEf8PDxDxBwcHRxAQEQAAAAANDg4OoxIS
-        E/8SEhL/EhIS/xISEv8SEhL/EhIT/xEPEP8YLCb/MqeB/zC3i/8wtYr/MLWK/zC1iv8wtYr/MLWK/zC2
-        i/8jdlv/ExsZ/xEOEP8SEhL/EhIT/xISEv8SEhP/EhIT/xIREv8RDg//GDku/yqeef8wt4z/MLWK/zC1
-        iv8wtYr/MLWK/zC1iv8zuY7/J25Y/xEQEf8SEhL/EhIS/xISEv8SEhL/EhIS/xISEv8RERLxCAgIRxIS
-        EwAAAAANDw8QoxUVFf8VFRX/FRUV/xUVFf8VFRX/FRUV/xMQEf8iVET/NLeL/zO2iv8ztYr/M7WK/zO1
-        iv8ztYr/M7iM/yyZdf8XKiX/FBET/xUVFf8VFRX/FRUV/xUVFf8VFRX/FRUV/xUVFf8VFBX/FBIT/x9a
-        R/8ys4j/M7aK/zO1iv8ztYr/M7WK/zO1iv80uYz/MJd0/xYfHP8UExT/FRUV/xUVFf8VFRX/FRUV/xUV
-        Ff8TExTxCAgIRxQUFQAAAAANERESoxYWGP8WFhj/FhYX/xYWF/8WFhj/FhYX/xUVFv8odlz/NLyO/zO4
-        i/8zuIv/M7iL/zO4i/8zuYv/M7eL/yJhTP8VExX/FhYX/xYWF/8WFhf/FhYX/xYWF/8WFhf/FhYX/xYW
-        F/8WFhj/FhQW/xgmIf8smHT/NLuN/zO4i/8zuIv/M7iL/zO4i/8zuYz/M66E/xs2Lf8VExX/FhYY/xYW
-        F/8WFhf/FhYX/xYWGP8VFRbxCQkJRxYWFwAAAAANExMUoxkZGf8ZGRn/GRkZ/xkZGf8ZGRn/GBcY/xgd
-        HP8si2z/NL2Q/zO5jv8zuY7/M7mO/zO5jv8zu4//MKmB/xw4MP8YFRf/GRkZ/xkZGf8ZGRn/GRkZ/xkZ
-        Gf8ZGRn/GRkZ/xkZGf8ZGRn/GRgZ/xgXGP8mcVj/M7yP/zO5jv8zuY7/M7mO/zO5jv8zuY7/NLeM/yBL
-        Pf8XFBb/GRkZ/xkZGf8ZGRn/GRkZ/xkZGf8XFxjxCgoLRxkZGgAAAAANFRUVoxsbHP8bGxz/Gxsc/xsb
-        HP8bGxz/Gxkb/xwkIv8wlXT/NryR/zW5jv81uY7/NbmO/zW5jv82vJD/LpVz/xwmJP8bGRv/Gxsc/xsb
-        HP8bGxz/Gxsc/xsbHP8bGxz/Gxsc/xsbHP8bGxz/Gxsc/xoXGf8jVEX/NbeM/zW6j/81uY7/NbmO/zW5
-        jv81uY7/NrqP/yVYR/8aFhj/Gxwd/xsbHP8bGxz/Gxsc/xsbHP8aGhvxDAwMRxwcHQAAAAANFhYXox4e
-        Hv8eHh7/Hh4e/x4eHv8eHh7/Hhwd/x4nJf8xmHX/Ob6Q/zi7jv84u47/OLuO/zi7jv85vpH/Lolr/x0i
-        If8eHR7/Hh4e/x4eHv8eHh7/Hh4e/x4eHv8eHh7/Hh4e/x4eHv8eHh7/Hh4e/x0aHP8jSDz/NrOI/zi8
-        j/84u47/OLuO/zi7jv84u47/OLyP/yZbSf8dGRr/Hh4e/x4eHv8eHh7/Hh4e/x4eHv8cHB3xDAwNRx4e
-        HwAAAAANGBgZox8fIf8fHyH/Hx8h/x8fIf8fHyH/Hx0g/yAoJ/8ymnb/OcGQ/zi+jv84vo7/OL6O/zi+
-        jv85wZD/LoVn/x8hIv8fHyD/Hx8h/x8fIf8fHyH/Hx8h/x8fIf8fHyH/Hx8h/x8fIf8fHyH/Hx8h/x8c
-        Hv8kRTr/NrOH/zjAj/84vo7/OL6O/zi+jv84vo7/OL+P/ydcS/8eGh3/HyAh/x8fIf8fHyH/Hx8h/x8f
-        If8eHh/xDQ0NRyAgIQAAAAANGhoboyIiI/8iIiP/IiIj/yIiI/8iIiP/IiAi/yIrKf8zm3f/OcGT/zm+
-        kf85vpH/Ob6R/zm+kf86wpP/LoNn/yEjI/8iIiL/IiIj/yIiI/8iIiP/IiIj/yIiI/8iIiP/IiIj/yIi
-        I/8iIiP/IiIj/yEeIP8lQzn/NrKI/znAkv85vpH/Ob6R/zm+kf85vpH/Ob+S/yleTf8hHR//IiIj/yIi
-        I/8iIiP/IiIj/yIiI/8gICHxDg4PRyIiJAAAAAANHBwdoyQkJv8lJSb/JCQm/yQkJv8kJSb/JCIk/yQt
-        K/81nHn/PMKU/zy/kv88v5L/PL+S/zy/kv88wpX/MYRo/yMlJf8kJCX/JCUm/yQkJv8kJCb/JCQm/yQk
-        Jv8kJCb/JCQm/yQkJv8kJCb/JCUm/yQhI/8nRTz/ObKJ/zzBk/88v5L/PL+S/zy/kv88v5L/PMCT/ypg
-        Tv8jHyL/JSUm/yQkJv8kJCb/JCQm/yUlJv8jIyTxDw8QRyUlJgAAAAANHR0foyYmKf8nJyn/JiYp/yYm
-        Kf8nJyn/JiQn/yYvLf82nnn/PcWU/zzBkv88wZL/PMGS/zzBkv89xZT/MoZp/yUnKP8mJij/Jicp/yYm
-        Kf8mJin/JiYp/yYmKf8mJin/JiYp/yYmKf8mJin/Jycp/yYjJv8pRz3/OrWJ/zzDk/88wZL/PMGS/zzB
-        kv88wpL/PMKT/yxhUP8lIST/Jycp/yYmKf8mJin/JiYp/ycnKf8lJSfxEBAQRycnKQAAAAANICAhoysr
-        LP8rKyv/Kysr/ysrK/8rKyv/Kigq/ykyMP83n3v/PcWW/z3Ck/89wpP/PcKT/z3Ck/89xZb/NIhr/ygq
-        K/8qKiv/Kysr/ysrK/8rKyv/Kysr/ysrK/8rKyv/Kysr/ysrK/8rKyv/Kysr/yonKf8rSUD/OraL/z3E
-        lf89wpP/PcKT/z3Ck/89wpT/PMOU/y5jUv8pJSf/Kyss/ysrK/8rKyv/Kior/ysrLP8pKSrxERESRysr
-        LAAAAAANIiIjoy0tLv8tLS7/LS0u/y0tLv8tLS7/LCot/ys0Mv85oH7/QMWZ/z/Cl/8/wpf/P8KX/z/C
-        l/9AxZn/Nolu/yosLf8sLC7/LS0u/y0tLv8tLS7/LS0u/y0tLv8tLS7/LS0u/y0tLv8tLS7/LS0u/ywp
-        LP8tS0P/PbaO/0DEmP8/wpf/P8KX/z/Cl/8/wpf/P8OX/zBlVP8rJyr/LS0u/y0tLv8tLS7/LCwu/y0t
-        Lv8rKyzxEhITRy0tLwAAAAANJCQkoy8vMP8vLy//Ly8v/y8vL/8vLy//Ly0u/y42NP87oX//QcaZ/0DC
-        l/9Awpf/QMKX/0DCl/9BxZn/N4pv/y0vL/8vLi//Ly8v/y8vL/8vLy//Ly8v/y8vL/8vLy//Ly8v/y8v
-        L/8vLy//Ly8v/y4rLf8vTUT/PbeP/0DEmP9Awpf/QMKX/0DCl/9Aw5f/QMOX/zJnVv8tKSz/Ly8w/y8v
-        L/8vLy//Ly8v/y8vMP8tLS3xExMURy8vMAAAAAANJSUmozAwMv8wMDL/MDAy/zAwMv8wMDL/MC4w/y84
-        Nv87o4D/QMiZ/0DFl/9AxZf/QMWX/0DFl/9AyJn/OI1v/y8wMf8wLzH/MDAy/zAwMv8wMDL/MDAy/zAw
-        Mv8wMDL/MDAy/zAwMv8wMDL/MDAy/y8sMP8xT0b/PrmP/0DHmf9AxZf/QMWX/0DFl/9AxZf/QMaY/zRp
-        WP8vKy7/MDAy/zAwMv8wMDL/MDAy/zAwMv8uLjDxFBQVRzExMwAAAAANJiYoozMzNf8zMzT/MzM0/zMz
-        NP8zMzT/MjEz/zE6OP87pIL/Qcmc/0DGmv9Axpr/QMaa/0DGmv9ByZz/OY5z/zEzNP8zMjT/MzM0/zMz
-        NP8zMzT/MzM0/zMzNP8zMzT/MzM0/zMzNP8zMzT/MzM0/zIvMv8zUUj/P7uS/0HIm/9Axpr/QMaa/0DG
-        mv9Axpr/QMea/zVqWf8xLTD/MzM1/zMzNP8zMzT/MzM0/zMzNf8xMTLxFRUWRzQ0NQAAAAANKSkqozY2
-        OP82Njj/NjY4/zY2OP82Njj/NTQ2/zQ8O/8+pIP/RMmd/0TGm/9Expv/RMab/0TGm/9EyZ3/O450/zQ1
-        Nv82NTf/NjY4/zY2OP82Njj/NjY4/zY2OP82Njj/NjY4/zY2OP82Njj/NjY4/zUyNf81Ukr/QbuT/0TI
-        nP9Expv/RMab/0TGm/9Expv/Q8eb/zdrW/80MDP/NjY4/zY2OP82Njj/NjY4/zY2OP8zMzXxFhYWRzY2
-        OAAAAAANKiosozg4Ov84ODr/ODg6/zg4Ov84ODr/ODY5/zY+Pf9ApoT/Rcud/0XHm/9Fx5v/Rceb/0XH
-        m/9Gy53/PY90/zY3Of84Nzr/ODg6/zg4Ov84ODr/ODg6/zg4Ov84ODr/ODg6/zg4Ov84ODr/ODg6/zc0
-        N/82VEz/Q7yT/0XJnP9Fx5v/Rceb/0XHm/9FyJv/Rcib/zluXf82Mjb/ODg6/zg4Ov84ODr/ODg6/zg4
-        Ov81NTfxFhYXRzg4OgAAAAANLCwuozo6PP86Ojz/Ojo8/zo6PP86Ojz/Ojg7/zhBQP9AqYX/Rc6f/0XL
-        nP9Fy5z/Rcuc/0XLnf9Fzp7/PpJ2/zg5O/86OTz/Ojo8/zo6PP86Ojz/Ojo8/zo6PP86Ojz/Ojo8/zo6
-        PP86Ojz/Ojo8/zk3Ov85Vk7/Q7+U/0XNnv9Fy5z/Rcuc/0XLnP9Fy53/Rcyd/zpwX/84NDj/Ojo9/zo6
-        PP86Ojz/Ojo8/zo6Pf83NzrxGBgZRzo6PQAAAAANLi4wozw8P/88PD//PDw//zw8P/88PD//PDo+/zpD
-        Qv9CqYj/R86h/0bLn/9Gy5//Rsuf/0bLn/9HzqH/P5N5/zo7Pf88PD//PDw//zw8P/88PD//PDw//zw8
-        P/88PD//PDw//zw8P/88PD//PDw//zw5PP87WVH/RL+X/0fNoP9Gy5//Rsuf/0bLn/9Gy5//Rsyf/zxx
-        Yf87Nzv/PD0//zw8P/88PD//PDw//z09QP86OjzxGRkaRz09QAAAAAANMDAxoz8/QP8/P0D/Pz9A/z8/
-        QP8/P0D/Pz0//zxFRP9Eqoj/Sc6h/0nLn/9Jy5//Scuf/0nLn/9JzqH/QpV5/zw+P/8/PkD/Pz9A/z8/
-        QP8/P0D/Pz9A/z8/QP8/P0D/Pz9A/z8/QP8/P0D/Pz9A/z47Pv89WlH/R8CX/0nNoP9Jy5//Scuf/0nL
-        n/9Jy5//Scyg/z5zYv89OTz/Pz9A/z8/QP8/P0D/Pz9A/z8/QP88PD7xGhobRz8/QQAAAAANMTEzo0BA
-        Qv9AQEL/QEBC/0BAQv9AQEL/QD5B/z5HRf9FrYj/SdCh/0nNn/9JzZ//Sc2f/0nNn/9J0KH/QpZ6/z5A
-        Qf9AP0L/QEBC/0BAQv9AQEL/QEBC/0BAQv9AQEL/QEBC/0BAQv9AQEL/QEBC/z89QP8+XFP/R8GX/0nP
-        oP9JzZ//Sc2f/0nNn/9JzZ//Sc6f/0B1Y/8/Oz7/QEBD/0BAQv9AQEL/QEBC/0BAQ/8+PkDxGxscR0FB
-        QwAAAAANMzM1o0NDRv9DQ0X/Q0NF/0NDRf9DQ0X/QkFE/0BIR/9Froj/SdKh/0nPn/9Jz5//Sc+f/0nP
-        n/9J0qH/RJh7/0BBQ/9DQkX/Q0NF/0NDRf9DQ0X/Q0NF/0NDRf9DQ0X/Q0NF/0NDRf9DQ0X/Q0NF/0I/
-        Q/9AXlX/R8SY/0nRoP9Jz5//Sc+f/0nPn/9Jz5//SdCf/0F2ZP9BPUH/Q0NF/0NDRf9DQ0X/Q0NF/0ND
-        Rv9AQELxHBwcR0NDRQAAAAANNTU2o0VFR/9FRUf/RUVH/0VFR/9FRUf/RUNG/0JLSf9Hror/S9Ki/0rP
-        oP9Kz6D/Ss+g/0rPoP9L0qL/RZl9/0JERf9FREf/RUVH/0VFR/9FRUf/RUVH/0VFR/9FRUf/RUVH/0VF
-        R/9FRUf/RUVH/0RBRf9BYFf/ScSZ/0vRov9Kz6D/Ss+g/0rPoP9Kz6H/StCh/0N4Zv9DP0P/RUVH/0VF
-        R/9FRUf/RUVH/0VFR/9CQkPxHBwdR0VFRwAAAAANNjY4o0dHSv9HR0n/RkZJ/0ZGSf9HR0n/RkVI/0NM
-        TP9Ir43/TdKm/03PpP9Nz6T/Tc+k/03PpP9N0qb/Rpl+/0RFR/9HRkn/R0dJ/0ZGSf9GRkn/RkZJ/0ZG
-        Sf9GRkn/RkZJ/0ZGSf9GRkn/R0dJ/0ZDR/9DYVj/S8Sc/03Rpf9Nz6T/Tc+k/03PpP9Nz6T/TdCk/0R4
-        af9FQUX/R0dJ/0ZGSf9GRkn/RkZJ/0dHSv9DQ0bxHR0eR0dHSQAAAAANNzc5o0lJTP9JSUz/SUlM/0lJ
-        TP9JSUz/SUdK/0VOTf9JsI7/TdKm/03PpP9Nz6T/Tc+k/03PpP9N0qb/R5p//0ZHSf9JSEv/SUlM/0lJ
-        TP9JSUz/SUlM/0lJTP9JSUz/SUlM/0lJTP9JSUz/SUlM/0hFSf9FYlr/S8Sc/03Rpf9Nz6T/Tc+k/03P
-        pP9Nz6T/TdCl/0V6av9HQ0f/SUlM/0lJTP9JSUz/SUlL/0lJTP9FRUjxHh4fR0lJTAAAAAANOTk7o0pK
-        Tf9KSk3/SkpN/0pKTf9KSk3/SkhM/0dQTv9KsI7/TdKm/03PpP9Nz6T/Tc+k/03PpP9N0qb/R5uA/0dJ
-        S/9KSU3/SkpN/0pKTf9KSk3/SkpN/0pKTf9KSk3/SkpN/0pKTf9KSk3/SkpN/0lHS/9FZFz/S8Sc/03R
-        pf9Nz6T/Tc+k/03PpP9Nz6T/TdCk/0d7av9JRUn/SkpN/0pKTf9KSk3/SkpN/0pKTv9HR0rxHx8gR0tL
-        TgAAAAANOjo7o01NTf9NTU3/TU1N/01NTf9NTU3/TUtM/0lRUP9KsY7/TdSm/03RpP9N0aT/TdGk/03R
-        pP9N1Kb/SJ2B/0lLTP9NTE3/TU1N/01NTf9NTU3/TU1N/01NTf9NTU3/TU1N/01NTf9NTU3/TU1N/0xJ
-        S/9HZV3/TMac/03Tpf9N0aT/TdGk/03RpP9N0aT/TdKk/0h8bP9LR0r/TU1N/01NTf9NTU3/TU1N/01N
-        Tf9JSUrxHx8gR01NTwAAAAAOOzs9o01NUP9NTVD/TU1Q/01NUP9NTVD/TUtO/0lSUv9LtZD/Ttmo/07W
-        pv9O1qb/Ttam/07Wpv9N2aj/SqCD/0tMTf9NTE//TU1Q/01NUP9NTVD/TU1Q/01NUP9NTVD/TU1Q/01N
-        UP9NTVD/TU1Q/01KTf9JaF7/Tcue/07YqP9O1qb/Ttam/07Wpv9O1qf/Tdem/0h+bf9MSEz/TU1Q/01N
-        UP9NTVD/TU1Q/01NUP9KSkzxICAhR09PUQAAAAANPDw+o05OUv9NTVL/TU1S/01NUv9NTVL/TUxR/0xU
-        Vf9IpIf/R8CZ/0e9l/9HvZf/R72X/0e+mP9HwJn/SJR8/0xOUf9NTVL/TU1S/01NUv9NTVL/TU1S/01N
-        Uv9NTVL/TU1S/01NUv9NTVL/TU1S/01LUP9LZV//R7WS/0e/mP9HvZf/R72X/0e9l/9Hvpj/R7+Y/0p5
-        a/9NSU//TU1S/01NUv9NTVL/TU1S/05OUv9KSk7xISEiRkhISwAAAAAJPz9BnlFRUv9RUVL/UVFS/1FR
-        Uv9RUVL/UVBS/1BSU/9KXFj/SF5Y/0hdWP9IXVj/SF1Y/0hdWP9IXlj/TFtX/1FRU/9RUFL/UVFS/1FR
-        Uv9RUVL/UVFS/1FRUv9RUVL/UVFS/1FRUv9RUVL/UVFS/1FQUv9PVFT/SV1Y/0hdWP9IXVj/SF1Y/0hd
-        WP9IXVj/SF5Y/05XVf9RUFL/UVFS/1FRUv9RUVL/UVFS/1FRU/9NTU/wIyMkQUFBQgAAAAABR0dKhlNT
-        Vv5SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUFT/Uk9T/1JPU/9ST1P/Uk9T/1JPU/9ST1P/UlBU/1JS
-        Vf9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9SUVX/UlBU/1JP
-        U/9ST1P/Uk9T/1JPU/9ST1P/Uk9T/1JRVP9SUlX/UlJV/1JSVf9SUlX/UlJV/1JSVf9TU1bkMTEyLE1N
-        TwBZWVsATExOO19fYtZVVVn+U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NT
-        V/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NT
-        V/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1NTV/9TU1f/U1NX/1pa
-        XvdbW12UODg5Ck5OUABeXl4AAAAAAn19gDZ+foKAdnZ6jXZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2
-        eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2
-        eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2eox2dnqMdnZ6jHZ2
-        eox2dnqMeHh8jIGBhGNlZWYUm5ucABUVFQBjY2UARUVFAGtrbgBmZmoAYWFlAGFhZQBhYWUAYWFlAGFh
-        ZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFh
-        ZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFhZQBhYWUAYWFlAGFh
-        ZQBhYWUAYWFlAGFhZQBhYWUAYmJmAGpqbQBfX2AAAAAAADo6OwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAA=
-</value>
-  </data>
-</root>

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

@@ -89,8 +89,25 @@
             this.pi_title = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
             this.ProcessCount = new System.Windows.Forms.Label();
+            this.CombindetailTwo = new System.Windows.Forms.CheckBox();
             this.DCCheck = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.GridPrcode = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
+            this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_piid = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_inoutno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_whcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pjd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_custprodcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.CollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.UnCollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_outqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pjd_zxbzs_user = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.groupBoxWithBorder1 = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.label18 = new System.Windows.Forms.Label();
             this.MidBoxEnd = new UAS_LabelMachine.CustomControl.EnterTextBox();
@@ -102,26 +119,6 @@
             this.label7 = new System.Windows.Forms.Label();
             this.Input = new UAS_LabelMachine.CustomControl.EnterTextBox();
             this.LabelInf = new UAS_LabelMachine.CustomControl.DataGridViewWithSerialNum();
-            this.Choose = 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_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pjd_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.DateCode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custmidboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pib_custoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_pocode = 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.EnterTextBox();
             this.SingleLabel = new UAS_LabelMachine.CustomControl.GroupBoxWithBorder.GroupBoxWithBorder();
             this.SingleLabelPrinter = new UAS_LabelMachine.CustomControl.PrinterCombox();
@@ -146,20 +143,27 @@
             this.OutboxCapacity = new System.Windows.Forms.NumericUpDown();
             this.OutBoxLabelPrint = new System.Windows.Forms.Button();
             this.OutBoxCombox = new System.Windows.Forms.ComboBox();
-            this.pd_pdno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_piid = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_inoutno = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_whcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pjd_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_custprodcode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.CollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.UnCollectedNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_outqty = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_unit = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pr_spec1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pd_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.pjd_zxbzs_user = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Choose = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_ifprint = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.pib_midifprint = 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_custprodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pjd_orispeccode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_brand = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pr_zxbzs = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_lotno = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_datecode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.DateCode1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_qty = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custbarcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custmidboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pib_custoutboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pd_pocode = 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.MidSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridPrcode)).BeginInit();
@@ -195,7 +199,7 @@
             // LabelMainTain
             // 
             this.LabelMainTain.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.LabelMainTain.Location = new System.Drawing.Point(388, 15);
+            this.LabelMainTain.Location = new System.Drawing.Point(388, 6);
             this.LabelMainTain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.LabelMainTain.Name = "LabelMainTain";
             this.LabelMainTain.Size = new System.Drawing.Size(64, 26);
@@ -207,7 +211,7 @@
             // CleanDetail
             // 
             this.CleanDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CleanDetail.Location = new System.Drawing.Point(296, 15);
+            this.CleanDetail.Location = new System.Drawing.Point(296, 6);
             this.CleanDetail.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CleanDetail.Name = "CleanDetail";
             this.CleanDetail.Size = new System.Drawing.Size(64, 26);
@@ -472,7 +476,7 @@
             // AttachInfo
             // 
             this.AttachInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.AttachInfo.Location = new System.Drawing.Point(388, 48);
+            this.AttachInfo.Location = new System.Drawing.Point(388, 39);
             this.AttachInfo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.AttachInfo.Name = "AttachInfo";
             this.AttachInfo.Size = new System.Drawing.Size(64, 26);
@@ -504,7 +508,7 @@
             // ExportData
             // 
             this.ExportData.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.ExportData.Location = new System.Drawing.Point(296, 48);
+            this.ExportData.Location = new System.Drawing.Point(296, 39);
             this.ExportData.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.ExportData.Name = "ExportData";
             this.ExportData.Size = new System.Drawing.Size(64, 26);
@@ -516,7 +520,7 @@
             // PrintFooter
             // 
             this.PrintFooter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintFooter.Location = new System.Drawing.Point(485, 15);
+            this.PrintFooter.Location = new System.Drawing.Point(485, 6);
             this.PrintFooter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintFooter.Name = "PrintFooter";
             this.PrintFooter.Size = new System.Drawing.Size(64, 26);
@@ -530,7 +534,7 @@
             this.SetPrintStatus_label.AutoSize = true;
             this.SetPrintStatus_label.Font = new System.Drawing.Font("微软雅黑", 12F);
             this.SetPrintStatus_label.ForeColor = System.Drawing.Color.Green;
-            this.SetPrintStatus_label.Location = new System.Drawing.Point(475, 191);
+            this.SetPrintStatus_label.Location = new System.Drawing.Point(510, 191);
             this.SetPrintStatus_label.Name = "SetPrintStatus_label";
             this.SetPrintStatus_label.Size = new System.Drawing.Size(58, 21);
             this.SetPrintStatus_label.TabIndex = 76;
@@ -539,7 +543,7 @@
             // pictureBox1
             // 
             this.pictureBox1.Image = global::UAS_LabelMachine.Properties.Resources.Status;
-            this.pictureBox1.Location = new System.Drawing.Point(411, 120);
+            this.pictureBox1.Location = new System.Drawing.Point(446, 120);
             this.pictureBox1.Name = "pictureBox1";
             this.pictureBox1.Size = new System.Drawing.Size(122, 64);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
@@ -559,7 +563,7 @@
             // PackOutBox
             // 
             this.PackOutBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PackOutBox.Location = new System.Drawing.Point(485, 81);
+            this.PackOutBox.Location = new System.Drawing.Point(485, 72);
             this.PackOutBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PackOutBox.Name = "PackOutBox";
             this.PackOutBox.Size = new System.Drawing.Size(64, 26);
@@ -572,7 +576,7 @@
             // PrintStatus
             // 
             this.PrintStatus.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PrintStatus.Location = new System.Drawing.Point(485, 50);
+            this.PrintStatus.Location = new System.Drawing.Point(485, 41);
             this.PrintStatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PrintStatus.Name = "PrintStatus";
             this.PrintStatus.Size = new System.Drawing.Size(64, 26);
@@ -622,7 +626,7 @@
             // PackMidBox
             // 
             this.PackMidBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.PackMidBox.Location = new System.Drawing.Point(388, 80);
+            this.PackMidBox.Location = new System.Drawing.Point(388, 71);
             this.PackMidBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.PackMidBox.Name = "PackMidBox";
             this.PackMidBox.Size = new System.Drawing.Size(64, 26);
@@ -636,7 +640,7 @@
             // 
             this.CustomerLabel.Enabled = false;
             this.CustomerLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.CustomerLabel.Location = new System.Drawing.Point(296, 81);
+            this.CustomerLabel.Location = new System.Drawing.Point(296, 72);
             this.CustomerLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.CustomerLabel.Name = "CustomerLabel";
             this.CustomerLabel.Size = new System.Drawing.Size(84, 26);
@@ -648,13 +652,13 @@
             // Combindetail
             // 
             this.Combindetail.AutoSize = true;
-            this.Combindetail.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.Combindetail.Location = new System.Drawing.Point(296, 114);
+            this.Combindetail.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.Combindetail.Location = new System.Drawing.Point(296, 102);
             this.Combindetail.Margin = new System.Windows.Forms.Padding(2);
             this.Combindetail.Name = "Combindetail";
-            this.Combindetail.Size = new System.Drawing.Size(93, 25);
+            this.Combindetail.Size = new System.Drawing.Size(82, 21);
             this.Combindetail.TabIndex = 104;
-            this.Combindetail.Text = "合并明细";
+            this.Combindetail.Text = "合并明细1";
             this.Combindetail.UseVisualStyleBackColor = true;
             this.Combindetail.CheckedChanged += new System.EventHandler(this.Combindetail_CheckedChanged);
             // 
@@ -697,6 +701,19 @@
             this.ProcessCount.Size = new System.Drawing.Size(0, 20);
             this.ProcessCount.TabIndex = 108;
             // 
+            // CombindetailTwo
+            // 
+            this.CombindetailTwo.AutoSize = true;
+            this.CombindetailTwo.Font = new System.Drawing.Font("微软雅黑", 9F);
+            this.CombindetailTwo.Location = new System.Drawing.Point(296, 130);
+            this.CombindetailTwo.Margin = new System.Windows.Forms.Padding(2);
+            this.CombindetailTwo.Name = "CombindetailTwo";
+            this.CombindetailTwo.Size = new System.Drawing.Size(119, 21);
+            this.CombindetailTwo.TabIndex = 109;
+            this.CombindetailTwo.Text = "合并明细2(加PO)";
+            this.CombindetailTwo.UseVisualStyleBackColor = true;
+            this.CombindetailTwo.CheckedChanged += new System.EventHandler(this.CombindetailTwo_CheckedChanged);
+            // 
             // DCCheck
             // 
             this.DCCheck.ID = null;
@@ -718,10 +735,12 @@
             this.GridPrcode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.pd_pdno,
             this.pd_piid,
+            this.Column1,
             this.pd_inoutno,
             this.pd_whcode,
             this.pjd_id,
             this.pd_custprodcode1,
+            this.pd_pocode1,
             this.pd_prodcode,
             this.CollectedNum,
             this.UnCollectedNum,
@@ -751,6 +770,139 @@
             this.GridPrcode.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.GridPrcode_CellPainting);
             this.GridPrcode.SelectionChanged += new System.EventHandler(this.GridPrcode_SelectionChanged);
             // 
+            // pd_pdno
+            // 
+            this.pd_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pd_pdno.DataPropertyName = "pd_pdno";
+            this.pd_pdno.HeaderText = "序号";
+            this.pd_pdno.Name = "pd_pdno";
+            this.pd_pdno.ReadOnly = true;
+            this.pd_pdno.Width = 54;
+            // 
+            // pd_piid
+            // 
+            this.pd_piid.DataPropertyName = "pd_piid";
+            this.pd_piid.HeaderText = "Column1";
+            this.pd_piid.Name = "pd_piid";
+            this.pd_piid.Visible = false;
+            // 
+            // Column1
+            // 
+            this.Column1.DataPropertyName = "combined";
+            this.Column1.HeaderText = "Column1";
+            this.Column1.Name = "Column1";
+            this.Column1.Visible = false;
+            // 
+            // pd_inoutno
+            // 
+            this.pd_inoutno.DataPropertyName = "pd_inoutno";
+            this.pd_inoutno.HeaderText = "Column1";
+            this.pd_inoutno.Name = "pd_inoutno";
+            this.pd_inoutno.Visible = false;
+            // 
+            // pd_whcode
+            // 
+            this.pd_whcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pd_whcode.DataPropertyName = "pd_whcode";
+            this.pd_whcode.HeaderText = "仓别";
+            this.pd_whcode.Name = "pd_whcode";
+            this.pd_whcode.Width = 54;
+            // 
+            // pjd_id
+            // 
+            this.pjd_id.DataPropertyName = "pjd_id";
+            this.pjd_id.HeaderText = "pjd_id";
+            this.pjd_id.Name = "pjd_id";
+            this.pjd_id.Visible = false;
+            // 
+            // pd_custprodcode1
+            // 
+            this.pd_custprodcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+            this.pd_custprodcode1.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode1.HeaderText = "客户料号";
+            this.pd_custprodcode1.Name = "pd_custprodcode1";
+            this.pd_custprodcode1.Width = 78;
+            // 
+            // pd_pocode1
+            // 
+            this.pd_pocode1.DataPropertyName = "pd_pocode";
+            this.pd_pocode1.HeaderText = "客户PO";
+            this.pd_pocode1.Name = "pd_pocode1";
+            // 
+            // pd_prodcode
+            // 
+            this.pd_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_prodcode.DataPropertyName = "pd_prodcode";
+            this.pd_prodcode.HeaderText = "物料编号";
+            this.pd_prodcode.Name = "pd_prodcode";
+            this.pd_prodcode.ReadOnly = true;
+            this.pd_prodcode.Width = 78;
+            // 
+            // CollectedNum
+            // 
+            this.CollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.CollectedNum.DataPropertyName = "CollectedNum";
+            this.CollectedNum.HeaderText = "已采数";
+            this.CollectedNum.Name = "CollectedNum";
+            this.CollectedNum.ReadOnly = true;
+            this.CollectedNum.Width = 66;
+            // 
+            // UnCollectedNum
+            // 
+            this.UnCollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.UnCollectedNum.DataPropertyName = "UnCollectedNum";
+            this.UnCollectedNum.HeaderText = "未采集";
+            this.UnCollectedNum.Name = "UnCollectedNum";
+            this.UnCollectedNum.ReadOnly = true;
+            this.UnCollectedNum.Visible = false;
+            // 
+            // pd_outqty
+            // 
+            this.pd_outqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
+            this.pd_outqty.DataPropertyName = "pd_outqty";
+            this.pd_outqty.HeaderText = "出库数量";
+            this.pd_outqty.Name = "pd_outqty";
+            this.pd_outqty.ReadOnly = true;
+            this.pd_outqty.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pd_outqty.Width = 59;
+            // 
+            // pr_unit
+            // 
+            this.pr_unit.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pr_unit.DataPropertyName = "pr_unit";
+            this.pr_unit.HeaderText = "单位";
+            this.pr_unit.Name = "pr_unit";
+            this.pr_unit.ReadOnly = true;
+            this.pr_unit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pr_unit.Width = 35;
+            // 
+            // pr_spec1
+            // 
+            this.pr_spec1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
+            this.pr_spec1.DataPropertyName = "pr_spec";
+            this.pr_spec1.HeaderText = "规格";
+            this.pr_spec1.MinimumWidth = 100;
+            this.pr_spec1.Name = "pr_spec1";
+            // 
+            // pd_brand
+            // 
+            this.pd_brand.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+            this.pd_brand.DataPropertyName = "pd_brand";
+            this.pd_brand.HeaderText = "品牌";
+            this.pd_brand.Name = "pd_brand";
+            this.pd_brand.ReadOnly = true;
+            this.pd_brand.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.pd_brand.Width = 35;
+            // 
+            // pjd_zxbzs_user
+            // 
+            this.pjd_zxbzs_user.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pjd_zxbzs_user.DataPropertyName = "pjd_zxbzs_user";
+            this.pjd_zxbzs_user.HeaderText = "最小包装";
+            this.pjd_zxbzs_user.MinimumWidth = 80;
+            this.pjd_zxbzs_user.Name = "pjd_zxbzs_user";
+            this.pjd_zxbzs_user.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
             // groupBoxWithBorder1
             // 
             this.groupBoxWithBorder1.Controls.Add(this.label18);
@@ -882,6 +1034,7 @@
             this.LabelInf.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Choose,
             this.pib_ifprint,
+            this.pib_midifprint,
             this.pib_id1,
             this.pib_pdno,
             this.pib_prodcode,
@@ -910,216 +1063,45 @@
             this.LabelInf.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.LabelInf_DataError);
             this.LabelInf.SelectionChanged += new System.EventHandler(this.LabelInf_SelectionChanged);
             // 
-            // 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;
-            // 
-            // pib_ifprint
+            // pi_inoutno
             // 
-            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;
+            this.pi_inoutno.ID = null;
+            this.pi_inoutno.Location = new System.Drawing.Point(86, 10);
+            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.pi_inoutno.Name = "pi_inoutno";
+            this.pi_inoutno.Size = new System.Drawing.Size(150, 21);
+            this.pi_inoutno.Str = null;
+            this.pi_inoutno.Str1 = null;
+            this.pi_inoutno.Str2 = null;
+            this.pi_inoutno.TabIndex = 2;
+            this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_inoutno_KeyDown);
             // 
-            // pib_id1
+            // SingleLabel
             // 
-            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;
+            this.SingleLabel.Controls.Add(this.SingleLabelPrinter);
+            this.SingleLabel.Controls.Add(this.SingleLabelPrint);
+            this.SingleLabel.Controls.Add(this.SingleLabelAutoPrint);
+            this.SingleLabel.Controls.Add(this.SingleLabelCombox);
+            this.SingleLabel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SingleLabel.Location = new System.Drawing.Point(726, 6);
+            this.SingleLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.SingleLabel.Name = "SingleLabel";
+            this.SingleLabel.Padding = new System.Windows.Forms.Padding(2);
+            this.SingleLabel.Size = new System.Drawing.Size(170, 211);
+            this.SingleLabel.TabIndex = 77;
+            this.SingleLabel.TabStop = false;
+            this.SingleLabel.Text = "单盘标签";
             // 
-            // pib_pdno
+            // SingleLabelPrinter
             // 
-            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            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 = 55;
+            this.SingleLabelPrinter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.SingleLabelPrinter.Location = new System.Drawing.Point(7, 63);
+            this.SingleLabelPrinter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
+            this.SingleLabelPrinter.Name = "SingleLabelPrinter";
+            this.SingleLabelPrinter.Size = new System.Drawing.Size(159, 25);
+            this.SingleLabelPrinter.TabIndex = 40;
             // 
-            // pib_prodcode
-            // 
-            this.pib_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_prodcode.DataPropertyName = "pib_prodcode";
-            this.pib_prodcode.HeaderText = "物料编号";
-            this.pib_prodcode.MinimumWidth = 120;
-            this.pib_prodcode.Name = "pib_prodcode";
-            this.pib_prodcode.ReadOnly = true;
-            this.pib_prodcode.Width = 120;
-            // 
-            // pd_custprodcode
-            // 
-            this.pd_custprodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode.HeaderText = "CPN";
-            this.pd_custprodcode.MinimumWidth = 120;
-            this.pd_custprodcode.Name = "pd_custprodcode";
-            this.pd_custprodcode.Width = 120;
-            // 
-            // pjd_orispeccode
-            // 
-            this.pjd_orispeccode.DataPropertyName = "pjd_orispeccode";
-            this.pjd_orispeccode.HeaderText = "MPN";
-            this.pjd_orispeccode.Name = "pjd_orispeccode";
-            this.pjd_orispeccode.ReadOnly = true;
-            this.pjd_orispeccode.Visible = false;
-            this.pjd_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;
-            // 
-            // pr_zxbzs
-            // 
-            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
-            this.pr_zxbzs.HeaderText = "最小包装数";
-            this.pr_zxbzs.Name = "pr_zxbzs";
-            this.pr_zxbzs.ReadOnly = true;
-            this.pr_zxbzs.Visible = false;
-            this.pr_zxbzs.Width = 90;
-            // 
-            // pib_lotno
-            // 
-            this.pib_lotno.DataPropertyName = "pib_lotno";
-            this.pib_lotno.HeaderText = "LotNo";
-            this.pib_lotno.Name = "pib_lotno";
-            this.pib_lotno.ReadOnly = true;
-            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.ReadOnly = true;
-            this.pib_datecode.Width = 78;
-            // 
-            // DateCode1
-            // 
-            this.DateCode1.DataPropertyName = "DateCode1";
-            this.DateCode1.HeaderText = "DateCode1";
-            this.DateCode1.Name = "DateCode1";
-            this.DateCode1.Visible = false;
-            this.DateCode1.Width = 84;
-            // 
-            // 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_custbarcode
-            // 
-            this.pib_custbarcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
-            this.pib_custbarcode.HeaderText = "料盘条码";
-            this.pib_custbarcode.MinimumWidth = 100;
-            this.pib_custbarcode.Name = "pib_custbarcode";
-            this.pib_custbarcode.ReadOnly = true;
-            // 
-            // pib_custmidboxcode
-            // 
-            this.pib_custmidboxcode.DataPropertyName = "pib_custmidboxcode";
-            this.pib_custmidboxcode.HeaderText = "中盒条码";
-            this.pib_custmidboxcode.Name = "pib_custmidboxcode";
-            this.pib_custmidboxcode.ReadOnly = true;
-            this.pib_custmidboxcode.Width = 78;
-            // 
-            // pib_custoutboxcode
-            // 
-            this.pib_custoutboxcode.DataPropertyName = "pib_custoutboxcode";
-            this.pib_custoutboxcode.HeaderText = "外箱条码";
-            this.pib_custoutboxcode.Name = "pib_custoutboxcode";
-            this.pib_custoutboxcode.ReadOnly = true;
-            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;
-            // 
-            // pr_spec
-            // 
-            this.pr_spec.DataPropertyName = "pr_spec";
-            this.pr_spec.HeaderText = "规格";
-            this.pr_spec.Name = "pr_spec";
-            this.pr_spec.ReadOnly = true;
-            this.pr_spec.Visible = false;
-            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.ReadOnly = true;
-            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.ReadOnly = true;
-            this.pib_outboxcode2.Width = 90;
-            // 
-            // pi_inoutno
-            // 
-            this.pi_inoutno.ID = null;
-            this.pi_inoutno.Location = new System.Drawing.Point(86, 10);
-            this.pi_inoutno.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.pi_inoutno.Name = "pi_inoutno";
-            this.pi_inoutno.Size = new System.Drawing.Size(150, 21);
-            this.pi_inoutno.Str = null;
-            this.pi_inoutno.Str1 = null;
-            this.pi_inoutno.Str2 = null;
-            this.pi_inoutno.TabIndex = 2;
-            this.pi_inoutno.KeyDown += new System.Windows.Forms.KeyEventHandler(this.pi_inoutno_KeyDown);
-            // 
-            // SingleLabel
-            // 
-            this.SingleLabel.Controls.Add(this.SingleLabelPrinter);
-            this.SingleLabel.Controls.Add(this.SingleLabelPrint);
-            this.SingleLabel.Controls.Add(this.SingleLabelAutoPrint);
-            this.SingleLabel.Controls.Add(this.SingleLabelCombox);
-            this.SingleLabel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabel.Location = new System.Drawing.Point(726, 6);
-            this.SingleLabel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.SingleLabel.Name = "SingleLabel";
-            this.SingleLabel.Padding = new System.Windows.Forms.Padding(2);
-            this.SingleLabel.Size = new System.Drawing.Size(170, 211);
-            this.SingleLabel.TabIndex = 77;
-            this.SingleLabel.TabStop = false;
-            this.SingleLabel.Text = "单盘标签";
-            // 
-            // SingleLabelPrinter
-            // 
-            this.SingleLabelPrinter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.SingleLabelPrinter.Location = new System.Drawing.Point(7, 63);
-            this.SingleLabelPrinter.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6);
-            this.SingleLabelPrinter.Name = "SingleLabelPrinter";
-            this.SingleLabelPrinter.Size = new System.Drawing.Size(159, 25);
-            this.SingleLabelPrinter.TabIndex = 40;
-            // 
-            // SingleLabelPrint
+            // SingleLabelPrint
             // 
             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)));
@@ -1355,6 +1337,11 @@
             this.OutboxCapacity.Name = "OutboxCapacity";
             this.OutboxCapacity.Size = new System.Drawing.Size(72, 23);
             this.OutboxCapacity.TabIndex = 84;
+            this.OutboxCapacity.Value = new decimal(new int[] {
+            60,
+            0,
+            0,
+            0});
             this.OutboxCapacity.Leave += new System.EventHandler(this.MidBoxCapacity_Leave);
             // 
             // OutBoxLabelPrint
@@ -1381,126 +1368,186 @@
             this.OutBoxCombox.TabIndex = 78;
             this.OutBoxCombox.SelectedIndexChanged += new System.EventHandler(this.OutBoxCombox_SelectedIndexChanged);
             // 
-            // pd_pdno
+            // Choose
             // 
-            this.pd_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pd_pdno.DataPropertyName = "pd_pdno";
-            this.pd_pdno.HeaderText = "序号";
-            this.pd_pdno.Name = "pd_pdno";
-            this.pd_pdno.ReadOnly = true;
-            this.pd_pdno.Width = 54;
+            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;
             // 
-            // pd_piid
+            // pib_ifprint
             // 
-            this.pd_piid.DataPropertyName = "pd_piid";
-            this.pd_piid.HeaderText = "Column1";
-            this.pd_piid.Name = "pd_piid";
-            this.pd_piid.Visible = false;
+            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;
             // 
-            // pd_inoutno
+            // pib_midifprint
             // 
-            this.pd_inoutno.DataPropertyName = "pd_inoutno";
-            this.pd_inoutno.HeaderText = "Column1";
-            this.pd_inoutno.Name = "pd_inoutno";
-            this.pd_inoutno.Visible = false;
+            this.pib_midifprint.DataPropertyName = "pib_midifprint";
+            this.pib_midifprint.HeaderText = "中盒已打印";
+            this.pib_midifprint.Name = "pib_midifprint";
+            this.pib_midifprint.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.pib_midifprint.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.pib_midifprint.Visible = false;
+            this.pib_midifprint.Width = 90;
             // 
-            // pd_whcode
+            // pib_id1
             // 
-            this.pd_whcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pd_whcode.DataPropertyName = "pd_whcode";
-            this.pd_whcode.HeaderText = "仓别";
-            this.pd_whcode.Name = "pd_whcode";
-            this.pd_whcode.Width = 54;
+            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;
             // 
-            // pjd_id
+            // pib_pdno
             // 
-            this.pjd_id.DataPropertyName = "pjd_id";
-            this.pjd_id.HeaderText = "pjd_id";
-            this.pjd_id.Name = "pjd_id";
-            this.pjd_id.Visible = false;
+            this.pib_pdno.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            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 = 55;
             // 
-            // pd_custprodcode1
+            // pib_prodcode
             // 
-            this.pd_custprodcode1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-            this.pd_custprodcode1.DataPropertyName = "pd_custprodcode";
-            this.pd_custprodcode1.HeaderText = "客户料号";
-            this.pd_custprodcode1.Name = "pd_custprodcode1";
-            this.pd_custprodcode1.Width = 78;
+            this.pib_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_prodcode.DataPropertyName = "pib_prodcode";
+            this.pib_prodcode.HeaderText = "物料编号";
+            this.pib_prodcode.MinimumWidth = 120;
+            this.pib_prodcode.Name = "pib_prodcode";
+            this.pib_prodcode.ReadOnly = true;
+            this.pib_prodcode.Width = 120;
             // 
-            // pd_prodcode
+            // pd_custprodcode
             // 
-            this.pd_prodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.pd_prodcode.DataPropertyName = "pd_prodcode";
-            this.pd_prodcode.HeaderText = "物料编号";
-            this.pd_prodcode.Name = "pd_prodcode";
-            this.pd_prodcode.ReadOnly = true;
-            this.pd_prodcode.Width = 78;
+            this.pd_custprodcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pd_custprodcode.DataPropertyName = "pd_custprodcode";
+            this.pd_custprodcode.HeaderText = "CPN";
+            this.pd_custprodcode.MinimumWidth = 120;
+            this.pd_custprodcode.Name = "pd_custprodcode";
+            this.pd_custprodcode.Width = 120;
             // 
-            // CollectedNum
+            // pjd_orispeccode
             // 
-            this.CollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.CollectedNum.DataPropertyName = "CollectedNum";
-            this.CollectedNum.HeaderText = "已采数";
-            this.CollectedNum.Name = "CollectedNum";
-            this.CollectedNum.ReadOnly = true;
-            this.CollectedNum.Width = 66;
+            this.pjd_orispeccode.DataPropertyName = "pjd_orispeccode";
+            this.pjd_orispeccode.HeaderText = "MPN";
+            this.pjd_orispeccode.Name = "pjd_orispeccode";
+            this.pjd_orispeccode.ReadOnly = true;
+            this.pjd_orispeccode.Visible = false;
+            this.pjd_orispeccode.Width = 48;
             // 
-            // UnCollectedNum
+            // pib_brand
             // 
-            this.UnCollectedNum.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.UnCollectedNum.DataPropertyName = "UnCollectedNum";
-            this.UnCollectedNum.HeaderText = "未采集";
-            this.UnCollectedNum.Name = "UnCollectedNum";
-            this.UnCollectedNum.ReadOnly = true;
-            this.UnCollectedNum.Visible = false;
-            this.UnCollectedNum.Width = 66;
+            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;
             // 
-            // pd_outqty
+            // pr_zxbzs
             // 
-            this.pd_outqty.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells;
-            this.pd_outqty.DataPropertyName = "pd_outqty";
-            this.pd_outqty.HeaderText = "出库数量";
-            this.pd_outqty.Name = "pd_outqty";
-            this.pd_outqty.ReadOnly = true;
-            this.pd_outqty.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.pd_outqty.Width = 59;
+            this.pr_zxbzs.DataPropertyName = "pr_zxbzs";
+            this.pr_zxbzs.HeaderText = "最小包装数";
+            this.pr_zxbzs.Name = "pr_zxbzs";
+            this.pr_zxbzs.ReadOnly = true;
+            this.pr_zxbzs.Visible = false;
+            this.pr_zxbzs.Width = 90;
             // 
-            // pr_unit
+            // pib_lotno
             // 
-            this.pr_unit.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pr_unit.DataPropertyName = "pr_unit";
-            this.pr_unit.HeaderText = "单位";
-            this.pr_unit.Name = "pr_unit";
-            this.pr_unit.ReadOnly = true;
-            this.pr_unit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.pr_unit.Width = 35;
+            this.pib_lotno.DataPropertyName = "pib_lotno";
+            this.pib_lotno.HeaderText = "LotNo";
+            this.pib_lotno.Name = "pib_lotno";
+            this.pib_lotno.ReadOnly = true;
+            this.pib_lotno.Width = 60;
             // 
-            // pr_spec1
+            // pib_datecode
             // 
-            this.pr_spec1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCellsExceptHeader;
-            this.pr_spec1.DataPropertyName = "pr_spec";
-            this.pr_spec1.HeaderText = "规格";
-            this.pr_spec1.MinimumWidth = 100;
-            this.pr_spec1.Name = "pr_spec1";
+            this.pib_datecode.DataPropertyName = "pib_datecode";
+            this.pib_datecode.HeaderText = "DateCode";
+            this.pib_datecode.Name = "pib_datecode";
+            this.pib_datecode.ReadOnly = true;
+            this.pib_datecode.Width = 78;
             // 
-            // pd_brand
+            // DateCode1
             // 
-            this.pd_brand.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
-            this.pd_brand.DataPropertyName = "pd_brand";
-            this.pd_brand.HeaderText = "品牌";
-            this.pd_brand.Name = "pd_brand";
-            this.pd_brand.ReadOnly = true;
-            this.pd_brand.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.pd_brand.Width = 35;
+            this.DateCode1.DataPropertyName = "DateCode1";
+            this.DateCode1.HeaderText = "DateCode1";
+            this.DateCode1.Name = "DateCode1";
+            this.DateCode1.Visible = false;
+            this.DateCode1.Width = 84;
             // 
-            // pjd_zxbzs_user
+            // pib_qty
             // 
-            this.pjd_zxbzs_user.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
-            this.pjd_zxbzs_user.DataPropertyName = "pjd_zxbzs_user";
-            this.pjd_zxbzs_user.HeaderText = "最小包装";
-            this.pjd_zxbzs_user.MinimumWidth = 80;
-            this.pjd_zxbzs_user.Name = "pjd_zxbzs_user";
-            this.pjd_zxbzs_user.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            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_custbarcode
+            // 
+            this.pib_custbarcode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
+            this.pib_custbarcode.DataPropertyName = "pib_custbarcode";
+            this.pib_custbarcode.HeaderText = "料盘条码";
+            this.pib_custbarcode.MinimumWidth = 100;
+            this.pib_custbarcode.Name = "pib_custbarcode";
+            this.pib_custbarcode.ReadOnly = true;
+            // 
+            // pib_custmidboxcode
+            // 
+            this.pib_custmidboxcode.DataPropertyName = "pib_custmidboxcode";
+            this.pib_custmidboxcode.HeaderText = "中盒条码";
+            this.pib_custmidboxcode.Name = "pib_custmidboxcode";
+            this.pib_custmidboxcode.ReadOnly = true;
+            this.pib_custmidboxcode.Width = 78;
+            // 
+            // pib_custoutboxcode
+            // 
+            this.pib_custoutboxcode.DataPropertyName = "pib_custoutboxcode";
+            this.pib_custoutboxcode.HeaderText = "外箱条码";
+            this.pib_custoutboxcode.Name = "pib_custoutboxcode";
+            this.pib_custoutboxcode.ReadOnly = true;
+            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;
+            // 
+            // pr_spec
+            // 
+            this.pr_spec.DataPropertyName = "pr_spec";
+            this.pr_spec.HeaderText = "规格";
+            this.pr_spec.Name = "pr_spec";
+            this.pr_spec.ReadOnly = true;
+            this.pr_spec.Visible = false;
+            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.ReadOnly = true;
+            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.ReadOnly = true;
+            this.pib_outboxcode2.Width = 90;
             // 
             // UAS_出货标签打印
             // 
@@ -1508,6 +1555,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(229)))), ((int)(((byte)(233)))), ((int)(((byte)(206)))));
             this.ClientSize = new System.Drawing.Size(1259, 729);
+            this.Controls.Add(this.CombindetailTwo);
             this.Controls.Add(this.ProcessCount);
             this.Controls.Add(this.label9);
             this.Controls.Add(this.label8);
@@ -1670,8 +1718,26 @@
         private System.Windows.Forms.Label pi_title;
         private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label ProcessCount;
+        private System.Windows.Forms.CheckBox CombindetailTwo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pdno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_piid;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_inoutno;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_whcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_id;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pocode1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn CollectedNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn UnCollectedNum;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outqty;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pd_brand;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_zxbzs_user;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewCheckBoxColumn pib_ifprint;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn pib_midifprint;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_id1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_pdno;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_prodcode;
@@ -1690,19 +1756,5 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode1;
         private System.Windows.Forms.DataGridViewTextBoxColumn pib_outboxcode2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_pdno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_piid;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_inoutno;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_whcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_id;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_custprodcode1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_prodcode;
-        private System.Windows.Forms.DataGridViewTextBoxColumn CollectedNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn UnCollectedNum;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_outqty;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pr_unit;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pd_brand;
-        private System.Windows.Forms.DataGridViewTextBoxColumn pjd_zxbzs_user;
     }
 }

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

@@ -134,7 +134,7 @@ namespace UAS_LabelMachine
             Left = 0;
             Width = ScreenArea.Width;
             Height = ScreenArea.Height;
-            OutboxCapacity.Value = Properties.Settings.Default.OutboxCapacity;
+            //OutboxCapacity.Value = Properties.Settings.Default.OutboxCapacity;
             MidboxCapacity.Value = Properties.Settings.Default.MidBoxCapacity;
             if (MidboxCapacity.Value == 0)
             {
@@ -240,7 +240,12 @@ namespace UAS_LabelMachine
             //校验DateCode是否过期
             if (!CheckDateCode(Data["DATECODE"]))
             {
-                MessageBox.Show("物料" + Data["PRCODE"] + "【DateCode】超出校验日期");
+                string close = MessageBox.Show(this.ParentForm, "物料" + Data["PRCODE"] + "【DateCode】超出校验日期,是否继续", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (close != "Yes")
+                {
+                    Input.SelectAll();
+                    return;
+                }
             }
             if (Data["PRCODE"] != CurrentPrCode)
             {
@@ -317,6 +322,17 @@ namespace UAS_LabelMachine
                 MessageBox.Show("请选择指定箱号或者新增");
                 return;
             }
+            //加载完数据之后进行容量的判断
+            int BoxNum = LabelInfDataTable.Select("pib_outboxcode2='" + OutBoxNum.Text + "'").Length;
+            if (BoxNum + CodeCount > OutboxCapacity.Value)
+            {
+                string close = MessageBox.Show(this.ParentForm, "箱号【" + OutBoxNum.Text + "】后超数量为" + (BoxNum + CodeCount) + ",超出容量" + OutboxCapacity.Value + "，是否继续？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                if (close != "Yes")
+                {
+                    Input.SelectAll();
+                    return;
+                }
+            }
             //计算当前采集数量
             string collectqty = dh.getFieldDataByCondition("prodiobarcode", "sum(pib_qty)", "pib_inoutno='" + pi_inoutno.Text + "' and pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString();
             double CollectQty = (collectqty == "" ? 0 : double.Parse(collectqty));
@@ -365,12 +381,6 @@ namespace UAS_LabelMachine
             {
                 LabelInf.Rows[LabelInf.Rows.Count - 1].Selected = true;
             }
-            //加载完数据之后进行容量的判断
-            int BoxNum = LabelInfDataTable.Select("pib_outboxcode2='" + OutBoxNum.Text + "'").Length;
-            if (BoxNum > OutboxCapacity.Value)
-            {
-                MessageBox.Show("箱号【" + OutBoxNum.Text + "】超出容量,当前已采集" + BoxNum, "提示");
-            }
             if (SingleLabelAutoPrint.Checked)
             {
                 thread = new Thread(AutoPrintSingleLabel);
@@ -381,14 +391,22 @@ namespace UAS_LabelMachine
             //采集后重新计数，自动跳到下一行
             collectqty = (SumQty.Compute("sum(pib_qty)", "pib_prodcode='" + CurrentPrCode + "' and pib_pdno='" + CurrentPDNO + "'").ToString());
             CollectQty = (collectqty == "" ? 0 : double.Parse(collectqty));
-            dh.UpdateByCondition("CS$InoutPrcode", "Collectednum='" + collectqty + "'", "pd_inoutno='" + pi_inoutno.Text + "' and pd_pdno='" + CurrentPDNO + "' and combined=" + (Combindetail.Checked ? -1 : 0));
+            int combined = 0;
+            if (Combindetail.Checked)
+                combined = 1;
+            if (CombindetailTwo.Checked)
+                combined = 2;
+            dh.UpdateByCondition("CS$InoutPrcode", "Collectednum='" + collectqty + "'", "pd_inoutno='" + pi_inoutno.Text + "' and pd_pdno='" + CurrentPDNO + "' and combined=" + combined);
             CollectNum = 0;
             double OutNum = 0;
             if (GridPrcode.SelectedRows.Count > 0)
             {
                 GridPrcode.Rows[GridPrcode.SelectedRows[0].Index].Cells["CollectedNum"].Value = collectqty;
-                CollectNum = int.Parse(CSPrcode.Compute("sum(CollectedNum)", "1=1").ToString());
-                OutNum = int.Parse(CSPrcode.Compute("sum(pd_outqty)", "1=1").ToString());
+                for (int i = 0; i < GridPrcode.Rows.Count; i++)
+                {
+                    CollectNum += int.Parse(GridPrcode.Rows[i].Cells["CollectedNum"].Value.ToString());
+                    OutNum += int.Parse(GridPrcode.Rows[i].Cells["pd_outqty"].Value.ToString());
+                }
             }
             ProcessCount.Text = CollectNum + "/" + OutNum;
             if (CollectNum == OutNum)
@@ -541,6 +559,7 @@ namespace UAS_LabelMachine
             if (e.KeyCode == Keys.Enter)
             {
                 Combindetail.Checked = false;
+                CombindetailTwo.Checked = false;
                 Input.Clear();
                 sql.Clear();
                 sql.Append("select pi_id,pi_cardcode,pi_title,to_char(pi_date,'yyyymmdd')pi_date from prodinout where pi_inoutno='" + pi_inoutno.Text + "' and pi_invostatuscode='AUDITED'");
@@ -796,9 +815,9 @@ namespace UAS_LabelMachine
                     SelectProdcode = LabelInf.Rows[SelectRowIndex].Cells["pib_prodcode"].Value.ToString();
                     for (int i = SelectRowIndex; i >= 0; i--)
                     {
-                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_ifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
+                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_midifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
                         {
-                            LabelInf.Rows[i].Cells["pib_ifprint"].Value = true;
+                            LabelInf.Rows[i].Cells["pib_midifprint"].Value = true;
                             if (!MidOutBoxCode.Contains(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString())))
                             {
                                 MidOutBoxCode.Add(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()));
@@ -812,9 +831,9 @@ namespace UAS_LabelMachine
                     }
                     for (int i = SelectRowIndex; i < LabelInf.Rows.Count - 1; i++)
                     {
-                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_ifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
+                        if ((LabelInf.Rows[i].Cells["pib_prodcode"].Value.ToString() == SelectProdcode && LabelInf.Rows[i].Cells["pib_midifprint"].FormattedValue.ToString().ToLower() != "true") || i == SelectRowIndex)
                         {
-                            LabelInf.Rows[i].Cells["pib_ifprint"].Value = true;
+                            LabelInf.Rows[i].Cells["pib_midifprint"].Value = true;
                             if (!MidOutBoxCode.Contains(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString())))
                             {
                                 MidOutBoxCode.Add(int.Parse(LabelInf.Rows[i].Cells["pib_outboxcode1"].Value.ToString()));
@@ -876,6 +895,7 @@ namespace UAS_LabelMachine
             }
             else
                 MessageBox.Show("未维护中盒标签", "提示");
+            Input.Focus();
         }
 
         private void OutBoxPrint()
@@ -982,7 +1002,7 @@ namespace UAS_LabelMachine
                     MidReport.PrintSettings.ShowDialog = false;
                     MidReport.PrintSettings.Printer = MidLabelPrinter.Text;
                     MidReport.Print();
-                    dh.UpdateByCondition("prodiobarcode", "pib_ifprint=1", "pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode1 in (" + pib_outboxcode1 + ")");
+                    dh.UpdateByCondition("prodiobarcode", "pib_midifprint=-1", "pib_inoutno='" + pi_inoutno.Text + "' and pib_outboxcode1 in (" + pib_outboxcode1 + ")");
                     SelectRowIndex = -1;
                 }
                 Properties.Settings.Default.MPrinter = MidLabelPrinter.Text;
@@ -1069,6 +1089,7 @@ namespace UAS_LabelMachine
             }
             else
                 MessageBox.Show("未维护外箱标签", "提示");
+            Input.Focus();
         }
 
         /// <summary>
@@ -1080,7 +1101,7 @@ namespace UAS_LabelMachine
         {
             AllChecked = false;
             sql.Clear();
-            sql.Append("select pd_custprodcode,pd_custprodspec,pib_custmidboxcode,pd_pocode,pjd_orispeccode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,");
+            sql.Append("select pd_custprodcode,pd_custprodspec,nvl(pib_midifprint,0)pib_midifprint,pib_custmidboxcode,pd_pocode,pjd_orispeccode,pib_madein,pib_custbarcode,pib_custoutboxcode,pib_id,pib_datecode1,pib_pdid,pib_piid,");
             sql.Append("pib_pdno,pib_prodcode,pib_brand,pr_vendprodcode,pib_lotno,pib_datecode,week_to_date(pib_datecode) datecode1,pib_qty,pr_spec,");
             sql.Append("pr_zxbzs,pr_unit,pib_barcode,pib_outboxcode1,pib_outboxcode2,nvl(pib_ifprint,0)pib_ifprint from prodiobarcode left join ");
             sql.Append("prodiodetail on pib_piid=pd_piid and pd_pdno=pib_pdno and pd_prodcode=pib_prodcode left join product on pr_code=pib_prodcode  ");
@@ -1281,14 +1302,19 @@ namespace UAS_LabelMachine
         DataTable CSPrcode;
         private void LoadPrcodeData()
         {
-            DataTable Prcode = (DataTable)dh.ExecuteSql("select '' pd_piid,pd_inoutno,pd_pdno,pd_custprodcode,pd_whcode,pd_prodcode,'0' CollectedNum,'0' UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id from prodiodetail left join prodinout on pi_id=pd_piid left join PRODJOINVENDDETAIL on pjd_brand =pd_brand and pjd_prodcode=pd_prodcode left join product on pd_prodcode=pr_code where pi_id='" + PI_ID + "' order by pd_pdno", "select");
+            DataTable Prcode = (DataTable)dh.ExecuteSql("select '' pd_piid,pd_inoutno,pd_custprodcode,pd_pocode,pd_whcode,pd_prodcode,'0' CollectedNum,'0' UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_pdno from prodiodetail left join prodinout on pi_id=pd_piid left join PRODJOINVENDDETAIL on pjd_brand =pd_brand and pjd_prodcode=pd_prodcode left join product on pd_prodcode=pr_code where pi_id='" + PI_ID + "' order by pd_pdno", "select");
             GridPrcode.DataSource = Prcode;
             List<int> RemoveIndex = new List<int>();
             double CollectNum = 0;
             double OutNum = 0;
+            int combined = 0;
             if (Combindetail.Checked)
+                combined = 1;
+            if (CombindetailTwo.Checked)
+                combined = 2;
+            if (Combindetail.Checked || CombindetailTwo.Checked)
             {
-                CSPrcode = (DataTable)dh.ExecuteSql("select * from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=-1 order by  pd_pdno", "select");
+                CSPrcode = (DataTable)dh.ExecuteSql("select pd_piid,pd_pdno,pd_custprodcode,pd_whcode,pd_prodcode,CollectedNum,UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_inoutno,pd_pocode from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=" + combined + " order by  pd_pdno", "select");
                 if (CSPrcode.Rows.Count == 0)
                 {
                     int CurrentIndex = 0;
@@ -1311,12 +1337,14 @@ namespace UAS_LabelMachine
                             string BWhCode = GridPrcode.Rows[i].Cells["pd_whcode"].Value.ToString();
                             string BPrUnit = GridPrcode.Rows[i].Cells["pr_unit"].Value.ToString();
                             string BPrBrand = GridPrcode.Rows[i].Cells["pd_brand"].Value.ToString();
+                            string BPoCode = GridPrcode.Rows[i].Cells["pd_pocode1"].Value.ToString();
                             string FProdCode = GridPrcode.Rows[i + 1].Cells["pd_prodcode"].Value.ToString();
                             string FCustProdCode = GridPrcode.Rows[i + 1].Cells["pd_custprodcode1"].Value.ToString();
                             string FPrUnit = GridPrcode.Rows[i + 1].Cells["pr_unit"].Value.ToString();
                             string FrBrand = GridPrcode.Rows[i + 1].Cells["pd_brand"].Value.ToString();
                             string FWhCode = GridPrcode.Rows[i + 1].Cells["pd_whcode"].Value.ToString();
-                            if (BProdCode == FProdCode && BPrBrand == FrBrand && BCustProdCode == FCustProdCode)
+                            string FPoCode = GridPrcode.Rows[i + 1].Cells["pd_pocode1"].Value.ToString();
+                            if (BProdCode == FProdCode && BPrBrand == FrBrand && BCustProdCode == FCustProdCode && (CombindetailTwo.Checked && FPoCode == BPoCode || Combindetail.Checked))
                             {
                                 GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value = double.Parse(GridPrcode.Rows[CurrentIndex].Cells["pd_outqty"].Value.ToString()) + double.Parse(GridPrcode.Rows[i + 1].Cells["pd_outqty"].Value.ToString());
                                 GridPrcode.Rows[CurrentIndex].Cells["CollectedNum"].Value = double.Parse(GridPrcode.Rows[CurrentIndex].Cells["CollectedNum"].Value.ToString()) + double.Parse(GridPrcode.Rows[i + 1].Cells["CollectedNum"].Value.ToString());
@@ -1326,7 +1354,6 @@ namespace UAS_LabelMachine
                             {
                                 CurrentIndex = i + 1;
                             }
-
                         }
                     }
                     foreach (int item in RemoveIndex.OrderByDescending(x => x))
@@ -1338,7 +1365,7 @@ namespace UAS_LabelMachine
             }
             else
             {
-                CSPrcode = (DataTable)dh.ExecuteSql("select * from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=0 order by pd_pdno", "select");
+                CSPrcode = (DataTable)dh.ExecuteSql("select pd_piid,pd_pdno,pd_custprodcode,pd_whcode,pd_prodcode,CollectedNum,UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_inoutno,pd_pocode from CS$InoutPrcode where pd_inoutno='" + pi_inoutno.Text + "' and combined=" + combined + " order by pd_pdno", "select");
                 if (CSPrcode.Rows.Count == 0)
                 {
                     for (int i = 0; i < GridPrcode.Rows.Count; i++)
@@ -1358,8 +1385,8 @@ namespace UAS_LabelMachine
             {
                 sql.Clear();
                 sql.Append("insert into CS$InoutPrcode (pd_piid,pd_pdno,pd_custprodcode,pd_whcode,pd_prodcode,");
-                sql.Append("CollectedNum,UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_inoutno,combined)");
-                sql.Append("values ('',:pd_pdno,:pd_custprodcode,:pd_whcode,:pd_prodcode,:CollectedNum,:UnCollectedNum,:pd_outqty,:pr_unit,:pr_spec,:pd_brand,:pjd_zxbzs_user,:pjd_id,:pd_inoutno,'" + (Combindetail.Checked ? -1 : 0) + "')");
+                sql.Append("CollectedNum,UnCollectedNum,pd_outqty,pr_unit,pr_spec,pd_brand,pjd_zxbzs_user,pjd_id,pd_inoutno,combined,pd_pocode)");
+                sql.Append("values ('',:pd_pdno,:pd_custprodcode,:pd_whcode,:pd_prodcode,:CollectedNum,:UnCollectedNum,:pd_outqty,:pr_unit,:pr_spec,:pd_brand,:pjd_zxbzs_user,:pjd_id,:pd_inoutno,'" + combined + "',:pd_pocode)");
                 dh.SaveDataTable((GridPrcode.DataSource as DataTable), "CS$InoutPrcode", "pd_piid", sql.ToString());
             }
             else
@@ -1494,6 +1521,7 @@ namespace UAS_LabelMachine
             string Value = GridPrcode.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString();
             string ID = GridPrcode.Rows[e.RowIndex].Cells["pjd_id"].Value.ToString();
             dh.UpdateByCondition("PRODJOINVENDDETAIL", "pjd_zxbzs_user='" + Value + "'", "pjd_id='" + ID + "'");
+            dh.UpdateByCondition("CS$INOUTPRCODE", "pjd_zxbzs_user='" + Value + "'", "pjd_id='" + ID + "' and pd_inoutno='" + pi_inoutno.Text + "'");
             //删除对应物料的明细
             CurrentPrCode = GridPrcode.Rows[e.RowIndex].Cells["pd_prodcode"].Value.ToString();
             CurrentZXBZ = GridPrcode.Rows[e.RowIndex].Cells["pjd_zxbzs_user"].Value.ToString();
@@ -1753,6 +1781,18 @@ namespace UAS_LabelMachine
 
         private void Combindetail_CheckedChanged(object sender, EventArgs e)
         {
+            if (Combindetail.Checked)
+            {
+                CombindetailTwo.Checked = false;
+            }
+            LoadPrcodeData();
+        }
+        private void CombindetailTwo_CheckedChanged(object sender, EventArgs e)
+        {
+            if (CombindetailTwo.Checked)
+            {
+                Combindetail.Checked = false;
+            }
             LoadPrcodeData();
         }
         string SelectProdcode = "";
@@ -1768,10 +1808,7 @@ namespace UAS_LabelMachine
 
         private void OutBoxNum_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (!ComBoxClickChangeLabelDoc)
-            {
-                OutBoxNum1 = OutBoxNum.Text;
-            }
+            OutBoxNum1 = OutBoxNum.Text;
             LoadGridData(sender, e);
         }
 

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

@@ -129,6 +129,9 @@
   <metadata name="pd_pdno.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_whcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -138,6 +141,9 @@
   <metadata name="pd_custprodcode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_pocode1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_prodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -162,6 +168,9 @@
   <metadata name="pjd_zxbzs_user.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pib_midifprint.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="pd_custprodcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>