修改栈板，大箱，包装采集

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

@@ -31,7 +31,6 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_BigBoxCollection));
             this.pa_outboxcode_label = new System.Windows.Forms.Label();
             this.pa_totalqty_label = new System.Windows.Forms.Label();
-            this.pa_salecode_label = new System.Windows.Forms.Label();
             this.pa_makecode_label = new System.Windows.Forms.Label();
             this.AutoPrint = new System.Windows.Forms.CheckBox();
             this.pa_restqty_label = new System.Windows.Forms.Label();
@@ -61,9 +60,10 @@
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_outboxcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_packageqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_packageqty_label = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).BeginInit();
             this.SuspendLayout();
@@ -82,27 +82,17 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(235, 27);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(235, 77);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
             this.pa_totalqty_label.Size = new System.Drawing.Size(74, 21);
             this.pa_totalqty_label.TabIndex = 104;
-            this.pa_totalqty_label.Text = "箱内数量";
-            // 
-            // pa_salecode_label
-            // 
-            this.pa_salecode_label.AutoSize = true;
-            this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(20, 79);
-            this.pa_salecode_label.Name = "pa_salecode_label";
-            this.pa_salecode_label.Size = new System.Drawing.Size(58, 21);
-            this.pa_salecode_label.TabIndex = 106;
-            this.pa_salecode_label.Text = "订单号";
+            this.pa_totalqty_label.Text = "已装数量";
             // 
             // pa_makecode_label
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(453, 27);
+            this.pa_makecode_label.Location = new System.Drawing.Point(235, 27);
             this.pa_makecode_label.Name = "pa_makecode_label";
             this.pa_makecode_label.Size = new System.Drawing.Size(74, 21);
             this.pa_makecode_label.TabIndex = 108;
@@ -135,7 +125,7 @@
             // 
             this.pa_custcode_label.AutoSize = true;
             this.pa_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode_label.Location = new System.Drawing.Point(235, 79);
+            this.pa_custcode_label.Location = new System.Drawing.Point(735, 27);
             this.pa_custcode_label.Name = "pa_custcode_label";
             this.pa_custcode_label.Size = new System.Drawing.Size(42, 21);
             this.pa_custcode_label.TabIndex = 157;
@@ -165,7 +155,7 @@
             // 
             this.pa_prodcode_label.AutoSize = true;
             this.pa_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode_label.Location = new System.Drawing.Point(735, 27);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(453, 27);
             this.pa_prodcode_label.Name = "pa_prodcode_label";
             this.pa_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.pa_prodcode_label.TabIndex = 169;
@@ -226,7 +216,7 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(829, 27);
+            this.pa_prodcode.Location = new System.Drawing.Point(559, 27);
             this.pa_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_prodcode.Name = "pa_prodcode";
             this.pa_prodcode.Size = new System.Drawing.Size(0, 21);
@@ -369,7 +359,7 @@
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
             this.pa_custcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode.Location = new System.Drawing.Point(329, 79);
+            this.pa_custcode.Location = new System.Drawing.Point(829, 27);
             this.pa_custcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_custcode.Name = "pa_custcode";
             this.pa_custcode.Size = new System.Drawing.Size(0, 21);
@@ -433,31 +423,19 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(563, 27);
+            this.pa_makecode.Location = new System.Drawing.Point(329, 27);
             this.pa_makecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_makecode.Name = "pa_makecode";
             this.pa_makecode.Size = new System.Drawing.Size(0, 21);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
-            // pa_salecode
-            // 
-            this.pa_salecode.AutoSize = true;
-            this.pa_salecode.CutLength = null;
-            this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode.Location = new System.Drawing.Point(98, 79);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(150, 0);
-            this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 21);
-            this.pa_salecode.TabIndex = 107;
-            this.pa_salecode.Tag = "1";
-            // 
             // pa_totalqty
             // 
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(329, 27);
+            this.pa_totalqty.Location = new System.Drawing.Point(329, 77);
             this.pa_totalqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_totalqty.Name = "pa_totalqty";
             this.pa_totalqty.Size = new System.Drawing.Size(0, 21);
@@ -469,18 +447,42 @@
             this.pa_outboxcode.AutoSize = true;
             this.pa_outboxcode.CutLength = null;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode.Location = new System.Drawing.Point(98, 27);
+            this.pa_outboxcode.Location = new System.Drawing.Point(118, 27);
             this.pa_outboxcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Size = new System.Drawing.Size(0, 21);
             this.pa_outboxcode.TabIndex = 103;
             this.pa_outboxcode.Tag = "1";
             // 
