白条入库

SegmentationInStore/SegmentationInStoreForm.Designer.cs

@@ -36,30 +36,25 @@
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = 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 dataGridViewCellStyle15 = 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 dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+      System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-      this.cbxStore = new System.Windows.Forms.ComboBox();
       this.txtBarCode = new System.Windows.Forms.TextBox();
       this.groupBox4 = new System.Windows.Forms.GroupBox();
       this.richTextBox1 = new System.Windows.Forms.RichTextBox();
       this.label2 = new System.Windows.Forms.Label();
       this.picSyncStatus = new System.Windows.Forms.PictureBox();
       this.label11 = new System.Windows.Forms.Label();
-      this.button1 = new System.Windows.Forms.Button();
+      this.btnSubmit = new System.Windows.Forms.Button();
       this.picNetStatus = new System.Windows.Forms.PictureBox();
-      this.label1 = new System.Windows.Forms.Label();
       this.label10 = new System.Windows.Forms.Label();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
       this.groupBox3 = new System.Windows.Forms.GroupBox();
-      this.groupBox2 = new System.Windows.Forms.GroupBox();
-      this.button2 = new System.Windows.Forms.Button();
-      this.groupBox1 = new System.Windows.Forms.GroupBox();
       this.gridSubmited = new BWP.WinFormControl.UDataGridView();
       this.submited序号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.submited条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -67,18 +62,28 @@
       this.submited重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.submited仓库 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.submited日期 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.uDataGridView1 = 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.groupBox2 = new System.Windows.Forms.GroupBox();
+      this.gridReturn = new BWP.WinFormControl.UDataGridView();
+      this.btnIsReturn = new System.Windows.Forms.Button();
+      this.groupBox1 = new System.Windows.Forms.GroupBox();
       this.gridUnScan = new BWP.WinFormControl.UDataGridView();
       this.unscan序号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.unscan条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.unscan产品 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.unscan重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.unscan日期 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.panel3 = new System.Windows.Forms.Panel();
+      this.cbxStore = new System.Windows.Forms.ComboBox();
+      this.cbxWorkUnit = new System.Windows.Forms.ComboBox();
+      this.label6 = new System.Windows.Forms.Label();
+      this.label5 = new System.Windows.Forms.Label();
+      this.cbxWorkShop = new System.Windows.Forms.ComboBox();
+      this.label4 = new System.Windows.Forms.Label();
+      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();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -91,11 +96,12 @@
       this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
       this.groupBox3.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.gridSubmited)).BeginInit();
       this.groupBox2.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.gridReturn)).BeginInit();
       this.groupBox1.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.gridSubmited)).BeginInit();
-      ((System.ComponentModel.ISupportInitialize)(this.uDataGridView1)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.gridUnScan)).BeginInit();
+      this.panel3.SuspendLayout();
       this.SuspendLayout();
       // 
       // splitContainer1
@@ -108,39 +114,27 @@
       // 
       // splitContainer1.Panel1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.cbxStore);
+      this.splitContainer1.Panel1.Controls.Add(this.panel3);
       this.splitContainer1.Panel1.Controls.Add(this.txtBarCode);
       this.splitContainer1.Panel1.Controls.Add(this.groupBox4);
       this.splitContainer1.Panel1.Controls.Add(this.label2);
       this.splitContainer1.Panel1.Controls.Add(this.picSyncStatus);
       this.splitContainer1.Panel1.Controls.Add(this.label11);
-      this.splitContainer1.Panel1.Controls.Add(this.button1);
       this.splitContainer1.Panel1.Controls.Add(this.picNetStatus);
-      this.splitContainer1.Panel1.Controls.Add(this.label1);
       this.splitContainer1.Panel1.Controls.Add(this.label10);
       // 
       // splitContainer1.Panel2
       // 
       this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
       this.splitContainer1.Size = new System.Drawing.Size(1098, 594);
-      this.splitContainer1.SplitterDistance = 102;
+      this.splitContainer1.SplitterDistance = 139;
       this.splitContainer1.TabIndex = 0;
       // 
-      // cbxStore
-      // 
-      this.cbxStore.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-      this.cbxStore.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.cbxStore.FormattingEnabled = true;
-      this.cbxStore.Location = new System.Drawing.Point(83, 55);
-      this.cbxStore.Name = "cbxStore";
-      this.cbxStore.Size = new System.Drawing.Size(226, 24);
-      this.cbxStore.TabIndex = 46;
-      // 
       // txtBarCode
       // 
       this.txtBarCode.Enabled = false;
       this.txtBarCode.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.txtBarCode.Location = new System.Drawing.Point(83, 10);
+      this.txtBarCode.Location = new System.Drawing.Point(76, 14);
       this.txtBarCode.Name = "txtBarCode";
       this.txtBarCode.Size = new System.Drawing.Size(227, 26);
       this.txtBarCode.TabIndex = 45;
@@ -150,9 +144,9 @@
       this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBox4.Controls.Add(this.richTextBox1);
-      this.groupBox4.Location = new System.Drawing.Point(755, 3);
+      this.groupBox4.Location = new System.Drawing.Point(555, 5);
       this.groupBox4.Name = "groupBox4";
-      this.groupBox4.Size = new System.Drawing.Size(331, 94);
+      this.groupBox4.Size = new System.Drawing.Size(259, 131);
       this.groupBox4.TabIndex = 4;
       this.groupBox4.TabStop = false;
       this.groupBox4.Text = "最近异常记录";
@@ -163,7 +157,7 @@
       this.richTextBox1.HideSelection = false;
       this.richTextBox1.Location = new System.Drawing.Point(3, 17);
       this.richTextBox1.Name = "richTextBox1";
-      this.richTextBox1.Size = new System.Drawing.Size(325, 74);
+      this.richTextBox1.Size = new System.Drawing.Size(253, 111);
       this.richTextBox1.TabIndex = 0;
       this.richTextBox1.Text = "";
       // 
@@ -171,7 +165,7 @@
       // 
       this.label2.AutoSize = true;
       this.label2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.label2.Location = new System.Drawing.Point(21, 13);
+      this.label2.Location = new System.Drawing.Point(14, 17);
       this.label2.Name = "label2";
       this.label2.Size = new System.Drawing.Size(56, 16);
       this.label2.TabIndex = 44;
@@ -181,7 +175,7 @@
       // 
       this.picSyncStatus.ErrorImage = null;
       this.picSyncStatus.InitialImage = null;
-      this.picSyncStatus.Location = new System.Drawing.Point(387, 55);
+      this.picSyncStatus.Location = new System.Drawing.Point(191, 62);
       this.picSyncStatus.Name = "picSyncStatus";
       this.picSyncStatus.Size = new System.Drawing.Size(30, 30);
       this.picSyncStatus.TabIndex = 43;
@@ -190,46 +184,37 @@
       // label11
       // 
       this.label11.AutoSize = true;
-      this.label11.Location = new System.Drawing.Point(352, 63);
+      this.label11.Location = new System.Drawing.Point(156, 70);
       this.label11.Name = "label11";
       this.label11.Size = new System.Drawing.Size(29, 12);
       this.label11.TabIndex = 42;
       this.label11.Text = "同步";
       // 
-      // button1
+      // btnSubmit
       // 
-      this.button1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.button1.Location = new System.Drawing.Point(524, 18);
-      this.button1.Name = "button1";
-      this.button1.Size = new System.Drawing.Size(76, 34);
-      this.button1.TabIndex = 2;
-      this.button1.Text = "提交";
-      this.button1.UseVisualStyleBackColor = true;
+      this.btnSubmit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.btnSubmit.Location = new System.Drawing.Point(136, 15);
+      this.btnSubmit.Name = "btnSubmit";
+      this.btnSubmit.Size = new System.Drawing.Size(76, 34);
+      this.btnSubmit.TabIndex = 2;
+      this.btnSubmit.Text = "提交";
+      this.btnSubmit.UseVisualStyleBackColor = true;
+      this.btnSubmit.Click += new System.EventHandler(this.btnSubmit_Click);
       // 
       // picNetStatus
       // 
       this.picNetStatus.ErrorImage = null;
       this.picNetStatus.InitialImage = null;
