修改。

BWP.WinFormControl/BWP.WinFormControl.csproj

@@ -56,6 +56,9 @@
     <Compile Include="ComboBoxHelper.cs" />
     <Compile Include="ComponentUtil.cs" />
     <Compile Include="PrintAPI.cs" />
+    <Compile Include="UButton.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="UComboBox2.cs">
       <SubType>Component</SubType>
     </Compile>

BWP.WinFormControl/UButton.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace BWP.WinFormControl
+{
+  public class UButton : Button
+  {
+    protected override void OnClick(EventArgs e)
+    {
+      this.BackColor = Color.Aqua;
+      this.Refresh();
+      try
+      {
+        base.OnClick(e);
+      }
+      finally
+      {
+        System.Threading.Thread.Sleep(200);
+        this.BackColor = SystemColors.Control;
+        this.Refresh();
+      }
+    }
+  }
+}

ButcherWeight/WeightForm.Designer.cs

@@ -30,27 +30,27 @@
     private void InitializeComponent()
     {
       this.components = new System.ComponentModel.Container();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
       this.panel1 = new System.Windows.Forms.Panel();
       this.enableCheckBox = new System.Windows.Forms.CheckBox();
       this.weightSet = new System.Windows.Forms.Button();
@@ -174,6 +174,8 @@
       this.viewDetailBtn = new System.Windows.Forms.Button();
       this.uDatePicker1 = new BWP.WinFormControl.UDatePicker();
       this.label26 = new System.Windows.Forms.Label();
+      this.totalNumLbl = new System.Windows.Forms.Label();
+      this.label32 = new System.Windows.Forms.Label();
       this.panel1.SuspendLayout();
       this.panel2.SuspendLayout();
       this.panel3.SuspendLayout();
@@ -881,17 +883,17 @@
       this.farmerGrid.AllowUserToDeleteRows = false;
       this.farmerGrid.AllowUserToResizeColumns = false;
       this.farmerGrid.AllowUserToResizeRows = false;
-      dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.farmerGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+      dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.farmerGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle22;
       this.farmerGrid.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.farmerGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+      dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle23.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.farmerGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle23;
       this.farmerGrid.ColumnHeadersHeight = 24;
       this.farmerGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
       this.farmerGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -906,9 +908,9 @@
       this.farmerGrid.MultiSelect = false;
       this.farmerGrid.Name = "farmerGrid";
       this.farmerGrid.RowHeadersVisible = false;
-      dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.farmerGrid.RowsDefaultCellStyle = dataGridViewCellStyle4;
+      dataGridViewCellStyle25.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle25.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.farmerGrid.RowsDefaultCellStyle = dataGridViewCellStyle25;
       this.farmerGrid.RowTemplate.Height = 23;
       this.farmerGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
       this.farmerGrid.Size = new System.Drawing.Size(400, 68);
@@ -962,8 +964,8 @@
       // F_Weight
       // 
       this.F_Weight.DataPropertyName = "Weight";
-      dataGridViewCellStyle3.Format = "#0.######";
-      this.F_Weight.DefaultCellStyle = dataGridViewCellStyle3;
+      dataGridViewCellStyle24.Format = "#0.######";
+      this.F_Weight.DefaultCellStyle = dataGridViewCellStyle24;
       this.F_Weight.HeaderText = "重量";
       this.F_Weight.Name = "F_Weight";
       // 
@@ -994,17 +996,17 @@
       this.weightGrid.AllowUserToDeleteRows = false;
       this.weightGrid.AllowUserToResizeColumns = false;
       this.weightGrid.AllowUserToResizeRows = false;
-      dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.weightGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+      dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.weightGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle26;
       this.weightGrid.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.weightGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+      dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle27.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.weightGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27;
       this.weightGrid.ColumnHeadersHeight = 24;
       this.weightGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
       this.weightGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1019,9 +1021,9 @@
       this.weightGrid.MultiSelect = false;
       this.weightGrid.Name = "weightGrid";
       this.weightGrid.RowHeadersVisible = false;
-      dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.weightGrid.RowsDefaultCellStyle = dataGridViewCellStyle10;
+      dataGridViewCellStyle31.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle31.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.weightGrid.RowsDefaultCellStyle = dataGridViewCellStyle31;
       this.weightGrid.RowTemplate.Height = 23;
       this.weightGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
       this.weightGrid.Size = new System.Drawing.Size(400, 90);
@@ -1059,8 +1061,8 @@
       // D_MaoWeight
       // 
       this.D_MaoWeight.DataPropertyName = "MaoWeight";
-      dataGridViewCellStyle7.Format = "#0.######";
-      this.D_MaoWeight.DefaultCellStyle = dataGridViewCellStyle7;
+      dataGridViewCellStyle28.Format = "#0.######";
+      this.D_MaoWeight.DefaultCellStyle = dataGridViewCellStyle28;
       this.D_MaoWeight.HeaderText = "毛重";
       this.D_MaoWeight.Name = "D_MaoWeight";
       this.D_MaoWeight.ReadOnly = true;
@@ -1069,8 +1071,8 @@
       // D_PiWeight
       // 
       this.D_PiWeight.DataPropertyName = "PiWeight";
-      dataGridViewCellStyle8.Format = "#0.######";
-      this.D_PiWeight.DefaultCellStyle = dataGridViewCellStyle8;
+      dataGridViewCellStyle29.Format = "#0.######";
+      this.D_PiWeight.DefaultCellStyle = dataGridViewCellStyle29;
       this.D_PiWeight.HeaderText = "皮重";
       this.D_PiWeight.Name = "D_PiWeight";
       this.D_PiWeight.ReadOnly = true;
@@ -1079,8 +1081,8 @@
       // D_Weight
       // 
       this.D_Weight.DataPropertyName = "Weight";
-      dataGridViewCellStyle9.Format = "#0.######";
-      this.D_Weight.DefaultCellStyle = dataGridViewCellStyle9;
+      dataGridViewCellStyle30.Format = "#0.######";
+      this.D_Weight.DefaultCellStyle = dataGridViewCellStyle30;
       this.D_Weight.HeaderText = "重量";
       this.D_Weight.Name = "D_Weight";
       this.D_Weight.ReadOnly = true;
@@ -1101,17 +1103,17 @@
       this.houseGird.AllowUserToDeleteRows = false;
       this.houseGird.AllowUserToResizeColumns = false;
       this.houseGird.AllowUserToResizeRows = false;
-      dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.houseGird.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+      dataGridViewCellStyle32.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.houseGird.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle32;
       this.houseGird.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.houseGird.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+      dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle33.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle33.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle33.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle33.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle33.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.houseGird.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle33;
       this.houseGird.ColumnHeadersHeight = 24;
       this.houseGird.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
       this.houseGird.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1125,9 +1127,9 @@
       this.houseGird.MultiSelect = false;
       this.houseGird.Name = "houseGird";
       this.houseGird.RowHeadersVisible = false;
-      dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.houseGird.RowsDefaultCellStyle = dataGridViewCellStyle13;
+      dataGridViewCellStyle34.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle34.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.houseGird.RowsDefaultCellStyle = dataGridViewCellStyle34;
       this.houseGird.RowTemplate.Height = 23;
       this.houseGird.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
       this.houseGird.Size = new System.Drawing.Size(400, 90);
@@ -1183,17 +1185,17 @@
       this.abnormalGrid.AllowUserToDeleteRows = false;
       this.abnormalGrid.AllowUserToResizeColumns = false;
       this.abnormalGrid.AllowUserToResizeRows = false;
-      dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.abnormalGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
+      dataGridViewCellStyle35.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.abnormalGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35;
       this.abnormalGrid.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.abnormalGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
+      dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.abnormalGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36;
       this.abnormalGrid.ColumnHeadersHeight = 24;
       this.abnormalGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
       this.abnormalGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1208,9 +1210,9 @@
       this.abnormalGrid.MultiSelect = false;
       this.abnormalGrid.Name = "abnormalGrid";
       this.abnormalGrid.RowHeadersVisible = false;
-      dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.abnormalGrid.RowsDefaultCellStyle = dataGridViewCellStyle16;
+      dataGridViewCellStyle37.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle37.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.abnormalGrid.RowsDefaultCellStyle = dataGridViewCellStyle37;
       this.abnormalGrid.RowTemplate.Height = 23;
       this.abnormalGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
       this.abnormalGrid.Size = new System.Drawing.Size(400, 194);
@@ -1272,17 +1274,17 @@
       this.billGrid.AllowUserToDeleteRows = false;
       this.billGrid.AllowUserToResizeColumns = false;
       this.billGrid.AllowUserToResizeRows = false;
-      dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.billGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle17;
+      dataGridViewCellStyle38.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.billGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle38;
       this.billGrid.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.billGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;
+      dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle39.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle39.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.billGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle39;
       this.billGrid.ColumnHeadersHeight = 24;
       this.billGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
       this.billGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@@ -1304,9 +1306,9 @@
       this.billGrid.Name = "billGrid";
       this.billGrid.ReadOnly = true;
       this.billGrid.RowHeadersVisible = false;
-      dataGridViewCellStyle21.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.billGrid.RowsDefaultCellStyle = dataGridViewCellStyle21;
+      dataGridViewCellStyle42.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle42.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.billGrid.RowsDefaultCellStyle = dataGridViewCellStyle42;
       this.billGrid.RowTemplate.Height = 23;
       this.billGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
       this.billGrid.Size = new System.Drawing.Size(1250, 230);
@@ -1387,8 +1389,8 @@
       // M_Weight
       // 
       this.M_Weight.DataPropertyName = "Weight";
-      dataGridViewCellStyle19.Format = "#0.######";
-      this.M_Weight.DefaultCellStyle = dataGridViewCellStyle19;
+      dataGridViewCellStyle40.Format = "#0.######";
+      this.M_Weight.DefaultCellStyle = dataGridViewCellStyle40;
       this.M_Weight.HeaderText = "收购重量";
       this.M_Weight.Name = "M_Weight";
       this.M_Weight.ReadOnly = true;
@@ -1405,8 +1407,8 @@
       // M_SanctionMoney
       // 
       this.M_SanctionMoney.DataPropertyName = "SanctionMoney";
-      dataGridViewCellStyle20.Format = "#0.######";
-      this.M_SanctionMoney.DefaultCellStyle = dataGridViewCellStyle20;
+      dataGridViewCellStyle41.Format = "#0.######";
+      this.M_SanctionMoney.DefaultCellStyle = dataGridViewCellStyle41;
       this.M_SanctionMoney.HeaderText = "异常明细";
       this.M_SanctionMoney.Name = "M_SanctionMoney";
       this.M_SanctionMoney.ReadOnly = true;
@@ -1578,11 +1580,34 @@
       this.label26.TabIndex = 45;
       this.label26.Text = "宰杀日期：";
       // 
+      // totalNumLbl
+      // 
+      this.totalNumLbl.AutoSize = true;
+      this.totalNumLbl.Font = new System.Drawing.Font("宋体", 17F);
+      this.totalNumLbl.ForeColor = System.Drawing.Color.Red;
+      this.totalNumLbl.Location = new System.Drawing.Point(882, 566);
+      this.totalNumLbl.Name = "totalNumLbl";
+      this.totalNumLbl.Size = new System.Drawing.Size(22, 23);
+      this.totalNumLbl.TabIndex = 52;
+      this.totalNumLbl.Text = "0";
+      // 
+      // label32
+      // 
+      this.label32.AutoSize = true;
+      this.label32.Font = new System.Drawing.Font("宋体", 14F);
+      this.label32.Location = new System.Drawing.Point(810, 566);
+      this.label32.Name = "label32";
+      this.label32.Size = new System.Drawing.Size(66, 19);
+      this.label32.TabIndex = 51;
+      this.label32.Text = "合计：";
+      // 
       // WeightForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.ClientSize = new System.Drawing.Size(1276, 831);
+      this.Controls.Add(this.totalNumLbl);
+      this.Controls.Add(this.label32);
       this.Controls.Add(this.uDatePicker1);
       this.Controls.Add(this.label26);
       this.Controls.Add(this.viewDetailBtn);
@@ -1752,5 +1777,7 @@
     private System.Windows.Forms.Label yzhTel;
     private System.Windows.Forms.Label yzhName;
     private System.Windows.Forms.Label yzhIDCard;
+    private System.Windows.Forms.Label totalNumLbl;
+    private System.Windows.Forms.Label label32;
   }
 }