+            // pa_packageqty
+            // 
+            this.pa_packageqty.AutoSize = true;
+            this.pa_packageqty.CutLength = null;
+            this.pa_packageqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_packageqty.Location = new System.Drawing.Point(118, 77);
+            this.pa_packageqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_packageqty.Name = "pa_packageqty";
+            this.pa_packageqty.Size = new System.Drawing.Size(0, 21);
+            this.pa_packageqty.TabIndex = 177;
+            this.pa_packageqty.Tag = "1";
+            // 
+            // pa_packageqty_label
+            // 
+            this.pa_packageqty_label.AutoSize = true;
+            this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_packageqty_label.Location = new System.Drawing.Point(20, 77);
+            this.pa_packageqty_label.Name = "pa_packageqty_label";
+            this.pa_packageqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_packageqty_label.TabIndex = 176;
+            this.pa_packageqty_label.Text = "箱内容量";
+            // 
             // Make_BigBoxCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(997, 552);
+            this.Controls.Add(this.pa_packageqty);
+            this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.PrintLabel_label);
             this.Controls.Add(this.PrinterList_label);
@@ -505,8 +507,6 @@
             this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.pa_makecode);
             this.Controls.Add(this.pa_makecode_label);
-            this.Controls.Add(this.pa_salecode);
-            this.Controls.Add(this.pa_salecode_label);
             this.Controls.Add(this.pa_totalqty);
             this.Controls.Add(this.pa_totalqty_label);
             this.Controls.Add(this.pa_outboxcode);
@@ -530,8 +530,6 @@
         private System.Windows.Forms.Label pa_outboxcode_label;
         private CustomControl.ValueLabel.ValueLabel pa_totalqty;
         private System.Windows.Forms.Label pa_totalqty_label;
-        private CustomControl.ValueLabel.ValueLabel pa_salecode;
-        private System.Windows.Forms.Label pa_salecode_label;
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
         private System.Windows.Forms.Label pa_makecode_label;
         private System.Windows.Forms.CheckBox AutoPrint;
@@ -561,5 +559,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private CustomControl.ValueLabel.ValueLabel pa_packageqty;
+        private System.Windows.Forms.Label pa_packageqty_label;
     }
 }

UAS-MES/FunctionCode/Make/Make_BigBoxCollection.cs

@@ -30,7 +30,7 @@ namespace UAS_MES.Make
         //物料编号
         string pr_code;
         //箱内件数
-        int pa_packageqty;
+        int pa_packqty;
         //Package表的主键
         string pa_id;
 