-      this.picNetStatus.Location = new System.Drawing.Point(387, 10);
+      this.picNetStatus.Location = new System.Drawing.Point(109, 62);
       this.picNetStatus.Name = "picNetStatus";
       this.picNetStatus.Size = new System.Drawing.Size(30, 30);
       this.picNetStatus.TabIndex = 41;
       this.picNetStatus.TabStop = false;
       // 
-      // label1
-      // 
-      this.label1.AutoSize = true;
-      this.label1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.label1.Location = new System.Drawing.Point(21, 60);
-      this.label1.Name = "label1";
-      this.label1.Size = new System.Drawing.Size(56, 16);
-      this.label1.TabIndex = 0;
-      this.label1.Text = "仓库：";
-      // 
       // label10
       // 
       this.label10.AutoSize = true;
-      this.label10.Location = new System.Drawing.Point(352, 18);
+      this.label10.Location = new System.Drawing.Point(74, 70);
       this.label10.Name = "label10";
       this.label10.Size = new System.Drawing.Size(29, 12);
       this.label10.TabIndex = 40;
@@ -250,8 +235,8 @@
       // 
       this.splitContainer2.Panel2.Controls.Add(this.groupBox2);
       this.splitContainer2.Panel2.Controls.Add(this.groupBox1);
-      this.splitContainer2.Size = new System.Drawing.Size(1098, 488);
-      this.splitContainer2.SplitterDistance = 603;
+      this.splitContainer2.Size = new System.Drawing.Size(1098, 451);
+      this.splitContainer2.SplitterDistance = 614;
       this.splitContainer2.TabIndex = 0;
       // 
       // groupBox3
@@ -262,47 +247,11 @@
       this.groupBox3.Controls.Add(this.gridSubmited);
       this.groupBox3.Location = new System.Drawing.Point(3, 3);
       this.groupBox3.Name = "groupBox3";
-      this.groupBox3.Size = new System.Drawing.Size(595, 480);
+      this.groupBox3.Size = new System.Drawing.Size(606, 443);
       this.groupBox3.TabIndex = 3;
       this.groupBox3.TabStop = false;
       this.groupBox3.Text = "已扫码产品";
       // 
-      // groupBox2
-      // 
-      this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.groupBox2.Controls.Add(this.uDataGridView1);
-      this.groupBox2.Controls.Add(this.button2);
-      this.groupBox2.Location = new System.Drawing.Point(7, 3);
-      this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Size = new System.Drawing.Size(479, 181);
-      this.groupBox2.TabIndex = 1;
-      this.groupBox2.TabStop = false;
-      this.groupBox2.Text = "退库";
-      // 
-      // button2
-      // 
-      this.button2.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.button2.Location = new System.Drawing.Point(6, 17);
-      this.button2.Name = "button2";
-      this.button2.Size = new System.Drawing.Size(58, 32);
-      this.button2.TabIndex = 2;
-      this.button2.Text = "退货";
-      this.button2.UseVisualStyleBackColor = true;
-      // 
-      // groupBox1
-      // 
-      this.groupBox1.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.groupBox1.Controls.Add(this.gridUnScan);
-      this.groupBox1.Location = new System.Drawing.Point(7, 190);
-      this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Size = new System.Drawing.Size(482, 293);
-      this.groupBox1.TabIndex = 0;
-      this.groupBox1.TabStop = false;
-      this.groupBox1.Text = "未扫码产品";
-      // 
       // gridSubmited
       // 
       this.gridSubmited.AllowUserToAddRows = false;
@@ -339,7 +288,7 @@
       this.gridSubmited.RowsDefaultCellStyle = dataGridViewCellStyle5;
       this.gridSubmited.RowTemplate.Height = 23;
       this.gridSubmited.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.gridSubmited.Size = new System.Drawing.Size(589, 460);
+      this.gridSubmited.Size = new System.Drawing.Size(600, 423);
       this.gridSubmited.TabIndex = 1;
       // 
       // submited序号
@@ -397,17 +346,31 @@
       this.submited日期.ReadOnly = true;
       this.submited日期.Visible = false;
       // 
-      // uDataGridView1
+      // groupBox2
       // 
-      this.uDataGridView1.AllowUserToAddRows = false;
-      this.uDataGridView1.AllowUserToDeleteRows = false;
-      this.uDataGridView1.AllowUserToResizeColumns = false;
-      this.uDataGridView1.AllowUserToResizeRows = false;
+      this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.groupBox2.Controls.Add(this.gridReturn);
+      this.groupBox2.Controls.Add(this.btnIsReturn);
+      this.groupBox2.Controls.Add(this.btnSubmit);
+      this.groupBox2.Location = new System.Drawing.Point(7, 3);
+      this.groupBox2.Name = "groupBox2";
+      this.groupBox2.Size = new System.Drawing.Size(468, 181);
+      this.groupBox2.TabIndex = 1;
+      this.groupBox2.TabStop = false;
+      this.groupBox2.Text = "退库";
+      // 
+      // gridReturn
+      // 
+      this.gridReturn.AllowUserToAddRows = false;
+      this.gridReturn.AllowUserToDeleteRows = false;
+      this.gridReturn.AllowUserToResizeColumns = false;
+      this.gridReturn.AllowUserToResizeRows = false;
       dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
-      this.uDataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
-      this.uDataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+      this.gridReturn.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
+      this.gridReturn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.uDataGridView1.BackgroundColor = System.Drawing.Color.White;
+      this.gridReturn.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);
@@ -415,71 +378,50 @@
       dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
       dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
       dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-      this.uDataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
-      this.uDataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-      this.uDataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+      this.gridReturn.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
+      this.gridReturn.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      this.gridReturn.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn1,
             this.dataGridViewTextBoxColumn2,
             this.dataGridViewTextBoxColumn3,
             this.dataGridViewTextBoxColumn4,
             this.dataGridViewTextBoxColumn5});
-      this.uDataGridView1.Location = new System.Drawing.Point(3, 55);
-      this.uDataGridView1.MultiSelect = false;
-      this.uDataGridView1.Name = "uDataGridView1";
-      this.uDataGridView1.ReadOnly = true;
-      this.uDataGridView1.RowHeadersVisible = false;
+      this.gridReturn.Location = new System.Drawing.Point(3, 55);
+      this.gridReturn.MultiSelect = false;
+      this.gridReturn.Name = "gridReturn";
+      this.gridReturn.ReadOnly = true;
+      this.gridReturn.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.uDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle10;
-      this.uDataGridView1.RowTemplate.Height = 23;
-      this.uDataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.uDataGridView1.Size = new System.Drawing.Size(476, 126);
-      this.uDataGridView1.TabIndex = 3;
-      // 
-      // dataGridViewTextBoxColumn1
-      // 
-      this.dataGridViewTextBoxColumn1.DataPropertyName = "ID";
-      this.dataGridViewTextBoxColumn1.HeaderText = "序号";
-      this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-      this.dataGridViewTextBoxColumn1.ReadOnly = true;
-      // 
-      // 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.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-      this.dataGridViewTextBoxColumn3.DataPropertyName = "Goods_Name";
-      this.dataGridViewTextBoxColumn3.HeaderText = "产品";
-      this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-      this.dataGridViewTextBoxColumn3.ReadOnly = true;
-      this.dataGridViewTextBoxColumn3.Width = 65;
-      // 
-      // dataGridViewTextBoxColumn4
+      this.gridReturn.RowsDefaultCellStyle = dataGridViewCellStyle10;
+      this.gridReturn.RowTemplate.Height = 23;
+      this.gridReturn.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+      this.gridReturn.Size = new System.Drawing.Size(465, 126);
+      this.gridReturn.TabIndex = 3;
+      // 
+      // btnIsReturn
+      // 
+      this.btnIsReturn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.btnIsReturn.Location = new System.Drawing.Point(6, 15);
+      this.btnIsReturn.Name = "btnIsReturn";
+      this.btnIsReturn.Size = new System.Drawing.Size(70, 32);
+      this.btnIsReturn.TabIndex = 2;
+      this.btnIsReturn.Text = "退货";
+      this.btnIsReturn.UseVisualStyleBackColor = true;
+      this.btnIsReturn.Click += new System.EventHandler(this.btnIsReturn_Click);
       // 