ButcherWeight/WeightForm.cs

@@ -142,6 +142,7 @@ namespace ButcherWeight
         if ((int)row.Cells["M_PrintNumber"].Value > 0)
           row.DefaultCellStyle.BackColor = ColorTranslator.FromHtml("#CC9999");
       }
+      totalNumLbl.Text = dmoList.Sum(x => x.Number ?? 0).ToString();
       billGrid.Refresh();
     }
 

MaterialRequisition/MaterialRequisitionForm.Designer.cs

@@ -28,37 +28,21 @@
     /// </summary>
     private void InitializeComponent()
     {
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.groupBox2 = new System.Windows.Forms.GroupBox();
-      this.dataGridViewSubmited = new BWP.WinFormControl.UDataGridView();
-      this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.LossWeightColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
-      this.dataGridViewUnSubmit = new BWP.WinFormControl.UDataGridView();
-      this.U_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.un条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.un编码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.un名称 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.un重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.un单位 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.un数量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.btnCommit = new System.Windows.Forms.Button();
-      this.btnDelete = new System.Windows.Forms.Button();
+      this.readBtn = new BWP.WinFormControl.UButton();
+      this.btnCommit = new BWP.WinFormControl.UButton();
+      this.btnDelete = new BWP.WinFormControl.UButton();
       this.panel1 = new System.Windows.Forms.Panel();
       this.btnEnableWeight = new System.Windows.Forms.Button();
       this.picNetStatus = new System.Windows.Forms.PictureBox();
@@ -85,20 +69,36 @@
       this.label2 = new System.Windows.Forms.Label();
       this.textBox1 = new System.Windows.Forms.TextBox();
       this.label1 = new System.Windows.Forms.Label();
-      this.readBtn = new System.Windows.Forms.Button();
+      this.dataGridViewSubmited = new BWP.WinFormControl.UDataGridView();
+      this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.LossWeightColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.dataGridViewUnSubmit = new BWP.WinFormControl.UDataGridView();
+      this.U_ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.un条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.un编码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.un名称 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.un重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.un单位 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.un数量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
       this.splitContainer1.SuspendLayout();
       this.groupBox2.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewSubmited)).BeginInit();
       this.groupBox1.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewUnSubmit)).BeginInit();
       this.panel1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.picNetStatus)).BeginInit();
       this.panel3.SuspendLayout();
       this.panel2.SuspendLayout();
       this.panel4.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewSubmited)).BeginInit();
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewUnSubmit)).BeginInit();
       this.SuspendLayout();
       // 
       // splitContainer1