@@ -84,7 +84,7 @@ namespace UAS_MES.Make
                     return;
                 }
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
+                sql.Append("select pa_makecode,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
                 sql.Append("from package where pa_outboxcode='" + palletcode.Text + "'  and pa_type =2");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.SetFormValue(Controls, dt);
@@ -92,7 +92,7 @@ namespace UAS_MES.Make
                 {
                     LoadGridData();
                     dt = dh.getFieldsDataByCondition("Package", new string[] { "pa_packageqty", "pa_id" }, "pa_outboxcode='" + palletcode.Text + "'");
-                    pa_packageqty = int.Parse(dt.Rows[0]["pa_packageqty"].ToString());
+                    pa_packqty = int.Parse(dt.Rows[0]["pa_packageqty"].ToString());
                     pa_id = dt.Rows[0]["pa_id"].ToString();
                     FillPrintLabel();
                     outboxcode.Focus();
@@ -121,7 +121,7 @@ namespace UAS_MES.Make
                 sql.Append("pa_outboxcode='" + palletcode.Text + "'");
                 int packageqty = int.Parse((dh.ExecuteSql(sql.GetString(), "select") as DataTable).Rows[0][0].ToString());
                 //如果未装满的话
-                if (packageqty < pa_packageqty)
+                if (packageqty < pa_packqty)
                 {
                     if (dh.CheckExist("Package", "pa_outboxcode='" + outboxcode.Text + "' and pa_type=2"))
                     {
@@ -132,10 +132,12 @@ namespace UAS_MES.Make
                             sql.Append("insert into packagedetail(pd_id, pd_paid, pd_outboxcode, pd_innerboxcode, pd_innerqty)");
                             sql.Append("values(packagedetail_seq.nextval,'" + pa_id + "','" + palletcode.Text + "','" + outboxcode.Text + "','" + pa_totalqty.Text + "')");
                             dh.ExecuteSql(sql.GetString(), "insert");
-                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
+                            dh.UpdateByCondition("package", "pa_totalqty=pa_totalqty+1", "pa_outboxcode='" + outboxcode.Text + "' and pa_type=2");
+                            OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
                             LoadGridData();
+                            LoadCollectNum();
                             //判断明细和箱内的件数的差是不是1，如果只相差1则表示此时已经采集慢了
-                            if (packageqty + 1 == pa_packageqty && AutoPrint.Checked)
+                            if (packageqty + 1 == pa_packqty && AutoPrint.Checked)
                             {
                                 OperateResult.AppendText(">>箱已装满，自动打印!\n", Color.Green);
                                 Printlab.PerformClick();
@@ -149,20 +151,14 @@ namespace UAS_MES.Make
             }
         }
 
-        private bool LoadGridData()
+        private void LoadGridData()
         {
             sql.Clear();
             sql.Append("select pa_prodcode,nvl(pd_barcode,PD_INNERBOXCODE) code ,pd_innerqty,pa_salecode");
             sql.Append(",pa_makecode,pa_custcode,pa_packageqty from packagedetail left join package on pd_paid=pa_id left ");
             sql.Append("join product on pr_code=pa_prodcode where pa_outboxcode ='" + palletcode.Text + "' and pa_type=2");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            if (dt.Rows.Count > 0)
-            {
-                BaseUtil.FillDgvWithDataTable(PackageInf, dt);
-                pr_code = dt.Rows[0]["pa_prodcode"].ToString();
-                return true;
-            }
-            return false;
+            BaseUtil.FillDgvWithDataTable(PackageInf, dt);
         }
 
         private void FillPrintLabel()
@@ -180,7 +176,10 @@ namespace UAS_MES.Make
             }
         }
 
-
+        private void LoadCollectNum()
+        {
+            pa_totalqty.Text = dh.getFieldDataByCondition("package", "pa_totalqty", "pa_outboxcode='" + outboxcode.Text + "' and pa_type=2").ToString();
+        }
 
         private void 栈板称重_SizeChanged(object sender, EventArgs e)
         {
@@ -189,14 +188,17 @@ namespace UAS_MES.Make
 
         private void NewPallet_Click(object sender, EventArgs e)
         {
-            Make_NewPallet NewPallet = new Make_NewPallet("PALLET", pa_makecode.Text);
+            Make_NewPallet NewPallet = new Make_NewPallet("PACKAGE", pa_makecode.Text);
             BaseUtil.SetFormCenter(NewPallet);
             NewPallet.ShowDialog();
         }
 
         private void Print_Click(object sender, EventArgs e)
         {
-            Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+            if (PrintLabel.Items.Count != 0)
+                Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+            else
+                OperateResult.AppendText(">>产品" + pa_prodcode.Text + "未维护打印标签\n", Color.Red);
         }
 
         private void ReleasePallet_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_NewPallet.cs

@@ -63,8 +63,8 @@ namespace UAS_MES.Make
         {
             if (pa_outboxcode.Text != "" && pa_packageqty.Text != "" && pr_code.Text != "")
             {
-                string sql = "insert into package (pa_id,pa_outboxcode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS)values";
-                sql += "(package_seq.nextval,'" + pa_outboxcode.Text + "',sysdate,'" + pa_packageqty.Text + "','" + pa_type + "','" + pr_code.Text + "',0,'')";
+                string sql = "insert into package (pa_id,pa_outboxcode,pa_makecode,pa_indate,pa_packageqty,pa_type,pa_prodcode，pa_level，PA_STATUS)values";
+                sql += "(package_seq.nextval,'" + pa_outboxcode.Text + "','"+pa_outboxcode.MakeCode+"',sysdate,'" + pa_packageqty.Text + "','" + pa_type + "','" + pr_code.Text + "',0,'')";
                 dh.ExecuteSql(sql, "insert");
                 MessageBox.Show("生成箱号成功！");
                 pa_outboxcode.Text = "";

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -135,24 +135,27 @@ namespace UAS_MES.Make
 
         private void Print_Click(object sender, EventArgs e)
         {
-            //未采集满的时候点击打印，进行提示
-            if (pr_outboxinnerqty.Text != pa_packageqty.Text)
-            {
-                DialogResult result = MessageBox.Show("该箱未采集满,确定打印？", "提示", MessageBoxButtons.YesNo);
-                if (result.ToString() == "Yes")
+            if (PrintLabel.Items.Count != 0) {
+                //未采集满的时候点击打印，进行提示
+                if (pr_outboxinnerqty.Text != pa_packageqty.Text)
                 {
-                    OperateResult.AppendText(">>开始打印\n", Color.Green);
-                    Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                    DialogResult result = MessageBox.Show("该箱未采集满,确定打印？", "提示", MessageBoxButtons.YesNo);
+                    if (result.ToString() == "Yes")
+                    {
+                        OperateResult.AppendText(">>开始打印\n", Color.Green);
+                        Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                    }
                 }
-            }
-            else
-            {
-                if (PrintLabel.SelectedValue != null)
+                else
                 {
-                    OperateResult.AppendText(">>开始打印\n", Color.Green);
-                    Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                    if (PrintLabel.SelectedValue != null)
+                    {
+                        OperateResult.AppendText(">>开始打印\n", Color.Green);
+                        Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrintList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+                    }
                 }
             }
+            else OperateResult.AppendText(">>产品" + pr_code.Text + "未维护打印标签\n", Color.Red);
         }
 
         //输入箱号的回车事件

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

@@ -28,10 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_PalletCollection));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Make_BigBoxCollection));
             this.pa_outboxcode_label = new System.Windows.Forms.Label();
             this.pa_totalqty_label = new System.Windows.Forms.Label();
-            this.pa_salecode_label = new System.Windows.Forms.Label();
             this.pa_makecode_label = new System.Windows.Forms.Label();
             this.AutoPrint = new System.Windows.Forms.CheckBox();
             this.pa_restqty_label = new System.Windows.Forms.Label();
@@ -61,9 +60,10 @@
             this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.pa_makecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
-            this.pa_salecode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_totalqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.pa_outboxcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_packageqty = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
+            this.pa_packageqty_label = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.PrintNum)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PackageInf)).BeginInit();
             this.SuspendLayout();