-      this.dataGridViewTextBoxColumn4.DataPropertyName = "JingWeight";
-      dataGridViewCellStyle8.Format = "N2";
-      this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle8;
-      this.dataGridViewTextBoxColumn4.HeaderText = "重量";
-      this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
-      this.dataGridViewTextBoxColumn4.ReadOnly = true;
-      // 
-      // dataGridViewTextBoxColumn5
+      // groupBox1
       // 
-      this.dataGridViewTextBoxColumn5.DataPropertyName = "CreateTime";
-      dataGridViewCellStyle9.Format = "F";
-      dataGridViewCellStyle9.NullValue = null;
-      this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle9;
-      this.dataGridViewTextBoxColumn5.HeaderText = "日期";
-      this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-      this.dataGridViewTextBoxColumn5.ReadOnly = true;
-      this.dataGridViewTextBoxColumn5.Visible = false;
+      this.groupBox1.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.groupBox1.Controls.Add(this.gridUnScan);
+      this.groupBox1.Location = new System.Drawing.Point(7, 190);
+      this.groupBox1.Name = "groupBox1";
+      this.groupBox1.Size = new System.Drawing.Size(471, 256);
+      this.groupBox1.TabIndex = 0;
+      this.groupBox1.TabStop = false;
+      this.groupBox1.Text = "未扫码产品";
       // 
       // gridUnScan
       // 
@@ -516,7 +458,7 @@
       this.gridUnScan.RowsDefaultCellStyle = dataGridViewCellStyle15;
       this.gridUnScan.RowTemplate.Height = 23;
       this.gridUnScan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.gridUnScan.Size = new System.Drawing.Size(476, 273);
+      this.gridUnScan.Size = new System.Drawing.Size(465, 236);
       this.gridUnScan.TabIndex = 0;
       // 
       // unscan序号
@@ -566,6 +508,124 @@
       this.unscan日期.ReadOnly = true;
       this.unscan日期.Visible = false;
       // 
+      // panel3
+      // 
+      this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+      this.panel3.Controls.Add(this.cbxStore);
+      this.panel3.Controls.Add(this.cbxWorkUnit);
+      this.panel3.Controls.Add(this.label6);
+      this.panel3.Controls.Add(this.label5);
+      this.panel3.Controls.Add(this.cbxWorkShop);
+      this.panel3.Controls.Add(this.label4);
+      this.panel3.Location = new System.Drawing.Point(895, 8);
+      this.panel3.Name = "panel3";
+      this.panel3.Size = new System.Drawing.Size(191, 123);
+      this.panel3.TabIndex = 47;
+      // 
+      // cbxStore
+      // 
+      this.cbxStore.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cbxStore.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.cbxStore.FormattingEnabled = true;
+      this.cbxStore.Location = new System.Drawing.Point(56, 85);
+      this.cbxStore.Name = "cbxStore";
+      this.cbxStore.Size = new System.Drawing.Size(121, 24);
+      this.cbxStore.TabIndex = 39;
+      // 
+      // cbxWorkUnit
+      // 
+      this.cbxWorkUnit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cbxWorkUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.cbxWorkUnit.FormattingEnabled = true;
+      this.cbxWorkUnit.Location = new System.Drawing.Point(57, 48);
+      this.cbxWorkUnit.Name = "cbxWorkUnit";
+      this.cbxWorkUnit.Size = new System.Drawing.Size(121, 24);
+      this.cbxWorkUnit.TabIndex = 40;
+      // 
+      // label6
+      // 
+      this.label6.AutoSize = true;
+      this.label6.Location = new System.Drawing.Point(9, 91);
+      this.label6.Name = "label6";
+      this.label6.Size = new System.Drawing.Size(41, 12);
+      this.label6.TabIndex = 36;
+      this.label6.Text = "仓库：";
+      // 
+      // label5
+      // 
+      this.label5.AutoSize = true;
+      this.label5.Location = new System.Drawing.Point(9, 55);
+      this.label5.Name = "label5";
+      this.label5.Size = new System.Drawing.Size(41, 12);
+      this.label5.TabIndex = 37;
+      this.label5.Text = "单元：";
+      // 
+      // cbxWorkShop
+      // 
+      this.cbxWorkShop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cbxWorkShop.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.cbxWorkShop.FormattingEnabled = true;
+      this.cbxWorkShop.Location = new System.Drawing.Point(57, 7);
+      this.cbxWorkShop.Name = "cbxWorkShop";
+      this.cbxWorkShop.Size = new System.Drawing.Size(121, 24);
+      this.cbxWorkShop.TabIndex = 41;
+      // 
+      // label4
+      // 
+      this.label4.AutoSize = true;
+      this.label4.Location = new System.Drawing.Point(9, 11);
+      this.label4.Name = "label4";
+      this.label4.Size = new System.Drawing.Size(41, 12);
+      this.label4.TabIndex = 38;
+      this.label4.Text = "车间：";
+      // 
+      // dataGridViewTextBoxColumn1
+      // 
+      this.dataGridViewTextBoxColumn1.DataPropertyName = "ID";
+      this.dataGridViewTextBoxColumn1.HeaderText = "序号";
+      this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+      this.dataGridViewTextBoxColumn1.ReadOnly = true;
+      this.dataGridViewTextBoxColumn1.Visible = false;
+      // 
+      // 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.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.dataGridViewTextBoxColumn3.DataPropertyName = "Goods_Name";
+      this.dataGridViewTextBoxColumn3.HeaderText = "产品";
+      this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+      this.dataGridViewTextBoxColumn3.ReadOnly = true;
+      this.dataGridViewTextBoxColumn3.Width = 65;
+      // 
+      // dataGridViewTextBoxColumn4
+      // 
+      this.dataGridViewTextBoxColumn4.DataPropertyName = "Weight";
+      dataGridViewCellStyle8.Format = "N2";
+      this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle8;
+      this.dataGridViewTextBoxColumn4.HeaderText = "重量";
+      this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+      this.dataGridViewTextBoxColumn4.ReadOnly = true;
+      // 
+      // dataGridViewTextBoxColumn5
+      // 
+      this.dataGridViewTextBoxColumn5.DataPropertyName = "CreateTime";
+      dataGridViewCellStyle9.Format = "F";
+      dataGridViewCellStyle9.NullValue = null;
+      this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle9;
+      this.dataGridViewTextBoxColumn5.HeaderText = "日期";
+      this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+      this.dataGridViewTextBoxColumn5.ReadOnly = true;
+      this.dataGridViewTextBoxColumn5.Visible = false;
+      // 
       // SegmentationInStoreForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -594,11 +654,13 @@
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
       this.splitContainer2.ResumeLayout(false);
       this.groupBox3.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.gridSubmited)).EndInit();
       this.groupBox2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.gridReturn)).EndInit();
       this.groupBox1.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.gridSubmited)).EndInit();
-      ((System.ComponentModel.ISupportInitialize)(this.uDataGridView1)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.gridUnScan)).EndInit();
+      this.panel3.ResumeLayout(false);
+      this.panel3.PerformLayout();
       this.ResumeLayout(false);
 
     }
@@ -608,8 +670,7 @@
     private System.Windows.Forms.SplitContainer splitContainer1;
     private System.Windows.Forms.SplitContainer splitContainer2;
     private System.Windows.Forms.GroupBox groupBox1;
-    private System.Windows.Forms.Label label1;
-    private System.Windows.Forms.Button button1;
+    private System.Windows.Forms.Button btnSubmit;
     private System.Windows.Forms.GroupBox groupBox3;
     private System.Windows.Forms.GroupBox groupBox4;
     private BWP.WinFormControl.UDataGridView gridUnScan;
@@ -621,25 +682,31 @@
     private System.Windows.Forms.Label label2;
     private System.Windows.Forms.TextBox txtBarCode;
     private System.Windows.Forms.RichTextBox richTextBox1;
-    private System.Windows.Forms.Button button2;
+    private System.Windows.Forms.Button btnIsReturn;
     private System.Windows.Forms.GroupBox groupBox2;