@@ -136,113 +136,6 @@
       this.groupBox2.TabStop = false;
       this.groupBox2.Text = "历史领料";
       // 
-      // dataGridViewSubmited
-      // 
-      this.dataGridViewSubmited.AllowUserToAddRows = false;
-      this.dataGridViewSubmited.AllowUserToDeleteRows = false;
-      this.dataGridViewSubmited.AllowUserToResizeColumns = false;
-      this.dataGridViewSubmited.AllowUserToResizeRows = false;
-      dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.dataGridViewSubmited.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
-      this.dataGridViewSubmited.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.dataGridViewSubmited.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.dataGridViewSubmited.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
-      this.dataGridViewSubmited.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-      this.dataGridViewSubmited.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3,
-            this.dataGridViewTextBoxColumn4,
-            this.dataGridViewTextBoxColumn5,
-            this.LossWeightColumn,
-            this.dataGridViewTextBoxColumn6,
-            this.dataGridViewTextBoxColumn7});
-      this.dataGridViewSubmited.Location = new System.Drawing.Point(6, 21);
-      this.dataGridViewSubmited.MultiSelect = false;
-      this.dataGridViewSubmited.Name = "dataGridViewSubmited";
-      this.dataGridViewSubmited.ReadOnly = true;
-      this.dataGridViewSubmited.RowHeadersVisible = false;
-      dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.dataGridViewSubmited.RowsDefaultCellStyle = dataGridViewCellStyle18;
-      this.dataGridViewSubmited.RowTemplate.Height = 23;
-      this.dataGridViewSubmited.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.dataGridViewSubmited.Size = new System.Drawing.Size(761, 177);
-      this.dataGridViewSubmited.TabIndex = 2;
-      // 
-      // dataGridViewTextBoxColumn1
-      // 
-      this.dataGridViewTextBoxColumn1.DataPropertyName = "ID";
-      this.dataGridViewTextBoxColumn1.HeaderText = "序号";
-      this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-      this.dataGridViewTextBoxColumn1.ReadOnly = true;
-      this.dataGridViewTextBoxColumn1.Width = 80;
-      // 
-      // dataGridViewTextBoxColumn2
-      // 
-      this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-      this.dataGridViewTextBoxColumn2.DataPropertyName = "BarCode";
-      this.dataGridViewTextBoxColumn2.HeaderText = "条码";
-      this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-      this.dataGridViewTextBoxColumn2.ReadOnly = true;
-      this.dataGridViewTextBoxColumn2.Width = 65;
-      // 
-      // dataGridViewTextBoxColumn3
-      // 
-      this.dataGridViewTextBoxColumn3.DataPropertyName = "Goods_Code";
-      this.dataGridViewTextBoxColumn3.HeaderText = "编码";
-      this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-      this.dataGridViewTextBoxColumn3.ReadOnly = true;
-      // 
-      // dataGridViewTextBoxColumn4
-      // 
-      this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-      this.dataGridViewTextBoxColumn4.DataPropertyName = "Goods_Name";
-      this.dataGridViewTextBoxColumn4.HeaderText = "名称";
-      this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-      this.dataGridViewTextBoxColumn4.ReadOnly = true;
-      this.dataGridViewTextBoxColumn4.Width = 65;
-      // 
-      // dataGridViewTextBoxColumn5
-      // 
-      this.dataGridViewTextBoxColumn5.DataPropertyName = "Weight";
-      dataGridViewCellStyle16.Format = "#0.######";
-      this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle16;
-      this.dataGridViewTextBoxColumn5.HeaderText = "重量";
-      this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-      this.dataGridViewTextBoxColumn5.ReadOnly = true;
-      // 
-      // LossWeightColumn
-      // 
-      this.LossWeightColumn.DataPropertyName = "LossWeight";
-      dataGridViewCellStyle17.Format = "#0.######";
-      this.LossWeightColumn.DefaultCellStyle = dataGridViewCellStyle17;
-      this.LossWeightColumn.HeaderText = "损耗";
-      this.LossWeightColumn.Name = "LossWeightColumn";
-      this.LossWeightColumn.ReadOnly = true;
-      // 
-      // dataGridViewTextBoxColumn6
-      // 
-      this.dataGridViewTextBoxColumn6.DataPropertyName = "Goods_MainUnit";
-      this.dataGridViewTextBoxColumn6.HeaderText = "单位";
-      this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-      this.dataGridViewTextBoxColumn6.ReadOnly = true;
-      // 
-      // dataGridViewTextBoxColumn7
-      // 
-      this.dataGridViewTextBoxColumn7.DataPropertyName = "Number";
-      this.dataGridViewTextBoxColumn7.HeaderText = "数量";
-      this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-      this.dataGridViewTextBoxColumn7.ReadOnly = true;
-      // 
       // groupBox1
       // 
       this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -259,110 +152,23 @@
       this.groupBox1.TabStop = false;
       this.groupBox1.Text = "领料明细";
       // 