@@ -82,27 +82,17 @@
             // 
             this.pa_totalqty_label.AutoSize = true;
             this.pa_totalqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty_label.Location = new System.Drawing.Point(235, 27);
+            this.pa_totalqty_label.Location = new System.Drawing.Point(235, 77);
             this.pa_totalqty_label.Name = "pa_totalqty_label";
             this.pa_totalqty_label.Size = new System.Drawing.Size(74, 21);
             this.pa_totalqty_label.TabIndex = 104;
-            this.pa_totalqty_label.Text = "箱内数量";
-            // 
-            // pa_salecode_label
-            // 
-            this.pa_salecode_label.AutoSize = true;
-            this.pa_salecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode_label.Location = new System.Drawing.Point(20, 79);
-            this.pa_salecode_label.Name = "pa_salecode_label";
-            this.pa_salecode_label.Size = new System.Drawing.Size(58, 21);
-            this.pa_salecode_label.TabIndex = 106;
-            this.pa_salecode_label.Text = "订单号";
+            this.pa_totalqty_label.Text = "已装数量";
             // 
             // pa_makecode_label
             // 
             this.pa_makecode_label.AutoSize = true;
             this.pa_makecode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode_label.Location = new System.Drawing.Point(453, 27);
+            this.pa_makecode_label.Location = new System.Drawing.Point(235, 27);
             this.pa_makecode_label.Name = "pa_makecode_label";
             this.pa_makecode_label.Size = new System.Drawing.Size(74, 21);
             this.pa_makecode_label.TabIndex = 108;
@@ -135,7 +125,7 @@
             // 
             this.pa_custcode_label.AutoSize = true;
             this.pa_custcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode_label.Location = new System.Drawing.Point(235, 79);
+            this.pa_custcode_label.Location = new System.Drawing.Point(735, 27);
             this.pa_custcode_label.Name = "pa_custcode_label";
             this.pa_custcode_label.Size = new System.Drawing.Size(42, 21);
             this.pa_custcode_label.TabIndex = 157;
@@ -149,7 +139,7 @@
             this.palletcode_label.Name = "palletcode_label";
             this.palletcode_label.Size = new System.Drawing.Size(58, 21);
             this.palletcode_label.TabIndex = 165;
-            this.palletcode_label.Text = "栈板号";
+            this.palletcode_label.Text = "大箱号";
             // 
             // outboxcode_label
             // 
@@ -157,15 +147,15 @@
             this.outboxcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.outboxcode_label.Location = new System.Drawing.Point(735, 335);
             this.outboxcode_label.Name = "outboxcode_label";