-    private BWP.WinFormControl.UDataGridView uDataGridView1;
-    private System.Windows.Forms.ComboBox cbxStore;
+    private BWP.WinFormControl.UDataGridView gridReturn;
     private System.Windows.Forms.DataGridViewTextBoxColumn submited序号;
     private System.Windows.Forms.DataGridViewTextBoxColumn submited条码;
     private System.Windows.Forms.DataGridViewTextBoxColumn submited产品;
     private System.Windows.Forms.DataGridViewTextBoxColumn submited重量;
     private System.Windows.Forms.DataGridViewTextBoxColumn submited仓库;
     private System.Windows.Forms.DataGridViewTextBoxColumn submited日期;
-    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
-    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
-    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
-    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
     private System.Windows.Forms.DataGridViewTextBoxColumn unscan序号;
     private System.Windows.Forms.DataGridViewTextBoxColumn unscan条码;
     private System.Windows.Forms.DataGridViewTextBoxColumn unscan产品;
     private System.Windows.Forms.DataGridViewTextBoxColumn unscan重量;
     private System.Windows.Forms.DataGridViewTextBoxColumn unscan日期;
+    private System.Windows.Forms.Panel panel3;
+    private System.Windows.Forms.ComboBox cbxStore;
+    private System.Windows.Forms.ComboBox cbxWorkUnit;
+    private System.Windows.Forms.Label label6;
+    private System.Windows.Forms.Label label5;
+    private System.Windows.Forms.ComboBox cbxWorkShop;
+    private System.Windows.Forms.Label label4;
+    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+    private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
   }
 }

SegmentationInStore/SegmentationInStoreForm.cs

@@ -30,6 +30,7 @@ namespace SegmentationInStore
 
     private BindingList<SegmentationWeightRecordDto> mUnScanList;
     private BindingList<SegmentationInStoreRecord> mRecordList;
+    private BindingList<SegmentationInStoreRecord> mReturnRecordList;
 
     private readonly Thread _tdSyncLocalToMiddleDb;
     private readonly Thread _tdCheckNetStatus;
@@ -42,10 +43,13 @@ namespace SegmentationInStore
       InitializeComponent();
       gridUnScan.AutoGenerateColumns = false;
       gridSubmited.AutoGenerateColumns = false;
+      gridReturn.AutoGenerateColumns = false;
       mUnScanList = new BindingList<SegmentationWeightRecordDto>();
       mRecordList = new BindingList<SegmentationInStoreRecord>();
-//      Control.CheckForIllegalCrossThreadCalls = false;
-//      cbxStore.CheckForIllegalCrossThreadCalls = false
+
+      mReturnRecordList = new BindingList<SegmentationInStoreRecord>();
+      //      Control.CheckForIllegalCrossThreadCalls = false;
+      //      cbxStore.CheckForIllegalCrossThreadCalls = false
       //      BarCode.BarCodeEvent += new BardCodeHooK.BardCodeDeletegate(BarCode_BarCodeEvent);
 
       InitCombox();
@@ -101,7 +105,7 @@ namespace SegmentationInStore
             gridUnScan.DataSource = mUnScanList;
           }
         ));
-       
+
         Thread.Sleep(1000);
       }
     }
@@ -211,15 +215,58 @@ namespace SegmentationInStore
         cbxStore.DisplayMember = "Name";
         cbxStore.ValueMember = "ID";
       }
+      var shop = mDropDownSets.Details.FirstOrDefault(x => x.Name == DropDownSets.车间);
+      if (shop != null)
+      {
+        cbxWorkShop.DataSource = shop.Details;
+        cbxWorkShop.DisplayMember = "Name";
+        cbxWorkShop.ValueMember = "ID";
+      }
+
+      var unit = mDropDownSets.Details.FirstOrDefault(x => x.Name == DropDownSets.单元);
+      if (unit != null)
+      {
+        cbxWorkUnit.DataSource = unit.Details;
+        cbxWorkUnit.DisplayMember = "Name";
+        cbxWorkUnit.ValueMember = "Code";
+      }
+
     }
     private DropDownSets GetmDropDownSets()
     {
       var sets = new DropDownSets();
       var storeSet = GetStoreSet();
+      var wrokUnitSet = GetWrokUnitSet();
+      var wrokShopSet = GetWrokShopSet();
       sets.Details.Add(storeSet);
-
+      sets.Details.Add(wrokUnitSet);
+      sets.Details.Add(wrokShopSet);
       return sets;
     }
+
+    private DropDownSet GetWrokShopSet()
+    {
+      var json = RpcFacade.Call<string>("/MainSystem/B3ClientService/Rpcs/BaseInfoRpc/GetWorkShopList");
+      var set = new DropDownSet();
+      set.Name = DropDownSets.车间;
+      foreach (var detail in JsonConvert.DeserializeObject<List<DropDownSet_Detail>>(json))
+      {
+        set.Details.Add(detail);
+      }
+      return set;
+    }
+
+    private DropDownSet GetWrokUnitSet()
+    {
+      var json = RpcFacade.Call<string>("/MainSystem/B3ClientService/Rpcs/BaseInfoRpc/GetWorkUnitList");
+      var set = new DropDownSet();
+      set.Name = DropDownSets.单元;
+      foreach (var detail in JsonConvert.DeserializeObject<List<DropDownSet_Detail>>(json))
+      {
+        set.Details.Add(detail);
+      }
+      return set;
+    }
     private DropDownSet GetStoreSet()
     {
       var json = RpcFacade.Call<string>("/MainSystem/B3ClientService/Rpcs/BaseInfoRpc/GetStoreList");
@@ -255,11 +302,11 @@ namespace SegmentationInStore
         }
       }
     }
-    
-    
 
-    
-    void AddException(string barcode,string error)
+
+
+
+    void AddException(string barcode, string error)
     {
       this.Invoke(new Action(() =>
       {
@@ -271,7 +318,7 @@ namespace SegmentationInStore
         }
         richTextBox1.AppendText(errException.ToString() + Environment.NewLine);
       }));
-    
+
     }
 
     private void SegmentationInStoreForm_Load(object sender, EventArgs e)
@@ -283,7 +330,7 @@ namespace SegmentationInStore
       //        MessageBox.Show("注册扫码失败，联系管理员");
       //      }
 
-//      txtBarCode.Focus();
+      //      txtBarCode.Focus();
       cbxStore.SelectedIndex = 0;
     }
 
@@ -374,17 +421,25 @@ namespace SegmentationInStore
           MessageBox.Show("没有查询到该汇总码");
           AddException(barCodesBarCode, "没有查询到该汇总码");
           return;
-      
+
         }
         foreach (SegmentationInStoreRecord dmo in list)
         {
-          var recrod = doInsertAndBack(dmo);
-          if (recrod.ID > 0)
+          if (_isRetrun)
+          {
+            ReturnRecrodByCode(dmo.BarCode);
+          }
+          else
           {
-            mRecordList.Insert(0, recrod);
+            var recrod = doInsertAndBack(dmo);
+            if (recrod.ID > 0)
+            {
+              mRecordList.Insert(0, recrod);
+            }
+            RefreshRecordUi();
           }
         }
-        RefreshRecordUi();
+      
       }
       else
       {
@@ -410,28 +465,76 @@ namespace SegmentationInStore
 
         if (string.IsNullOrWhiteSpace(code))
         {
-          MessageBox.Show("条码错误:"+ barCodesBarCode);
+          MessageBox.Show("条码错误:" + barCodesBarCode);
           AddException(barCodesBarCode, "条码错误");
           return;
         }
-        var bg = new BackgroundWorker();
-        var record = new SegmentationInStoreRecord();
-        bg.DoWork += delegate
+
+        if (_isRetrun)
         {
-          record = doInsertAndBack(code, goodsId);
-        };
-        bg.RunWorkerCompleted += delegate
+          ReturnRecrodByCode(code);
+        }
+        else
         {
-          if (record!=null&&record.ID > 0)
+          var bg = new BackgroundWorker();
+          var record = new SegmentationInStoreRecord();
+          bg.DoWork += delegate
           {
-            mRecordList.Insert(0, record);
-            RefreshRecordUi();
-          }
-        };
-        bg.RunWorkerAsync();
+            record = doInsertAndBack(code, goodsId);
+          };
+          bg.RunWorkerCompleted += delegate
+          {
+            if (record != null && record.ID > 0)
+            {
+              mRecordList.Insert(0, record);
+              RefreshRecordUi();
+            }
+          };
+          bg.RunWorkerAsync();
+        }
       }
 