-      // dataGridViewUnSubmit
-      // 
-      this.dataGridViewUnSubmit.AllowUserToAddRows = false;
-      this.dataGridViewUnSubmit.AllowUserToDeleteRows = false;
-      this.dataGridViewUnSubmit.AllowUserToResizeColumns = false;
-      this.dataGridViewUnSubmit.AllowUserToResizeRows = false;
-      dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.dataGridViewUnSubmit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
-      this.dataGridViewUnSubmit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.dataGridViewUnSubmit.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.dataGridViewUnSubmit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
-      this.dataGridViewUnSubmit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-      this.dataGridViewUnSubmit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.U_ID,
-            this.un条码,
-            this.un编码,
-            this.un名称,
-            this.un重量,
-            this.un单位,
-            this.un数量});
-      this.dataGridViewUnSubmit.Location = new System.Drawing.Point(6, 63);
-      this.dataGridViewUnSubmit.MultiSelect = false;
-      this.dataGridViewUnSubmit.Name = "dataGridViewUnSubmit";
-      this.dataGridViewUnSubmit.ReadOnly = true;
-      this.dataGridViewUnSubmit.RowHeadersVisible = false;
-      dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.dataGridViewUnSubmit.RowsDefaultCellStyle = dataGridViewCellStyle13;
-      this.dataGridViewUnSubmit.RowTemplate.Height = 23;
-      this.dataGridViewUnSubmit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.dataGridViewUnSubmit.Size = new System.Drawing.Size(761, 189);
-      this.dataGridViewUnSubmit.TabIndex = 1;
-      // 
-      // U_ID
-      // 
-      this.U_ID.DataPropertyName = "ID";
-      this.U_ID.HeaderText = "序号";
-      this.U_ID.Name = "U_ID";
-      this.U_ID.ReadOnly = true;
-      this.U_ID.Width = 80;
-      // 
-      // un条码
-      // 
-      this.un条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-      this.un条码.DataPropertyName = "BarCode";
-      this.un条码.HeaderText = "条码";
-      this.un条码.Name = "un条码";
-      this.un条码.ReadOnly = true;
-      this.un条码.Width = 65;
-      // 
-      // un编码
-      // 
-      this.un编码.DataPropertyName = "Goods_Code";
-      this.un编码.HeaderText = "编码";
-      this.un编码.Name = "un编码";
-      this.un编码.ReadOnly = true;
-      // 
-      // un名称
-      // 
-      this.un名称.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-      this.un名称.DataPropertyName = "Goods_Name";
-      this.un名称.HeaderText = "名称";
-      this.un名称.Name = "un名称";
-      this.un名称.ReadOnly = true;
-      this.un名称.Width = 65;
-      // 
-      // un重量
-      // 
-      this.un重量.DataPropertyName = "Weight";
-      dataGridViewCellStyle12.Format = "#0.######";
-      this.un重量.DefaultCellStyle = dataGridViewCellStyle12;
-      this.un重量.HeaderText = "重量";
-      this.un重量.Name = "un重量";
-      this.un重量.ReadOnly = true;
-      // 
-      // un单位
-      // 
-      this.un单位.DataPropertyName = "Goods_MainUnit";
-      this.un单位.HeaderText = "单位";
-      this.un单位.Name = "un单位";
-      this.un单位.ReadOnly = true;
-      // 
-      // un数量
+      // readBtn
       // 
-      this.un数量.DataPropertyName = "Number";
-      this.un数量.HeaderText = "数量";
-      this.un数量.Name = "un数量";
-      this.un数量.ReadOnly = true;
+      this.readBtn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.readBtn.Location = new System.Drawing.Point(243, 14);
+      this.readBtn.Name = "readBtn";
+      this.readBtn.Size = new System.Drawing.Size(75, 45);
+      this.readBtn.TabIndex = 2;
+      this.readBtn.Text = "读入";
+      this.readBtn.UseVisualStyleBackColor = true;
+      this.readBtn.Click += new System.EventHandler(this.readBtn_Click);
       // 
       // btnCommit
       // 
       this.btnCommit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.btnCommit.Location = new System.Drawing.Point(6, 21);
+      this.btnCommit.Location = new System.Drawing.Point(6, 14);
       this.btnCommit.Name = "btnCommit";
-      this.btnCommit.Size = new System.Drawing.Size(75, 35);
+      this.btnCommit.Size = new System.Drawing.Size(75, 45);
       this.btnCommit.TabIndex = 0;
       this.btnCommit.Text = "提交";
       this.btnCommit.UseVisualStyleBackColor = true;
@@ -371,9 +177,9 @@
       // btnDelete
       // 
       this.btnDelete.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.btnDelete.Location = new System.Drawing.Point(124, 21);
+      this.btnDelete.Location = new System.Drawing.Point(124, 14);
       this.btnDelete.Name = "btnDelete";
-      this.btnDelete.Size = new System.Drawing.Size(75, 35);
+      this.btnDelete.Size = new System.Drawing.Size(75, 45);
       this.btnDelete.TabIndex = 0;
       this.btnDelete.Text = "删除";
       this.btnDelete.UseVisualStyleBackColor = true;