-            this.outboxcode_label.Size = new System.Drawing.Size(42, 21);
+            this.outboxcode_label.Size = new System.Drawing.Size(74, 21);
             this.outboxcode_label.TabIndex = 166;
-            this.outboxcode_label.Text = "箱号";
+            this.outboxcode_label.Text = "卡通箱号";
             // 
             // pa_prodcode_label
             // 
             this.pa_prodcode_label.AutoSize = true;
             this.pa_prodcode_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode_label.Location = new System.Drawing.Point(735, 27);
+            this.pa_prodcode_label.Location = new System.Drawing.Point(453, 27);
             this.pa_prodcode_label.Name = "pa_prodcode_label";
             this.pa_prodcode_label.Size = new System.Drawing.Size(74, 21);
             this.pa_prodcode_label.TabIndex = 169;
@@ -226,7 +216,7 @@
             this.pa_prodcode.AutoSize = true;
             this.pa_prodcode.CutLength = null;
             this.pa_prodcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_prodcode.Location = new System.Drawing.Point(829, 27);
+            this.pa_prodcode.Location = new System.Drawing.Point(559, 27);
             this.pa_prodcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_prodcode.Name = "pa_prodcode";
             this.pa_prodcode.Size = new System.Drawing.Size(0, 21);
@@ -265,7 +255,7 @@
             this.outboxcode.AllPower = "ifall";
             this.outboxcode.BackColor = System.Drawing.Color.White;
             this.outboxcode.ID = null;
-            this.outboxcode.Location = new System.Drawing.Point(799, 335);
+            this.outboxcode.Location = new System.Drawing.Point(813, 335);
             this.outboxcode.Name = "outboxcode";
             this.outboxcode.Power = "ifwrite";
             this.outboxcode.Size = new System.Drawing.Size(147, 21);
@@ -281,7 +271,7 @@
             this.palletcode.AllPower = "ifall";
             this.palletcode.BackColor = System.Drawing.Color.White;
             this.palletcode.ID = null;
-            this.palletcode.Location = new System.Drawing.Point(799, 291);
+            this.palletcode.Location = new System.Drawing.Point(813, 291);
             this.palletcode.Name = "palletcode";
             this.palletcode.Power = "ifwrite";
             this.palletcode.Size = new System.Drawing.Size(147, 21);
@@ -306,7 +296,7 @@
             this.SearchPallet.Power = null;
             this.SearchPallet.Size = new System.Drawing.Size(70, 24);
             this.SearchPallet.TabIndex = 162;
-            this.SearchPallet.Text = "栈板查询";
+            this.SearchPallet.Text = "大箱查询";
             this.SearchPallet.UseVisualStyleBackColor = true;
             this.SearchPallet.Click += new System.EventHandler(this.SearchPallet_Click);
             // 
@@ -342,7 +332,7 @@
             this.ReleasePallet.Power = null;
             this.ReleasePallet.Size = new System.Drawing.Size(70, 24);
             this.ReleasePallet.TabIndex = 160;
-            this.ReleasePallet.Text = "解除栈板";
+            this.ReleasePallet.Text = "解除大箱";
             this.ReleasePallet.UseVisualStyleBackColor = true;
             this.ReleasePallet.Click += new System.EventHandler(this.ReleasePallet_Click);
             // 
@@ -360,7 +350,7 @@
             this.NewPallet.Power = "ifwrite";
             this.NewPallet.Size = new System.Drawing.Size(70, 24);
             this.NewPallet.TabIndex = 159;
-            this.NewPallet.Text = "新增栈板";
+            this.NewPallet.Text = "新增大箱";
             this.NewPallet.UseVisualStyleBackColor = true;
             this.NewPallet.Click += new System.EventHandler(this.NewPallet_Click);
             // 
@@ -369,7 +359,7 @@
             this.pa_custcode.AutoSize = true;
             this.pa_custcode.CutLength = null;
             this.pa_custcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_custcode.Location = new System.Drawing.Point(329, 79);
+            this.pa_custcode.Location = new System.Drawing.Point(829, 27);
             this.pa_custcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_custcode.Name = "pa_custcode";
             this.pa_custcode.Size = new System.Drawing.Size(0, 21);
@@ -433,31 +423,19 @@
             this.pa_makecode.AutoSize = true;
             this.pa_makecode.CutLength = null;
             this.pa_makecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_makecode.Location = new System.Drawing.Point(563, 27);