+    }
 
+    private void ReturnRecrodByCode(string code)
+    {
+      using (var session = LocalDmoSession.New())
+      {
+        var record = GetLocalRecordByBarCode(session, code);
+        if (record != null)
+        {
+          var updateDom = new DQUpdateDom(typeof(SegmentationInStoreRecord));
+          updateDom.Where.Conditions.Add(DQCondition.EQ("ID", record.ID));
+          updateDom.Columns.Add(new DQUpdateColumn("IsDeleted", true));
+          updateDom.Columns.Add(new DQUpdateColumn("WillBeDeleted", true));
+          updateDom.Columns.Add(new DQUpdateColumn("DeleteTime", DateTime.Now));
+          session.ExecuteNonQuery(updateDom);
+
+
+          var fdrecord = mRecordList.FirstOrDefault(x => x.BarCode == code);
+          if (fdrecord != null)
+          {
+            mRecordList.Remove(fdrecord);
+            mReturnRecordList.Insert(0, fdrecord);
+            gridSubmited.DataSource = mRecordList;
+            gridReturn.DataSource = mReturnRecordList;
+          }
+        }
+        session.Commit();
+      }
+      
+    }
+
+    private SegmentationInStoreRecord GetLocalRecordByBarCode(IDmoSession session, string code)
+    {
+      var query = new DmoQuery(typeof(SegmentationInStoreRecord));
+      query.Where.Conditions.Add(DQCondition.EQ("BarCode", code));
+      var list = session.ExecuteList(query).Cast<SegmentationInStoreRecord>().ToList();
+      if (list.Count > 0)
+      {
+        return list[0];
+      }
+      return null;
     }
 
     private void RefreshRecordUi()
@@ -457,22 +560,22 @@ namespace SegmentationInStore
         var res = session.ExecuteScalar(query);
         return res != null;
       }
-    } 
+    }
 
     void SetStoreInfo(SegmentationInStoreRecord record)
     {
       this.Invoke(new Action(() =>
       {
-          var storeid = Convert.ToInt64(cbxStore.SelectedValue);
-          var storename = cbxStore.Text;
-          if (!string.IsNullOrWhiteSpace(storename))
-          {
-            record.Store_ID = storeid;
-            record.Store_Name = storename;
-          }
-        
+        var storeid = Convert.ToInt64(cbxStore.SelectedValue);
+        var storename = cbxStore.Text;
+        if (!string.IsNullOrWhiteSpace(storename))
+        {
+          record.Store_ID = storeid;
+          record.Store_Name = storename;
+        }
+
       }));
-     
+
     }
 
     private static readonly object _insertObj = new object();
@@ -512,7 +615,7 @@ namespace SegmentationInStore
                 record.Goods_Spec = weight.Goods_Spec;
                 record.Weight = weight.Weight;
                 record.ProductBatch = weight.ProductBatch;
-                record.BiaoShi = weight.BiaoShi;
+                record.BiaoShi = cbxWorkUnit.Text;
                 record.CardBarCode = weight.CardBarCode;
               }
             }
@@ -561,7 +664,7 @@ namespace SegmentationInStore
           record.Goods_Spec = dmo.Goods_Spec;
           record.Weight = dmo.Weight;
           record.ProductBatch = dmo.ProductBatch;
-          record.BiaoShi = dmo.BiaoShi;
+          record.BiaoShi = cbxWorkUnit.Text;
           record.CardBarCode = dmo.CardBarCode;
           var id = LocalDmoSession.Insert(record);
           return record;
@@ -569,5 +672,64 @@ namespace SegmentationInStore
       }
     }
 
+    private void btnSubmit_Click(object sender, EventArgs e)
+    {
+      try
+      {
+        btnSubmit.Enabled = false;
+        Application.DoEvents();
+
+        if (LoginRpcUtil.TestConnection(1000))
+        {
+          if (SegmentationInStoreRpc.GetInstance().IsSyncSucessed())
+          {
+            var id = RpcFacade.Call<long>("/MainSystem/B3ClientService/Rpcs/BillRpc/SegmentationInStoreRecordRpc/CreateTodayB3ProductInStoreBill");
+            if (id > 0)
+            {
+              MessageBox.Show("同步完成,创建成品入库单:" + id);
+            }
+            else if (id == -1)
+            {
+              MessageBox.Show("同步完成");
+            }
+            else
+            {
+              MessageBox.Show("同步失败");
+            }
+          }
+          else
+          {
+            MessageBox.Show("请等待数据同步完成");
+          }
+        }
+        else
+        {
+          MessageBox.Show("没有网络，请通知管理员");
+        }
+      }
+      catch (Exception exception)
+      {
+        LogUtil.Error(exception);
+        MessageBox.Show(exception.ToString());
+      }
+      finally
+      {
+        btnSubmit.Enabled = true;
+      }
+    }
+
+    private bool _isRetrun;
+    private void btnIsReturn_Click(object sender, EventArgs e)
+    {
+      if (_isRetrun)
+      {
+        btnIsReturn.BackColor = SystemColors.Control;
+      }
+      else
+      {
+        btnIsReturn.BackColor = Color.Green;
+      }
+      _isRetrun = !_isRetrun;
+    }
   }
 }

SegmentationWeight/SegmentationWeightForm.cs

@@ -645,7 +645,7 @@ namespace SegmentationWeight
       entity.Place = "青岛莱西市珠海路5号";
       entity.TelNumber = "0532-88488888";
       entity.BarCode = record.BarCode;
-      entity._2DQRCode = string.Format(ButcherAppContext.Context.UrlConfig.OutAddress + "?code={0}&&gid={1}", entity.BarCode, record.Goods_ID);
+      entity._2DQRCode = string.Format(ButcherAppContext.Context.UrlConfig.OutAddress + "?code={0}&gid={1}", entity.BarCode, record.Goods_ID);
       entity.Weight = record.Weight.ToString("#0.##");
       return entity;
     }

TrunksIousOutInStore/TrunksIousOutInStoreForm.Designer.cs

@@ -28,7 +28,6 @@
     /// </summary>
     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 dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -40,19 +39,19 @@
       this.enableWeight = new System.Windows.Forms.CheckBox();
       this.panel2 = new System.Windows.Forms.Panel();
       this.lblChengZhong = new System.Windows.Forms.Label();
-      this.btnNetStatus = new System.Windows.Forms.Button();
       this.btnWeightSet = new System.Windows.Forms.Button();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
-      this.btnCreateBill = new System.Windows.Forms.Button();
-      this.btnSubmit = new System.Windows.Forms.Button();
-      this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+      this.panel3 = new System.Windows.Forms.Panel();
+      this.cbxBatch = new System.Windows.Forms.ComboBox();
+      this.cbxWorkUnit = new System.Windows.Forms.ComboBox();
+      this.label6 = new System.Windows.Forms.Label();
+      this.label5 = new System.Windows.Forms.Label();
+      this.cbxWorkShop = new System.Windows.Forms.ComboBox();
+      this.label4 = new System.Windows.Forms.Label();
+      this.cbxStore = new System.Windows.Forms.ComboBox();
+      this.label1 = new System.Windows.Forms.Label();
       this.groupBox2 = new System.Windows.Forms.GroupBox();
       this.gridChecked = new BWP.WinFormControl.UDataGridView();
-      this.序号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.产品名称 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.数量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.groupBox1 = new System.Windows.Forms.GroupBox();
       this.gridUnCheck = new System.Windows.Forms.DataGridView();
       this.uncheck序号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -60,7 +59,18 @@
       this.uncheck产品名称 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.uncheck数量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.uncheck重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-      this.timerChectNetStatus = new System.Windows.Forms.Timer(this.components);
+      this.picSyncStatus = new System.Windows.Forms.PictureBox();
+      this.picNetStatus = new System.Windows.Forms.PictureBox();
+      this.label11 = new System.Windows.Forms.Label();
+      this.label10 = new System.Windows.Forms.Label();
+      this.btnEnableWeight = new System.Windows.Forms.Button();
+      this.序号 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.产品名称 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.数量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.入库重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.胴体重量 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+      this.损耗 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
       this.splitContainer1.Panel1.SuspendLayout();
       this.splitContainer1.Panel2.SuspendLayout();