@@ -646,16 +452,210 @@
       this.label1.TabIndex = 0;
       this.label1.Text = "条码";
       // 
-      // readBtn
+      // dataGridViewSubmited
       // 
-      this.readBtn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.readBtn.Location = new System.Drawing.Point(243, 21);
-      this.readBtn.Name = "readBtn";
-      this.readBtn.Size = new System.Drawing.Size(75, 35);
-      this.readBtn.TabIndex = 2;
-      this.readBtn.Text = "读入";
-      this.readBtn.UseVisualStyleBackColor = true;
-      this.readBtn.Click += new System.EventHandler(this.readBtn_Click);
+      this.dataGridViewSubmited.AllowUserToAddRows = false;
+      this.dataGridViewSubmited.AllowUserToDeleteRows = false;
+      this.dataGridViewSubmited.AllowUserToResizeColumns = false;
+      this.dataGridViewSubmited.AllowUserToResizeRows = false;
+      dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.dataGridViewSubmited.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+      this.dataGridViewSubmited.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataGridViewSubmited.BackgroundColor = System.Drawing.Color.White;
+      dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.dataGridViewSubmited.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+      this.dataGridViewSubmited.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      this.dataGridViewSubmited.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn4,
+            this.dataGridViewTextBoxColumn5,
+            this.LossWeightColumn,
+            this.dataGridViewTextBoxColumn6,
+            this.dataGridViewTextBoxColumn7});
+      this.dataGridViewSubmited.Location = new System.Drawing.Point(6, 21);
+      this.dataGridViewSubmited.MultiSelect = false;
+      this.dataGridViewSubmited.Name = "dataGridViewSubmited";
+      this.dataGridViewSubmited.ReadOnly = true;
+      this.dataGridViewSubmited.RowHeadersVisible = false;
+      dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.dataGridViewSubmited.RowsDefaultCellStyle = dataGridViewCellStyle5;
+      this.dataGridViewSubmited.RowTemplate.Height = 23;
+      this.dataGridViewSubmited.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+      this.dataGridViewSubmited.Size = new System.Drawing.Size(761, 177);
+      this.dataGridViewSubmited.TabIndex = 2;
+      // 
+      // dataGridViewTextBoxColumn1
+      // 
+      this.dataGridViewTextBoxColumn1.DataPropertyName = "ID";
+      this.dataGridViewTextBoxColumn1.HeaderText = "序号";
+      this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+      this.dataGridViewTextBoxColumn1.ReadOnly = true;
+      this.dataGridViewTextBoxColumn1.Width = 80;
+      // 
+      // dataGridViewTextBoxColumn2
+      // 
+      this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.dataGridViewTextBoxColumn2.DataPropertyName = "BarCode";
+      this.dataGridViewTextBoxColumn2.HeaderText = "条码";
+      this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+      this.dataGridViewTextBoxColumn2.ReadOnly = true;
+      this.dataGridViewTextBoxColumn2.Width = 65;
+      // 
+      // dataGridViewTextBoxColumn3
+      // 
+      this.dataGridViewTextBoxColumn3.DataPropertyName = "Goods_Code";
+      this.dataGridViewTextBoxColumn3.HeaderText = "编码";
+      this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+      this.dataGridViewTextBoxColumn3.ReadOnly = true;
+      // 
+      // dataGridViewTextBoxColumn4
+      // 
+      this.dataGridViewTextBoxColumn4.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.dataGridViewTextBoxColumn4.DataPropertyName = "Goods_Name";
+      this.dataGridViewTextBoxColumn4.HeaderText = "名称";
+      this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+      this.dataGridViewTextBoxColumn4.ReadOnly = true;
+      this.dataGridViewTextBoxColumn4.Width = 65;
+      // 
+      // dataGridViewTextBoxColumn5
+      // 
+      this.dataGridViewTextBoxColumn5.DataPropertyName = "Weight";
+      dataGridViewCellStyle3.Format = "#0.######";
+      this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle3;
+      this.dataGridViewTextBoxColumn5.HeaderText = "重量";
+      this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+      this.dataGridViewTextBoxColumn5.ReadOnly = true;
+      // 
+      // LossWeightColumn
+      // 
+      this.LossWeightColumn.DataPropertyName = "LossWeight";
+      dataGridViewCellStyle4.Format = "#0.######";
+      this.LossWeightColumn.DefaultCellStyle = dataGridViewCellStyle4;
+      this.LossWeightColumn.HeaderText = "损耗";
+      this.LossWeightColumn.Name = "LossWeightColumn";
+      this.LossWeightColumn.ReadOnly = true;
+      // 
+      // dataGridViewTextBoxColumn6
+      // 
+      this.dataGridViewTextBoxColumn6.DataPropertyName = "Goods_MainUnit";
+      this.dataGridViewTextBoxColumn6.HeaderText = "单位";
+      this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+      this.dataGridViewTextBoxColumn6.ReadOnly = true;
+      // 
+      // dataGridViewTextBoxColumn7
+      // 
+      this.dataGridViewTextBoxColumn7.DataPropertyName = "Number";
+      this.dataGridViewTextBoxColumn7.HeaderText = "数量";
+      this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+      this.dataGridViewTextBoxColumn7.ReadOnly = true;
+      // 
+      // dataGridViewUnSubmit
+      // 
+      this.dataGridViewUnSubmit.AllowUserToAddRows = false;
+      this.dataGridViewUnSubmit.AllowUserToDeleteRows = false;
+      this.dataGridViewUnSubmit.AllowUserToResizeColumns = false;
+      this.dataGridViewUnSubmit.AllowUserToResizeRows = false;
+      dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.dataGridViewUnSubmit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+      this.dataGridViewUnSubmit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataGridViewUnSubmit.BackgroundColor = System.Drawing.Color.White;
+      dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.dataGridViewUnSubmit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+      this.dataGridViewUnSubmit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      this.dataGridViewUnSubmit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.U_ID,
+            this.un条码,
+            this.un编码,
+            this.un名称,
+            this.un重量,
+            this.un单位,
+            this.un数量});
+      this.dataGridViewUnSubmit.Location = new System.Drawing.Point(6, 63);
+      this.dataGridViewUnSubmit.MultiSelect = false;
+      this.dataGridViewUnSubmit.Name = "dataGridViewUnSubmit";
+      this.dataGridViewUnSubmit.ReadOnly = true;
+      this.dataGridViewUnSubmit.RowHeadersVisible = false;
+      dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.dataGridViewUnSubmit.RowsDefaultCellStyle = dataGridViewCellStyle9;
+      this.dataGridViewUnSubmit.RowTemplate.Height = 23;
+      this.dataGridViewUnSubmit.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+      this.dataGridViewUnSubmit.Size = new System.Drawing.Size(761, 189);
+      this.dataGridViewUnSubmit.TabIndex = 1;
+      // 
+      // U_ID
+      // 
+      this.U_ID.DataPropertyName = "ID";
+      this.U_ID.HeaderText = "序号";
+      this.U_ID.Name = "U_ID";
+      this.U_ID.ReadOnly = true;
+      this.U_ID.Width = 80;
+      // 
+      // un条码
+      // 
+      this.un条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.un条码.DataPropertyName = "BarCode";
+      this.un条码.HeaderText = "条码";
+      this.un条码.Name = "un条码";
+      this.un条码.ReadOnly = true;
+      this.un条码.Width = 65;
+      // 
+      // un编码
+      // 
+      this.un编码.DataPropertyName = "Goods_Code";
+      this.un编码.HeaderText = "编码";
+      this.un编码.Name = "un编码";
+      this.un编码.ReadOnly = true;
+      // 
+      // un名称
+      // 
+      this.un名称.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.un名称.DataPropertyName = "Goods_Name";
+      this.un名称.HeaderText = "名称";
+      this.un名称.Name = "un名称";
+      this.un名称.ReadOnly = true;
+      this.un名称.Width = 65;
+      // 
+      // un重量
+      // 
+      this.un重量.DataPropertyName = "Weight";
+      dataGridViewCellStyle8.Format = "#0.######";
+      this.un重量.DefaultCellStyle = dataGridViewCellStyle8;
+      this.un重量.HeaderText = "重量";
+      this.un重量.Name = "un重量";
+      this.un重量.ReadOnly = true;
+      // 
+      // un单位
+      // 
+      this.un单位.DataPropertyName = "Goods_MainUnit";
+      this.un单位.HeaderText = "单位";
+      this.un单位.Name = "un单位";
+      this.un单位.ReadOnly = true;
+      // 
+      // un数量
+      // 
+      this.un数量.DataPropertyName = "Number";
+      this.un数量.HeaderText = "数量";
+      this.un数量.Name = "un数量";
+      this.un数量.ReadOnly = true;
       // 
       // MaterialRequisitionForm
       // 