+            this.pa_makecode.Location = new System.Drawing.Point(329, 27);
             this.pa_makecode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_makecode.Name = "pa_makecode";
             this.pa_makecode.Size = new System.Drawing.Size(0, 21);
             this.pa_makecode.TabIndex = 109;
             this.pa_makecode.Tag = "1";
             // 
-            // pa_salecode
-            // 
-            this.pa_salecode.AutoSize = true;
-            this.pa_salecode.CutLength = null;
-            this.pa_salecode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_salecode.Location = new System.Drawing.Point(98, 79);
-            this.pa_salecode.MaximumSize = new System.Drawing.Size(150, 0);
-            this.pa_salecode.Name = "pa_salecode";
-            this.pa_salecode.Size = new System.Drawing.Size(0, 21);
-            this.pa_salecode.TabIndex = 107;
-            this.pa_salecode.Tag = "1";
-            // 
             // pa_totalqty
             // 
             this.pa_totalqty.AutoSize = true;
             this.pa_totalqty.CutLength = null;
             this.pa_totalqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_totalqty.Location = new System.Drawing.Point(329, 27);
+            this.pa_totalqty.Location = new System.Drawing.Point(329, 77);
             this.pa_totalqty.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_totalqty.Name = "pa_totalqty";
             this.pa_totalqty.Size = new System.Drawing.Size(0, 21);
@@ -469,18 +447,42 @@
             this.pa_outboxcode.AutoSize = true;
             this.pa_outboxcode.CutLength = null;
             this.pa_outboxcode.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pa_outboxcode.Location = new System.Drawing.Point(98, 27);
+            this.pa_outboxcode.Location = new System.Drawing.Point(118, 27);
             this.pa_outboxcode.MaximumSize = new System.Drawing.Size(150, 0);
             this.pa_outboxcode.Name = "pa_outboxcode";
             this.pa_outboxcode.Size = new System.Drawing.Size(0, 21);
             this.pa_outboxcode.TabIndex = 103;
             this.pa_outboxcode.Tag = "1";
             // 
-            // Make_PalletCollection
+            // pa_packageqty
+            // 
+            this.pa_packageqty.AutoSize = true;
+            this.pa_packageqty.CutLength = null;
+            this.pa_packageqty.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_packageqty.Location = new System.Drawing.Point(118, 77);
+            this.pa_packageqty.MaximumSize = new System.Drawing.Size(150, 0);
+            this.pa_packageqty.Name = "pa_packageqty";
+            this.pa_packageqty.Size = new System.Drawing.Size(0, 21);
+            this.pa_packageqty.TabIndex = 177;
+            this.pa_packageqty.Tag = "1";
+            // 
+            // pa_packageqty_label
+            // 
+            this.pa_packageqty_label.AutoSize = true;
+            this.pa_packageqty_label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.pa_packageqty_label.Location = new System.Drawing.Point(20, 77);
+            this.pa_packageqty_label.Name = "pa_packageqty_label";
+            this.pa_packageqty_label.Size = new System.Drawing.Size(74, 21);
+            this.pa_packageqty_label.TabIndex = 176;
+            this.pa_packageqty_label.Text = "箱内容量";
+            // 
+            // Make_BigBoxCollection
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(997, 552);
+            this.Controls.Add(this.pa_packageqty);
+            this.Controls.Add(this.pa_packageqty_label);
             this.Controls.Add(this.PrintNum);
             this.Controls.Add(this.PrintLabel_label);
             this.Controls.Add(this.PrinterList_label);
@@ -505,15 +507,13 @@
             this.Controls.Add(this.AutoPrint);
             this.Controls.Add(this.pa_makecode);
             this.Controls.Add(this.pa_makecode_label);
-            this.Controls.Add(this.pa_salecode);
-            this.Controls.Add(this.pa_salecode_label);
             this.Controls.Add(this.pa_totalqty);
             this.Controls.Add(this.pa_totalqty_label);
             this.Controls.Add(this.pa_outboxcode);
             this.Controls.Add(this.pa_outboxcode_label);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Name = "Make_PalletCollection";
-            this.Tag = "Make!PalletCollection";
+            this.Name = "Make_BigBoxCollection";
+            this.Tag = "Make!BigBoxCollection";
             this.Text = "栈板采集";
             this.Load += new System.EventHandler(this.栈板称重_Load);
             this.SizeChanged += new System.EventHandler(this.栈板称重_SizeChanged);
@@ -530,8 +530,6 @@
         private System.Windows.Forms.Label pa_outboxcode_label;
         private CustomControl.ValueLabel.ValueLabel pa_totalqty;
         private System.Windows.Forms.Label pa_totalqty_label;