@@ -69,15 +79,14 @@
       this.panel2.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
       this.splitContainer2.Panel1.SuspendLayout();
-      this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
-      this.splitContainer3.Panel1.SuspendLayout();
-      this.splitContainer3.SuspendLayout();
+      this.panel3.SuspendLayout();
       this.groupBox2.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.gridChecked)).BeginInit();
       this.groupBox1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.gridUnCheck)).BeginInit();
+      ((System.ComponentModel.ISupportInitialize)(this.picSyncStatus)).BeginInit();
+      ((System.ComponentModel.ISupportInitialize)(this.picNetStatus)).BeginInit();
       this.SuspendLayout();
       // 
       // splitContainer1
@@ -96,22 +105,26 @@
       // splitContainer1.Panel2
       // 
       this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-      this.splitContainer1.Size = new System.Drawing.Size(1276, 741);
-      this.splitContainer1.SplitterDistance = 130;
-      this.splitContainer1.SplitterWidth = 1;
+      this.splitContainer1.Size = new System.Drawing.Size(1085, 616);
+      this.splitContainer1.SplitterDistance = 167;
       this.splitContainer1.TabIndex = 0;
       // 
       // panel1
       // 
       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.btnEnableWeight);
+      this.panel1.Controls.Add(this.picSyncStatus);
+      this.panel1.Controls.Add(this.picNetStatus);
+      this.panel1.Controls.Add(this.label11);
+      this.panel1.Controls.Add(this.label10);
+      this.panel1.Controls.Add(this.panel3);
       this.panel1.Controls.Add(this.enableWeight);
       this.panel1.Controls.Add(this.panel2);
-      this.panel1.Controls.Add(this.btnNetStatus);
       this.panel1.Controls.Add(this.btnWeightSet);
       this.panel1.Location = new System.Drawing.Point(11, 3);
       this.panel1.Name = "panel1";
-      this.panel1.Size = new System.Drawing.Size(1251, 100);
+      this.panel1.Size = new System.Drawing.Size(1060, 159);
       this.panel1.TabIndex = 1;
       // 
       // enableWeight
@@ -119,7 +132,7 @@
       this.enableWeight.AutoCheck = false;
       this.enableWeight.AutoSize = true;
       this.enableWeight.Font = new System.Drawing.Font("宋体", 18F);
-      this.enableWeight.Location = new System.Drawing.Point(249, 8);
+      this.enableWeight.Location = new System.Drawing.Point(412, 23);
       this.enableWeight.Name = "enableWeight";
       this.enableWeight.Size = new System.Drawing.Size(125, 28);
       this.enableWeight.TabIndex = 33;
@@ -133,7 +146,7 @@
       this.panel2.Controls.Add(this.lblChengZhong);
       this.panel2.Location = new System.Drawing.Point(3, 8);
       this.panel2.Name = "panel2";
-      this.panel2.Size = new System.Drawing.Size(237, 78);
+      this.panel2.Size = new System.Drawing.Size(237, 88);
       this.panel2.TabIndex = 32;
       // 
       // lblChengZhong
@@ -141,29 +154,18 @@
       this.lblChengZhong.AutoSize = true;
       this.lblChengZhong.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
       this.lblChengZhong.ForeColor = System.Drawing.Color.Red;
-      this.lblChengZhong.Location = new System.Drawing.Point(15, 18);
+      this.lblChengZhong.Location = new System.Drawing.Point(14, 22);
       this.lblChengZhong.Name = "lblChengZhong";
       this.lblChengZhong.Size = new System.Drawing.Size(97, 40);
       this.lblChengZhong.TabIndex = 0;
       this.lblChengZhong.Text = "0.00";
       // 
-      // btnNetStatus
-      // 
-      this.btnNetStatus.Enabled = false;
-      this.btnNetStatus.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.btnNetStatus.Location = new System.Drawing.Point(515, 8);
-      this.btnNetStatus.Name = "btnNetStatus";
-      this.btnNetStatus.Size = new System.Drawing.Size(120, 46);
-      this.btnNetStatus.TabIndex = 0;
-      this.btnNetStatus.Text = "网络畅通";
-      this.btnNetStatus.UseVisualStyleBackColor = true;
-      // 
       // btnWeightSet
       // 