@@ -675,9 +675,7 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
       this.splitContainer1.ResumeLayout(false);
       this.groupBox2.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewSubmited)).EndInit();
       this.groupBox1.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewUnSubmit)).EndInit();
       this.panel1.ResumeLayout(false);
       this.panel1.PerformLayout();
       ((System.ComponentModel.ISupportInitialize)(this.picNetStatus)).EndInit();
@@ -687,6 +685,8 @@
       this.panel2.PerformLayout();
       this.panel4.ResumeLayout(false);
       this.panel4.PerformLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewSubmited)).EndInit();
+      ((System.ComponentModel.ISupportInitialize)(this.dataGridViewUnSubmit)).EndInit();
       this.ResumeLayout(false);
 
     }
@@ -708,8 +708,8 @@
     private System.Windows.Forms.Label lblChengZhong;
     private System.Windows.Forms.Button btnWeightSet;
     private System.Windows.Forms.GroupBox groupBox1;
-    private System.Windows.Forms.Button btnDelete;
-    private System.Windows.Forms.Button btnCommit;
+    private BWP.WinFormControl.UButton btnDelete;
+    private BWP.WinFormControl.UButton btnCommit;
     private BWP.WinFormControl.UDataGridView dataGridViewUnSubmit;
     private System.Windows.Forms.GroupBox groupBox2;
     private BWP.WinFormControl.UDataGridView dataGridViewSubmited;
@@ -742,7 +742,7 @@
     private System.Windows.Forms.DataGridViewTextBoxColumn un重量;
     private System.Windows.Forms.DataGridViewTextBoxColumn un单位;
     private System.Windows.Forms.DataGridViewTextBoxColumn un数量;
-    private System.Windows.Forms.Button readBtn;
+    private BWP.WinFormControl.UButton readBtn;
   }
 }
 

MaterialRequisition/MaterialRequisitionForm.cs

@@ -340,12 +340,11 @@ namespace MaterialRequisition
 
     private Button CreateGoodsButton(MaterialRequisitionGoodsSet set)
     {
-      var btn = new Button();
+      var btn = new BWP.WinFormControl.UButton();
       btn.Text = set.Goods_Name;
       btn.Tag = set;
       btn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
       btn.Click += BtnGoods_Click;
-      btn.BackColor = SystemColors.Control;
       btn.Width = 140;
       btn.Height = 80;
       return btn;
@@ -363,6 +362,7 @@ namespace MaterialRequisition
       var tag = btn.Tag as MaterialRequisitionGoodsSet;
       var record = new MaterialRequisitionRecord();
       record.Goods_ID = tag.Goods_ID;
+      record.Weight = null;
       InsertToServer(record);
     }
 