-        private CustomControl.ValueLabel.ValueLabel pa_salecode;
-        private System.Windows.Forms.Label pa_salecode_label;
         private CustomControl.ValueLabel.ValueLabel pa_makecode;
         private System.Windows.Forms.Label pa_makecode_label;
         private System.Windows.Forms.CheckBox AutoPrint;
@@ -561,5 +559,7 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column4;
         private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
+        private CustomControl.ValueLabel.ValueLabel pa_packageqty;
+        private System.Windows.Forms.Label pa_packageqty_label;
     }
 }

UAS-MES/FunctionCode/Make/Make_PalletCollection.cs

@@ -30,7 +30,7 @@ namespace UAS_MES.Make
         //物料编号
         string pr_code;
         //箱内件数
-        int pa_packageqty;
+        int pa_packqty;
         //Package表的主键
         string pa_id;
 
@@ -40,7 +40,7 @@ namespace UAS_MES.Make
 
         private System.DateTime[] indate;
 
-        public Make_PalletCollection()
+        public Make_PalletCollection() 
         {
             InitializeComponent();
         }
@@ -73,31 +73,31 @@ namespace UAS_MES.Make
             OperateResult.Clear();
         }
 
-        //栈板号或者大箱号Enter事件
+        //大箱号Enter事件
         private void palletcode_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.KeyCode == Keys.Enter)
             {
                 if (palletcode.Text == "")
                 {
-                    OperateResult.AppendText(">>栈板号不能为空\n", Color.Red);
+                    OperateResult.AppendText(">>大箱号不能为空\n", Color.Red);
                     return;
                 }
                 sql.Clear();
-                sql.Append("select pa_makecode,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
-                sql.Append("from package where pa_outboxcode='" + palletcode.Text + "'  and pa_type =3");
+                sql.Append("select pa_makecode,pa_packageqty,pa_prodcode,pa_outboxcode,pa_totalqty,pa_custcode,pa_salecode ");
+                sql.Append("from package where pa_outboxcode='" + palletcode.Text + "'  and pa_type =2");
                 dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 BaseUtil.SetFormValue(Controls, dt);
                 if (dt.Rows.Count > 0)
                 {
                     LoadGridData();
                     dt = dh.getFieldsDataByCondition("Package", new string[] { "pa_packageqty", "pa_id" }, "pa_outboxcode='" + palletcode.Text + "'");
-                    pa_packageqty = int.Parse(dt.Rows[0]["pa_packageqty"].ToString());
+                    pa_packqty = int.Parse(dt.Rows[0]["pa_packageqty"].ToString());
                     pa_id = dt.Rows[0]["pa_id"].ToString();
                     FillPrintLabel();
                     outboxcode.Focus();
                 }
-                else OperateResult.AppendText(">>栈板号不存在\n", Color.Red);
+                else OperateResult.AppendText(">>大箱号不存在\n", Color.Red);
             }
         }
 
