自动新增箱号，箱号规格选择

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

@@ -171,6 +171,30 @@ namespace UAS_LabelMachine
             {
                 dgv.SortMode = DataGridViewColumnSortMode.NotSortable;
             }
+
+            DataTable size = new DataTable();
+            size.Columns.Add("size_name");
+            size.Columns.Add("size_value");
+            DataRow dr = size.NewRow(); dr[0] = "大箱"; dr[1] = "38.3*38.3*20CM";
+            DataRow dr1 = size.NewRow(); dr1[0] = "中箱"; dr1[1] = "28.3*19*20CM";
+            DataRow dr2 = size.NewRow(); dr2[0] = "小盒"; dr2[1] = "19*19*6.5CM";
+            DataRow dr3 = size.NewRow(); dr3[0] = "小白盒07"; dr3[1] = "19*19*9CM";
+            DataRow dr4 = size.NewRow(); dr4[0] = "三星盒10"; dr4[1] = "18*12*18.3CM";
+            DataRow dr5 = size.NewRow(); dr5[0] = "国巨40"; dr5[1] = "39*30*21CM";
+            DataRow dr6 = size.NewRow(); dr6[0] = "国巨25"; dr6[1] = "32*20*21CM";
+            DataRow dr7 = size.NewRow(); dr7[0] = "国巨14"; dr7[1] = "19.5*16*20CM";
+
+            size.Rows.Add(dr);
+            size.Rows.Add(dr1);
+            size.Rows.Add(dr2);
+            size.Rows.Add(dr3);
+            size.Rows.Add(dr4);
+            size.Rows.Add(dr5);
+            size.Rows.Add(dr6);
+            size.Rows.Add(dr7);
+            pib_size.DataSource = size;
+            pib_size.DisplayMember = "size_name";
+            pib_size.ValueMember = "size_value";
             int ScreenWidth = Screen.GetWorkingArea(pt).Width;
             //设置获取当前屏幕大小自动全屏但是保留任务栏
             Rectangle ScreenArea = Screen.GetWorkingArea(this);
@@ -476,6 +500,10 @@ namespace UAS_LabelMachine
             }
             else
             {
+                if (BoxNum + CodeCount > OutboxCapacity.Value && AutoSetOutBox.Checked)
+                {
+                    OutBoxNum.Text = "新增";
+                }
                 if (OutBoxNum.Text == "新增")
                 {
                     string maxoutbox = dh.getFieldDataByCondition("prodiobarcode", "max(to_number(pib_outboxcode2))", "pib_inoutno='" + pi_inoutno.Text + "'").ToString();
@@ -495,7 +523,7 @@ namespace UAS_LabelMachine
                 }
                 if (!AutoPrintOutBox.Checked)
                 {
-                    if (BoxNum + CodeCount > OutboxCapacity.Value)
+                    if (BoxNum + CodeCount > OutboxCapacity.Value&&!AutoSetOutBox.Checked)
                     {
                         string close = MessageBox.Show(this.ParentForm, "箱号【" + OutBoxNum.Text + "】后超数量为" + (BoxNum + CodeCount) + ",超出容量" + OutboxCapacity.Value + "，是否继续？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                         if (close != "Yes")
@@ -686,7 +714,7 @@ namespace UAS_LabelMachine
             {
                 if (BoxNum + CodeCount >= OutboxCapacity.Value)
                 {
-                    OutBoxLabelPrint.PerformClick();
+                     OutBoxLabelPrint.PerformClick();
                 }
             }
             GridPrcode.Refresh();
@@ -1485,7 +1513,7 @@ namespace UAS_LabelMachine
                 {
                     //记录整箱的重量
                     sql.Clear();
-                    sql.Append("update prodiobarcode set pib_totalweight='" + Weight.Text + "' where pib_inoutno='" + pi_inoutno.Text + "' ");
+                    sql.Append("update prodiobarcode set pib_totalweight='" + Weight.Text + "',pib_size='" + pib_size.SelectedValue + "' where pib_inoutno='" + pi_inoutno.Text + "' ");
                     sql.Append(" and pib_outboxcode2='" + OutBoxNum.Text + "'");
                     dh.ExecuteSql(sql.ToString(), "update");
                 }