@@ -569,14 +569,21 @@ namespace MaterialRequisition
       {
         //称重
         //找到称重为空条码不为空的
-        var all = unSubmitList.Where(x => x.Weight == null);
-        if (all.Any())
+        var arr = new List<MaterialRequisitionRecord>();
+        foreach (var item in unSubmitList)
+        {
+          if (item.Weight != null)
+            break;
+          arr.Add(item);
+        }
+
+        if (arr.Any())
         {
-          var id = unSubmitList.Last().ID;
-          var ids = unSubmitList.Select(x => x.ID).ToList().Remove(id);
+          var id = arr.First().ID;
+          var ids = arr.Where(x => x.ID != id).Select(x => x.ID).ToList();
 
           RpcFacade.Call<int>(BaseRpcUrl + "FillWeight", id, weight, ids);
-          foreach (var item in all)
+          foreach (var item in arr)
           {
             if (item.ID == id)
               item.Weight = weight;

MaterialRequisition/MaterialRequisitionForm.resx

@@ -117,49 +117,49 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="U_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="un条码.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="un编码.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="un名称.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="un重量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="un单位.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="LossWeightColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="un数量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="U_ID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="un条码.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="un编码.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="un名称.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="LossWeightColumn.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="un重量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="un单位.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="un数量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
 </root>

TrunksIousOutInStore/TrunksIousOutInStoreForm.Designer.cs

@@ -28,16 +28,16 @@
     /// </summary>
     private void InitializeComponent()
     {
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
-      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle71 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle72 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle76 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle73 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle74 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle75 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle77 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle78 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle80 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle79 = new System.Windows.Forms.DataGridViewCellStyle();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.panel1 = new System.Windows.Forms.Panel();
       this.btnEnableWeight = new System.Windows.Forms.Button();
@@ -72,6 +72,9 @@
       this.uncheck产品名称 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.uncheck数量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.uncheck重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.flpGoods = new System.Windows.Forms.FlowLayoutPanel();
+      this.label2 = new System.Windows.Forms.Label();
+      this.textBox1 = new System.Windows.Forms.TextBox();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -82,6 +85,7 @@
       this.panel2.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
       this.splitContainer2.Panel1.SuspendLayout();
+      this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
       this.groupBox2.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.gridChecked)).BeginInit();
@@ -113,6 +117,8 @@
       // 
       this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel1.Controls.Add(this.textBox1);
+      this.panel1.Controls.Add(this.label2);
       this.panel1.Controls.Add(this.btnEnableWeight);
       this.panel1.Controls.Add(this.picNetStatus);
       this.panel1.Controls.Add(this.label10);
@@ -289,6 +295,10 @@
       // 
       this.splitContainer2.Panel1.Controls.Add(this.groupBox2);
       this.splitContainer2.Panel1.Controls.Add(this.groupBox1);
+      // 
+      // splitContainer2.Panel2
+      // 
+      this.splitContainer2.Panel2.Controls.Add(this.flpGoods);
       this.splitContainer2.Size = new System.Drawing.Size(1085, 445);
       this.splitContainer2.SplitterDistance = 763;
       this.splitContainer2.SplitterWidth = 1;
@@ -313,17 +323,17 @@
       this.gridChecked.AllowUserToDeleteRows = false;
       this.gridChecked.AllowUserToResizeColumns = false;
       this.gridChecked.AllowUserToResizeRows = false;
-      dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.gridChecked.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+      dataGridViewCellStyle71.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.gridChecked.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle71;
       this.gridChecked.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.gridChecked.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+      dataGridViewCellStyle72.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle72.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle72.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle72.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle72.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle72.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle72.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.gridChecked.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle72;
       this.gridChecked.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
       this.gridChecked.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.序号,
@@ -339,9 +349,9 @@
       this.gridChecked.Name = "gridChecked";
       this.gridChecked.ReadOnly = true;
       this.gridChecked.RowHeadersVisible = false;
-      dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.gridChecked.RowsDefaultCellStyle = dataGridViewCellStyle6;
+      dataGridViewCellStyle76.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle76.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.gridChecked.RowsDefaultCellStyle = dataGridViewCellStyle76;
       this.gridChecked.RowTemplate.Height = 23;
       this.gridChecked.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
       this.gridChecked.Size = new System.Drawing.Size(659, 157);
@@ -384,8 +394,8 @@
       // 入库重量
       // 
       this.入库重量.DataPropertyName = "Weight";
-      dataGridViewCellStyle3.Format = "#0.######";
-      this.入库重量.DefaultCellStyle = dataGridViewCellStyle3;
+      dataGridViewCellStyle73.Format = "#0.######";
+      this.入库重量.DefaultCellStyle = dataGridViewCellStyle73;
       this.入库重量.HeaderText = "入库重量";
       this.入库重量.Name = "入库重量";
       this.入库重量.ReadOnly = true;
@@ -393,8 +403,8 @@
       // 胴体重量
       // 
       this.胴体重量.DataPropertyName = "BeforeWeight";
-      dataGridViewCellStyle4.Format = "#0.######";
-      this.胴体重量.DefaultCellStyle = dataGridViewCellStyle4;
+      dataGridViewCellStyle74.Format = "#0.######";
+      this.胴体重量.DefaultCellStyle = dataGridViewCellStyle74;
       this.胴体重量.HeaderText = "胴体重量";
       this.胴体重量.Name = "胴体重量";
       this.胴体重量.ReadOnly = true;
@@ -402,8 +412,8 @@
       // 损耗
       // 
       this.损耗.DataPropertyName = "LossWeight";
-      dataGridViewCellStyle5.Format = "#0.######";
-      this.损耗.DefaultCellStyle = dataGridViewCellStyle5;
+      dataGridViewCellStyle75.Format = "#0.######";
+      this.损耗.DefaultCellStyle = dataGridViewCellStyle75;
       this.损耗.HeaderText = "损耗";
       this.损耗.Name = "损耗";
       this.损耗.ReadOnly = true;
@@ -426,17 +436,17 @@
       this.gridUnCheck.AllowUserToDeleteRows = false;
       this.gridUnCheck.AllowUserToResizeColumns = false;
       this.gridUnCheck.AllowUserToResizeRows = false;
-      dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.gridUnCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
+      dataGridViewCellStyle77.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+      this.gridUnCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle77;
       this.gridUnCheck.BackgroundColor = System.Drawing.Color.White;
-      dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-      dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
-      dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F);
-      dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
-      dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-      dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-      dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.gridUnCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+      dataGridViewCellStyle78.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+      dataGridViewCellStyle78.BackColor = System.Drawing.SystemColors.Control;
+      dataGridViewCellStyle78.Font = new System.Drawing.Font("宋体", 12F);
+      dataGridViewCellStyle78.ForeColor = System.Drawing.SystemColors.WindowText;
+      dataGridViewCellStyle78.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+      dataGridViewCellStyle78.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+      dataGridViewCellStyle78.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+      this.gridUnCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle78;
       this.gridUnCheck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
       this.gridUnCheck.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.uncheck序号,
@@ -450,9 +460,9 @@
       this.gridUnCheck.Name = "gridUnCheck";
       this.gridUnCheck.ReadOnly = true;
       this.gridUnCheck.RowHeadersVisible = false;
-      dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
-      this.gridUnCheck.RowsDefaultCellStyle = dataGridViewCellStyle10;
+      dataGridViewCellStyle80.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      dataGridViewCellStyle80.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+      this.gridUnCheck.RowsDefaultCellStyle = dataGridViewCellStyle80;
       this.gridUnCheck.RowTemplate.Height = 23;
       this.gridUnCheck.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
       this.gridUnCheck.Size = new System.Drawing.Size(664, 200);
@@ -493,12 +503,41 @@
       // uncheck重量
       // 
       this.uncheck重量.DataPropertyName = "Weight";
-      dataGridViewCellStyle9.Format = "#0.######";
-      this.uncheck重量.DefaultCellStyle = dataGridViewCellStyle9;
+      dataGridViewCellStyle79.Format = "#0.######";
+      this.uncheck重量.DefaultCellStyle = dataGridViewCellStyle79;
       this.uncheck重量.HeaderText = "重量";
       this.uncheck重量.Name = "uncheck重量";
       this.uncheck重量.ReadOnly = true;
       // 
+      // flpGoods
+      // 
+      this.flpGoods.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+      this.flpGoods.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.flpGoods.Location = new System.Drawing.Point(0, 0);
+      this.flpGoods.Name = "flpGoods";
+      this.flpGoods.Size = new System.Drawing.Size(319, 443);
+      this.flpGoods.TabIndex = 0;
+      // 
+      // label2
+      // 
+      this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.label2.AutoSize = true;
+      this.label2.Font = new System.Drawing.Font("宋体", 15F);
+      this.label2.Location = new System.Drawing.Point(505, 122);
+      this.label2.Name = "label2";
+      this.label2.Size = new System.Drawing.Size(69, 20);
+      this.label2.TabIndex = 45;
+      this.label2.Text = "扫码：";
+      // 
+      // textBox1
+      // 
+      this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.textBox1.Font = new System.Drawing.Font("宋体", 12F);
+      this.textBox1.Location = new System.Drawing.Point(565, 119);
+      this.textBox1.Name = "textBox1";
+      this.textBox1.Size = new System.Drawing.Size(229, 26);
+      this.textBox1.TabIndex = 46;
+      // 
       // TrunksIousOutInStoreForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -512,6 +551,7 @@
       this.Text = "白条入库";
       this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
       this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.TrunksIousOutInStoreForm_FormClosing);