@@ -108,12 +108,12 @@ namespace UAS_MES.Make
             {
                 if (outboxcode.Text == "")
                 {
-                    OperateResult.AppendText(">>箱号不能为空\n", Color.Red);
+                    OperateResult.AppendText(">>卡通箱号不能为空\n", Color.Red);
                     return;
                 }
-                if (!dh.CheckExist("package", "pa_outboxcode='" + palletcode.Text + "' and pa_type=3"))
+                if (!dh.CheckExist("package", "pa_outboxcode='" + palletcode.Text + "' and pa_type=2"))
                 {
-                    OperateResult.AppendText(">>栈板号不存在\n", Color.Red);
+                    OperateResult.AppendText(">>大箱号不存在\n", Color.Red);
                     return;
                 }
                 sql.Clear();
@@ -121,7 +121,7 @@ namespace UAS_MES.Make
                 sql.Append("pa_outboxcode='" + palletcode.Text + "'");
                 int packageqty = int.Parse((dh.ExecuteSql(sql.GetString(), "select") as DataTable).Rows[0][0].ToString());
                 //如果未装满的话
-                if (packageqty < pa_packageqty)
+                if (packageqty < pa_packqty)
                 {
                     if (dh.CheckExist("Package", "pa_outboxcode='" + outboxcode.Text + "' and pa_type=2"))
                     {
@@ -132,37 +132,33 @@ namespace UAS_MES.Make
                             sql.Append("insert into packagedetail(pd_id, pd_paid, pd_outboxcode, pd_innerboxcode, pd_innerqty)");
                             sql.Append("values(packagedetail_seq.nextval,'" + pa_id + "','" + palletcode.Text + "','" + outboxcode.Text + "','" + pa_totalqty.Text + "')");
                             dh.ExecuteSql(sql.GetString(), "insert");
-                            OperateResult.AppendText(">>箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
+                            dh.UpdateByCondition("package", "pa_totalqty=pa_totalqty+1", "pa_outboxcode='" + outboxcode.Text + "' and pa_type=2");
+                            OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "采集成功！\n", Color.Green, outboxcode);
                             LoadGridData();
+                            LoadCollectNum();
                             //判断明细和箱内的件数的差是不是1，如果只相差1则表示此时已经采集慢了
-                            if (packageqty + 1 == pa_packageqty && AutoPrint.Checked)
+                            if (packageqty + 1 == pa_packqty && AutoPrint.Checked)
                             {
                                 OperateResult.AppendText(">>箱已装满，自动打印!\n", Color.Green);
                                 Printlab.PerformClick();
                             }
                         }
-                        else OperateResult.AppendText(">>箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
+                        else OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "已采集\n", Color.Red, outboxcode);
                     }
-                    else OperateResult.AppendText(">>箱号" + outboxcode.Text + "不存在\n", Color.Red, outboxcode);
+                    else OperateResult.AppendText(">>卡通箱号" + outboxcode.Text + "不存在\n", Color.Red, outboxcode);
                 }
-                else OperateResult.AppendText(">>栈板" + palletcode.Text + "已装满\n", Color.Red, outboxcode);
+                else OperateResult.AppendText(">>大箱" + palletcode.Text + "已装满\n", Color.Red, outboxcode);
             }
         }
 
-        private bool LoadGridData()
+        private void LoadGridData()
         {
             sql.Clear();
             sql.Append("select pa_prodcode,nvl(pd_barcode,PD_INNERBOXCODE) code ,pd_innerqty,pa_salecode");
             sql.Append(",pa_makecode,pa_custcode,pa_packageqty from packagedetail left join package on pd_paid=pa_id left ");
-            sql.Append("join product on pr_code=pa_prodcode where pa_outboxcode ='" + palletcode.Text + "' and pa_type=3");
+            sql.Append("join product on pr_code=pa_prodcode where pa_outboxcode ='" + palletcode.Text + "' and pa_type=2");
             dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            if (dt.Rows.Count > 0)
-            {
-                BaseUtil.FillDgvWithDataTable(PackageInf, dt);
-                pr_code = dt.Rows[0]["pa_prodcode"].ToString();
-                return true;
-            }
-            return false;
+            BaseUtil.FillDgvWithDataTable(PackageInf, dt);
         }
 
         private void FillPrintLabel()
@@ -180,7 +176,10 @@ namespace UAS_MES.Make
             }
         }
 
-
+        private void LoadCollectNum()
+        {
+            pa_totalqty.Text = dh.getFieldDataByCondition("package", "pa_totalqty", "pa_outboxcode='" + outboxcode.Text + "' and pa_type=2").ToString();
+        }
 
         private void 栈板称重_SizeChanged(object sender, EventArgs e)
         {
@@ -189,14 +188,17 @@ namespace UAS_MES.Make
 
         private void NewPallet_Click(object sender, EventArgs e)
         {
-            Make_NewPallet NewPallet = new Make_NewPallet("PALLET", pa_makecode.Text);
+            Make_NewPallet NewPallet = new Make_NewPallet("PACKAGE", pa_makecode.Text);
             BaseUtil.SetFormCenter(NewPallet);
             NewPallet.ShowDialog();
         }
 
         private void Print_Click(object sender, EventArgs e)
         {
-            Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+            if (PrintLabel.Items.Count != 0)
+                Print.CodeSoft(lbl, PrintLabel.Text.Split(':')[1], PrintLabel.SelectedValue.ToString(), PrinterList.Text, pa_outboxcode.Text, int.Parse(PrintNum.Text), indate[PrintLabel.SelectedIndex]);
+            else
+                OperateResult.AppendText(">>产品" + pa_prodcode.Text + "未维护打印标签\n", Color.Red);
         }
 
         private void ReleasePallet_Click(object sender, EventArgs e)

UAS-MES/FunctionCode/Make/Make_PalletCollection.resx

@@ -788,4 +788,19 @@
   <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="pd_outboxcode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pd_innerqty.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="Column5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>