-      this.btnWeightSet.Font = new System.Drawing.Font("宋体", 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.btnWeightSet.Location = new System.Drawing.Point(249, 53);
+      this.btnWeightSet.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.btnWeightSet.Location = new System.Drawing.Point(3, 108);
       this.btnWeightSet.Name = "btnWeightSet";
-      this.btnWeightSet.Size = new System.Drawing.Size(111, 33);
+      this.btnWeightSet.Size = new System.Drawing.Size(111, 37);
       this.btnWeightSet.TabIndex = 0;
       this.btnWeightSet.Text = "称设置";
       this.btnWeightSet.UseVisualStyleBackColor = true;
@@ -178,54 +180,105 @@
       // 
       // splitContainer2.Panel1
       // 
-      this.splitContainer2.Panel1.Controls.Add(this.btnCreateBill);
-      this.splitContainer2.Panel1.Controls.Add(this.btnSubmit);
-      // 
-      // splitContainer2.Panel2
-      // 
-      this.splitContainer2.Panel2.Controls.Add(this.splitContainer3);
-      this.splitContainer2.Size = new System.Drawing.Size(1276, 610);
-      this.splitContainer2.SplitterDistance = 260;
+      this.splitContainer2.Panel1.Controls.Add(this.groupBox2);
+      this.splitContainer2.Panel1.Controls.Add(this.groupBox1);
+      this.splitContainer2.Size = new System.Drawing.Size(1085, 445);
+      this.splitContainer2.SplitterDistance = 763;
       this.splitContainer2.SplitterWidth = 1;
       this.splitContainer2.TabIndex = 0;
       // 
-      // btnCreateBill
-      // 
-      this.btnCreateBill.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.btnCreateBill.Location = new System.Drawing.Point(41, 275);
-      this.btnCreateBill.Name = "btnCreateBill";
-      this.btnCreateBill.Size = new System.Drawing.Size(156, 46);
-      this.btnCreateBill.TabIndex = 0;
-      this.btnCreateBill.Text = "创建领料";
-      this.btnCreateBill.UseVisualStyleBackColor = true;
-      this.btnCreateBill.Click += new System.EventHandler(this.btnCreateBill_Click);
-      // 
-      // btnSubmit
-      // 
-      this.btnSubmit.Font = new System.Drawing.Font("宋体", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-      this.btnSubmit.Location = new System.Drawing.Point(45, 451);
-      this.btnSubmit.Name = "btnSubmit";
-      this.btnSubmit.Size = new System.Drawing.Size(156, 46);
-      this.btnSubmit.TabIndex = 0;
-      this.btnSubmit.Text = "提交";
-      this.btnSubmit.UseVisualStyleBackColor = true;
-      this.btnSubmit.Visible = false;
-      // 
-      // splitContainer3
-      // 
-      this.splitContainer3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.splitContainer3.Location = new System.Drawing.Point(0, 0);
-      this.splitContainer3.Name = "splitContainer3";
-      // 
-      // splitContainer3.Panel1
-      // 
-      this.splitContainer3.Panel1.Controls.Add(this.groupBox2);
-      this.splitContainer3.Panel1.Controls.Add(this.groupBox1);
-      this.splitContainer3.Size = new System.Drawing.Size(1015, 610);
-      this.splitContainer3.SplitterDistance = 780;
-      this.splitContainer3.SplitterWidth = 1;
-      this.splitContainer3.TabIndex = 0;
+      // panel3
+      // 
+      this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+      this.panel3.Controls.Add(this.cbxStore);
+      this.panel3.Controls.Add(this.label1);
+      this.panel3.Controls.Add(this.cbxBatch);
+      this.panel3.Controls.Add(this.cbxWorkUnit);
+      this.panel3.Controls.Add(this.label6);
+      this.panel3.Controls.Add(this.label5);
+      this.panel3.Controls.Add(this.cbxWorkShop);
+      this.panel3.Controls.Add(this.label4);
+      this.panel3.Location = new System.Drawing.Point(597, 6);
+      this.panel3.Name = "panel3";
+      this.panel3.Size = new System.Drawing.Size(234, 153);
+      this.panel3.TabIndex = 35;
+      // 
+      // cbxBatch
+      // 
+      this.cbxBatch.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cbxBatch.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.cbxBatch.FormattingEnabled = true;
+      this.cbxBatch.Location = new System.Drawing.Point(75, 82);
+      this.cbxBatch.Name = "cbxBatch";
+      this.cbxBatch.Size = new System.Drawing.Size(121, 24);
+      this.cbxBatch.TabIndex = 39;
+      // 
+      // cbxWorkUnit
+      // 
+      this.cbxWorkUnit.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cbxWorkUnit.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.cbxWorkUnit.FormattingEnabled = true;
+      this.cbxWorkUnit.Location = new System.Drawing.Point(75, 45);
+      this.cbxWorkUnit.Name = "cbxWorkUnit";
+      this.cbxWorkUnit.Size = new System.Drawing.Size(121, 24);
+      this.cbxWorkUnit.TabIndex = 40;
+      // 
+      // label6
+      // 
+      this.label6.AutoSize = true;
+      this.label6.Location = new System.Drawing.Point(9, 89);
+      this.label6.Name = "label6";
+      this.label6.Size = new System.Drawing.Size(65, 12);
+      this.label6.TabIndex = 36;
+      this.label6.Text = "生产批次：";
+      // 
+      // label5
+      // 
+      this.label5.AutoSize = true;
+      this.label5.Location = new System.Drawing.Point(9, 51);
+      this.label5.Name = "label5";
+      this.label5.Size = new System.Drawing.Size(65, 12);
+      this.label5.TabIndex = 37;
+      this.label5.Text = "工作单元：";
+      // 
+      // cbxWorkShop
+      // 
+      this.cbxWorkShop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cbxWorkShop.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.cbxWorkShop.FormattingEnabled = true;
+      this.cbxWorkShop.Location = new System.Drawing.Point(75, 8);
+      this.cbxWorkShop.Name = "cbxWorkShop";
+      this.cbxWorkShop.Size = new System.Drawing.Size(121, 24);
+      this.cbxWorkShop.TabIndex = 41;
+      // 
+      // label4
+      // 
+      this.label4.AutoSize = true;
+      this.label4.Location = new System.Drawing.Point(9, 16);
+      this.label4.Name = "label4";
+      this.label4.Size = new System.Drawing.Size(65, 12);
+      this.label4.TabIndex = 38;
+      this.label4.Text = "车    间：";
+      // 
+      // cbxStore
+      // 
+      this.cbxStore.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.cbxStore.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.cbxStore.FormattingEnabled = true;
+      this.cbxStore.Location = new System.Drawing.Point(75, 117);
+      this.cbxStore.Name = "cbxStore";
+      this.cbxStore.Size = new System.Drawing.Size(121, 24);
+      this.cbxStore.TabIndex = 43;
+      // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Location = new System.Drawing.Point(9, 124);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(65, 12);
+      this.label1.TabIndex = 42;
+      this.label1.Text = "仓    库：";
       // 
       // groupBox2
       // 
@@ -233,10 +286,10 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBox2.Controls.Add(this.gridChecked);
-      this.groupBox2.Location = new System.Drawing.Point(14, 259);
+      this.groupBox2.Location = new System.Drawing.Point(48, 252);
       this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Size = new System.Drawing.Size(755, 340);
-      this.groupBox2.TabIndex = 1;
+      this.groupBox2.Size = new System.Drawing.Size(667, 179);
+      this.groupBox2.TabIndex = 3;
       this.groupBox2.TabStop = false;
       this.groupBox2.Text = "已提交";
       // 
@@ -263,7 +316,9 @@
             this.条码,
             this.产品名称,
             this.数量,
-            this.重量});
+            this.入库重量,
+            this.胴体重量,
+            this.损耗});
       this.gridChecked.Dock = System.Windows.Forms.DockStyle.Fill;
       this.gridChecked.Location = new System.Drawing.Point(3, 17);
       this.gridChecked.MultiSelect = false;
@@ -275,57 +330,18 @@
       this.gridChecked.RowsDefaultCellStyle = dataGridViewCellStyle3;
       this.gridChecked.RowTemplate.Height = 23;
       this.gridChecked.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.gridChecked.Size = new System.Drawing.Size(749, 320);
+      this.gridChecked.Size = new System.Drawing.Size(661, 159);
       this.gridChecked.TabIndex = 4;
       // 
-      // 序号
-      // 
-      this.序号.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
-      this.序号.DataPropertyName = "ID";
-      this.序号.HeaderText = "序号";
-      this.序号.Name = "序号";
-      this.序号.ReadOnly = true;
-      this.序号.Width = 60;
-      // 
-      // 条码
-      // 
-      this.条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-      this.条码.DataPropertyName = "BarCode";
-      this.条码.HeaderText = "条码";
-      this.条码.Name = "条码";
-      this.条码.ReadOnly = true;
-      // 
-      // 产品名称
-      // 
-      this.产品名称.DataPropertyName = "Goods_Name";
-      this.产品名称.HeaderText = "产品名称";
-      this.产品名称.Name = "产品名称";
-      this.产品名称.ReadOnly = true;
-      this.产品名称.Width = 120;
-      // 
-      // 数量
-      // 
-      this.数量.DataPropertyName = "Number";
-      this.数量.HeaderText = "数量";
-      this.数量.Name = "数量";
-      this.数量.ReadOnly = true;
-      // 
-      // 重量
-      // 
-      this.重量.DataPropertyName = "Weight";
-      this.重量.HeaderText = "重量";
-      this.重量.Name = "重量";
-      this.重量.ReadOnly = true;
-      // 
       // groupBox1
       // 
       this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.groupBox1.Controls.Add(this.gridUnCheck);
-      this.groupBox1.Location = new System.Drawing.Point(14, 15);
+      this.groupBox1.Location = new System.Drawing.Point(48, 12);
       this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Size = new System.Drawing.Size(761, 220);
-      this.groupBox1.TabIndex = 0;
+      this.groupBox1.Size = new System.Drawing.Size(670, 220);
+      this.groupBox1.TabIndex = 2;
       this.groupBox1.TabStop = false;
       this.groupBox1.Text = "待提交";
       // 
@@ -364,7 +380,7 @@
       this.gridUnCheck.RowsDefaultCellStyle = dataGridViewCellStyle6;
       this.gridUnCheck.RowTemplate.Height = 23;
       this.gridUnCheck.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-      this.gridUnCheck.Size = new System.Drawing.Size(755, 200);
+      this.gridUnCheck.Size = new System.Drawing.Size(664, 200);
       this.gridUnCheck.TabIndex = 3;
       // 
       // uncheck序号
@@ -406,17 +422,112 @@
       this.uncheck重量.Name = "uncheck重量";
       this.uncheck重量.ReadOnly = true;
       // 
-      // timerChectNetStatus
+      // picSyncStatus
+      // 
+      this.picSyncStatus.ErrorImage = null;
+      this.picSyncStatus.InitialImage = null;
+      this.picSyncStatus.Location = new System.Drawing.Point(321, 59);
+      this.picSyncStatus.Name = "picSyncStatus";
+      this.picSyncStatus.Size = new System.Drawing.Size(30, 30);
+      this.picSyncStatus.TabIndex = 42;
+      this.picSyncStatus.TabStop = false;
+      // 
+      // picNetStatus
+      // 
+      this.picNetStatus.ErrorImage = null;
+      this.picNetStatus.InitialImage = null;
+      this.picNetStatus.Location = new System.Drawing.Point(321, 14);
+      this.picNetStatus.Name = "picNetStatus";
+      this.picNetStatus.Size = new System.Drawing.Size(30, 30);
+      this.picNetStatus.TabIndex = 43;
+      this.picNetStatus.TabStop = false;
+      // 
+      // label11
+      // 
+      this.label11.AutoSize = true;
+      this.label11.Location = new System.Drawing.Point(286, 70);
+      this.label11.Name = "label11";
+      this.label11.Size = new System.Drawing.Size(29, 12);
+      this.label11.TabIndex = 40;
+      this.label11.Text = "同步";
+      // 
+      // label10
+      // 
+      this.label10.AutoSize = true;
+      this.label10.Location = new System.Drawing.Point(286, 22);
+      this.label10.Name = "label10";
+      this.label10.Size = new System.Drawing.Size(29, 12);
+      this.label10.TabIndex = 41;
+      this.label10.Text = "网络";
+      // 
+      // btnEnableWeight
+      // 
+      this.btnEnableWeight.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+      this.btnEnableWeight.Location = new System.Drawing.Point(129, 108);
+      this.btnEnableWeight.Name = "btnEnableWeight";
+      this.btnEnableWeight.Size = new System.Drawing.Size(111, 37);
+      this.btnEnableWeight.TabIndex = 44;
+      this.btnEnableWeight.Text = "启用称重";
+      this.btnEnableWeight.UseVisualStyleBackColor = true;
       // 