+      this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TrunksIousOutInStoreForm_KeyPress);
       this.splitContainer1.Panel1.ResumeLayout(false);
       this.splitContainer1.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
@@ -524,6 +564,7 @@
       this.panel2.ResumeLayout(false);
       this.panel2.PerformLayout();
       this.splitContainer2.Panel1.ResumeLayout(false);
+      this.splitContainer2.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
       this.splitContainer2.ResumeLayout(false);
       this.groupBox2.ResumeLayout(false);
@@ -570,5 +611,8 @@
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck产品名称;
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck数量;
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck重量;
+    private System.Windows.Forms.FlowLayoutPanel flpGoods;
+    private System.Windows.Forms.Label label2;
+    private System.Windows.Forms.TextBox textBox1;
   }
 }

TrunksIousOutInStore/TrunksIousOutInStoreForm.cs

@@ -51,7 +51,7 @@ namespace TrunksIousOutInStore
       gridChecked.AutoGenerateColumns = false;
 
       InitCombox();
-
+      InitGoodsButtonPanel();
       weightPort = new SerialPort();
       this.FormClosing += delegate
       {
@@ -76,6 +76,45 @@ namespace TrunksIousOutInStore
       _tcCheckNetStatus.Start();
     }
 
+    private void InitGoodsButtonPanel()
+    {
+      var goodsStr = RpcFacade.Call<string>("/MainSystem/B3ClientService/Rpcs/BillRpc/ClientGoodsSetRpc/GetListByApplyClient", "白条出入库");
+      var goods = JsonConvert.DeserializeObject<List<ClientGoodsSetDto>>(goodsStr);
+      flpGoods.Controls.Clear();
+      foreach (var item in goods)
+      {
+        var btnGoods = CreateGoodsButton(item);
+        flpGoods.Controls.Add(btnGoods);
+      }
+    }
+
+    private Button CreateGoodsButton(ClientGoodsSetDto item)
+    {
+      var btn = new Button();
+      btn.Text = item.Goods_Name;
+      btn.Margin = new Padding { Left = 25, Bottom = 25 };
+      btn.Tag = item;
+      btn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      btn.Click += BtnGoods_Click;
+      btn.BackColor = SystemColors.Control;
+      btn.Width = 110;
+      btn.Height = 60;
+      return btn;
+    }
+
+    private void BtnGoods_Click(object sender, EventArgs e)
+    {
+      var btn = sender as Button;
+      var tag = btn.Tag as ClientGoodsSetDto;
+      if (string.IsNullOrEmpty(textBox1.Text))
+        throw new Exception("请先扫码");
+      if (!textBox1.Text.StartsWith("A26091201"))
+        throw new Exception("条码错误");
+
+      RpcFacade.Call<long>(BaseRpcUrl + "SimpleInsertOrUpdate", tag.Goods_ID, tag.Goods_Name, textBox1.Text);
+      textBox1.Text = string.Empty;
+    }
+
     private bool laseConnection = false;
     private void CheckNetStatus()
     {
@@ -602,5 +641,29 @@ namespace TrunksIousOutInStore
         DisableWeight();
       }
     }
+
+    bool end = false;
+    private void TrunksIousOutInStoreForm_KeyPress(object sender, KeyPressEventArgs e)
+    {
+      if (end)
+      {
+        textBox1.Text = string.Empty;
+        end = false;
+      }
+      if (!textBox1.Focused)
+      {
+        textBox1.Focus();
+        textBox1.Text = e.KeyChar.ToString();
+        textBox1.Select(textBox1.TextLength, 0);
+      }
+      if (e.KeyChar == (char)Keys.Enter)
+      {
+        e.Handled = true;
+        var code = UrlUtil.ParseCode(textBox1.Text);
+        textBox1.Text = code;
+        textBox1.Select(textBox1.TextLength, 0);
+        end = true;
+      }
+    }
   }
 }