-      this.timerChectNetStatus.Enabled = true;
-      this.timerChectNetStatus.Interval = 2000;
-      this.timerChectNetStatus.Tick += new System.EventHandler(this.timerChectNetStatus_Tick);
+      // 序号
+      // 
+      this.序号.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.序号.DataPropertyName = "ID";
+      this.序号.HeaderText = "序号";
+      this.序号.Name = "序号";
+      this.序号.ReadOnly = true;
+      this.序号.Width = 65;
+      // 
+      // 条码
+      // 
+      this.条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.条码.DataPropertyName = "BarCode";
+      this.条码.HeaderText = "条码";
+      this.条码.Name = "条码";
+      this.条码.ReadOnly = true;
+      this.条码.Width = 65;
+      // 
+      // 产品名称
+      // 
+      this.产品名称.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;
+      this.产品名称.DataPropertyName = "Goods_Name";
+      this.产品名称.HeaderText = "产品名称";
+      this.产品名称.Name = "产品名称";
+      this.产品名称.ReadOnly = true;
+      this.产品名称.Width = 97;
+      // 
+      // 数量
+      // 
+      this.数量.DataPropertyName = "Number";
+      this.数量.HeaderText = "数量";
+      this.数量.Name = "数量";
+      this.数量.ReadOnly = true;
+      // 
+      // 入库重量
+      // 
+      this.入库重量.DataPropertyName = "Weight";
+      this.入库重量.HeaderText = "入库重量";
+      this.入库重量.Name = "入库重量";
+      this.入库重量.ReadOnly = true;
+      // 
+      // 胴体重量
+      // 
+      this.胴体重量.HeaderText = "胴体重量";
+      this.胴体重量.Name = "胴体重量";
+      this.胴体重量.ReadOnly = true;
+      // 
+      // 损耗
+      // 
+      this.损耗.HeaderText = "损耗";
+      this.损耗.Name = "损耗";
+      this.损耗.ReadOnly = true;
       // 
       // TrunksIousOutInStoreForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.ClientSize = new System.Drawing.Size(1276, 741);
+      this.ClientSize = new System.Drawing.Size(1085, 616);
       this.Controls.Add(this.splitContainer1);
       this.KeyPreview = true;
       this.MinimizeBox = false;
@@ -436,16 +547,16 @@
       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.splitContainer3.Panel1.ResumeLayout(false);
-      ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
-      this.splitContainer3.ResumeLayout(false);
+      this.panel3.ResumeLayout(false);
+      this.panel3.PerformLayout();
       this.groupBox2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.gridChecked)).EndInit();
       this.groupBox1.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.gridUnCheck)).EndInit();
+      ((System.ComponentModel.ISupportInitialize)(this.picSyncStatus)).EndInit();
+      ((System.ComponentModel.ISupportInitialize)(this.picNetStatus)).EndInit();
       this.ResumeLayout(false);
 
     }
@@ -455,28 +566,39 @@
     private System.Windows.Forms.SplitContainer splitContainer1;
     private System.Windows.Forms.Panel panel1;
     private System.Windows.Forms.SplitContainer splitContainer2;
-    private System.Windows.Forms.Button btnNetStatus;
-    private System.Windows.Forms.SplitContainer splitContainer3;
-    private System.Windows.Forms.Button btnCreateBill;
-    private System.Windows.Forms.Button btnSubmit;
     private System.Windows.Forms.Button btnWeightSet;
-    private System.Windows.Forms.GroupBox groupBox2;
-    private System.Windows.Forms.GroupBox groupBox1;
-    private System.Windows.Forms.DataGridView gridUnCheck;
-    private BWP.WinFormControl.UDataGridView gridChecked;
     private System.Windows.Forms.CheckBox enableWeight;
     private System.Windows.Forms.Panel panel2;
     private System.Windows.Forms.Label lblChengZhong;
-    private System.Windows.Forms.Timer timerChectNetStatus;
-    private System.Windows.Forms.DataGridViewTextBoxColumn 序号;
-    private System.Windows.Forms.DataGridViewTextBoxColumn 条码;
-    private System.Windows.Forms.DataGridViewTextBoxColumn 产品名称;
-    private System.Windows.Forms.DataGridViewTextBoxColumn 数量;
-    private System.Windows.Forms.DataGridViewTextBoxColumn 重量;
+    private System.Windows.Forms.Panel panel3;
+    private System.Windows.Forms.ComboBox cbxBatch;
+    private System.Windows.Forms.ComboBox cbxWorkUnit;
+    private System.Windows.Forms.Label label6;
+    private System.Windows.Forms.Label label5;
+    private System.Windows.Forms.ComboBox cbxWorkShop;
+    private System.Windows.Forms.Label label4;
+    private System.Windows.Forms.ComboBox cbxStore;
+    private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.GroupBox groupBox2;
+    private BWP.WinFormControl.UDataGridView gridChecked;
+    private System.Windows.Forms.GroupBox groupBox1;
+    private System.Windows.Forms.DataGridView gridUnCheck;
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck序号;
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck条码;
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck产品名称;
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck数量;
     private System.Windows.Forms.DataGridViewTextBoxColumn uncheck重量;
+    private System.Windows.Forms.PictureBox picSyncStatus;
+    private System.Windows.Forms.PictureBox picNetStatus;
+    private System.Windows.Forms.Label label11;
+    private System.Windows.Forms.Label label10;
+    private System.Windows.Forms.Button btnEnableWeight;
+    private System.Windows.Forms.DataGridViewTextBoxColumn 序号;
+    private System.Windows.Forms.DataGridViewTextBoxColumn 条码;
+    private System.Windows.Forms.DataGridViewTextBoxColumn 产品名称;
+    private System.Windows.Forms.DataGridViewTextBoxColumn 数量;
+    private System.Windows.Forms.DataGridViewTextBoxColumn 入库重量;
+    private System.Windows.Forms.DataGridViewTextBoxColumn 胴体重量;
+    private System.Windows.Forms.DataGridViewTextBoxColumn 损耗;
   }
 }

TrunksIousOutInStore/TrunksIousOutInStoreForm.resx

@@ -129,7 +129,13 @@
   <metadata name="数量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="重量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="入库重量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="胴体重量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="损耗.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="uncheck序号.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -147,9 +153,6 @@
   <metadata name="uncheck重量.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="timerChectNetStatus.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>180, 26</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>65</value>
   </metadata>

WeighAndGrading/GradeFrom.cs

@@ -464,7 +464,7 @@ namespace WeighAndGrading
 
       string indexCode = maxindex.ToString("D6");
 
-      entity.BarCode = string.Format("WF{0}{1:00000}", DateTime.Today.ToString("yyyyMMdd"), indexCode);
+      entity.BarCode = string.Format("A26091201{0}{1:00000}", DateTime.Today.ToString("yyyyMMdd"), indexCode);
 //      entity._2DQRCode = string.Format(ButcherAppContext.Context.UrlConfig.OutAddress+"?code={0}&name={1}", entity.BarCode, goodsName);
       entity._2DQRCode = string.Format(ButcherAppContext.Context.UrlConfig.OutAddress+"?code={0}", entity.BarCode);