.

ButcherManageClient/Login.cs

@@ -33,10 +33,10 @@ namespace ButcherManageClient
     {
       InitializeComponent();
       userNameTxt.Text = ButcherAppContext.Context.UserConfig.UserName;
-      pwdTxt.Text = "";
-#if DEBUG
       pwdTxt.Text = "123";
-#endif
+//#if DEBUG
+//      pwdTxt.Text = "123";
+//#endif
     }
 
     private void settingBtn_Click(object sender, EventArgs e)
@@ -69,8 +69,8 @@ namespace ButcherManageClient
         ButcherAppContext.Context.UserConfig.Connection = false;
       }
       var form = AfterLoginUtil.CreateForm(ButcherAppContext.Context.UserConfig.Role);
-      //var form = AfterLoginUtil.CreateForm("分割入库");
-      // var form = AfterLoginUtil.CreateForm("分割称重");
+//      var form = AfterLoginUtil.CreateForm("分割入库");
+//       var form = AfterLoginUtil.CreateForm("分割称重");
       if (form == null)
         throw new Exception("权限不符");
       form.FormClosing += delegate { SubFormClosing(); };

SegmentationInStore/SegmentationInStoreForm.Designer.cs

@@ -36,21 +36,27 @@
       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.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.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.btnSubmit = new System.Windows.Forms.Button();
       this.picNetStatus = new System.Windows.Forms.PictureBox();
       this.label10 = new System.Windows.Forms.Label();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
@@ -64,7 +70,13 @@
       this.submited日期 = new System.Windows.Forms.DataGridViewTextBoxColumn();
       this.groupBox2 = new System.Windows.Forms.GroupBox();
       this.gridReturn = 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.btnIsReturn = new System.Windows.Forms.Button();
+      this.btnSubmit = 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();
@@ -72,22 +84,11 @@
       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();
       this.splitContainer1.SuspendLayout();
+      this.panel3.SuspendLayout();
       this.groupBox4.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.picSyncStatus)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.picNetStatus)).BeginInit();
@@ -101,7 +102,6 @@
       ((System.ComponentModel.ISupportInitialize)(this.gridReturn)).BeginInit();
       this.groupBox1.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.gridUnScan)).BeginInit();
-      this.panel3.SuspendLayout();
       this.SuspendLayout();
       // 
       // splitContainer1
@@ -130,6 +130,78 @@
       this.splitContainer1.SplitterDistance = 139;
       this.splitContainer1.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.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 = "车间：";
+      // 
       // txtBarCode
       // 
       this.txtBarCode.Enabled = false;
@@ -154,6 +226,7 @@
       // richTextBox1
       // 
       this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.richTextBox1.Enabled = false;
       this.richTextBox1.HideSelection = false;
       this.richTextBox1.Location = new System.Drawing.Point(3, 17);
       this.richTextBox1.Name = "richTextBox1";
@@ -190,17 +263,6 @@
       this.label11.TabIndex = 42;
       this.label11.Text = "同步";
       // 
-      // btnSubmit
-      // 
-      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;
@@ -399,6 +461,52 @@
       this.gridReturn.Size = new System.Drawing.Size(465, 126);
       this.gridReturn.TabIndex = 3;
       // 
+      // 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;
+      // 
       // btnIsReturn
       // 
       this.btnIsReturn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -410,6 +518,17 @@
       this.btnIsReturn.UseVisualStyleBackColor = true;
       this.btnIsReturn.Click += new System.EventHandler(this.btnIsReturn_Click);
       // 
+      // btnSubmit
+      // 
+      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);
+      // 
       // groupBox1
       // 
       this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -508,124 +627,6 @@
       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);
@@ -646,6 +647,8 @@
       this.splitContainer1.Panel2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
       this.splitContainer1.ResumeLayout(false);
+      this.panel3.ResumeLayout(false);
+      this.panel3.PerformLayout();
       this.groupBox4.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.picSyncStatus)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.picNetStatus)).EndInit();
@@ -659,8 +662,6 @@
       ((System.ComponentModel.ISupportInitialize)(this.gridReturn)).EndInit();
       this.groupBox1.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.gridUnScan)).EndInit();
-      this.panel3.ResumeLayout(false);
-      this.panel3.PerformLayout();
       this.ResumeLayout(false);
 
     }

SegmentationInStore/SegmentationInStoreForm.cs

@@ -462,6 +462,10 @@ namespace SegmentationInStore
         {
           goodsId = UrlUtil.GetValueByKey("GID", barCode);
         }
+        if (string.IsNullOrWhiteSpace(goodsId))
+        {
+          goodsId = UrlUtil.GetValueByKey("ID", barCode);
+        }
 
         if (string.IsNullOrWhiteSpace(code))
         {
@@ -615,7 +619,10 @@ namespace SegmentationInStore
                 record.Goods_Spec = weight.Goods_Spec;
                 record.Weight = weight.Weight;
                 record.ProductBatch = weight.ProductBatch;
-                record.BiaoShi = cbxWorkUnit.Text;
+                this.Invoke(new Action(() =>
+                {
+                  record.BiaoShi = cbxWorkUnit.Text;
+                }) );
                 record.CardBarCode = weight.CardBarCode;
               }
             }

SegmentationWeight/SegmentationWeightForm.cs

@@ -631,7 +631,13 @@ namespace SegmentationWeight
     void PrintGoodsEntity(SegmentationWeightRecord record)
     {
       var entity = CreatePrintEntity(record);
+#if DEBUG
       SegmentationWeightPrint.Print(entity);
+#endif
+#if !DEBUG
+       SegmentationWeightPrint.Print5050(entity);
+#endif
+
     }
 
     PrintEntity CreatePrintEntity(SegmentationWeightRecord record)
@@ -810,7 +816,12 @@ namespace SegmentationWeight
       entity.Number = mWeightRecords.Count.ToString();
       entity.BarCode = barcode;
       entity.AccountingUnit_Name = "青岛万福集团股份有限公司";
+#if DEBUG
       SegmentationWeightPrint.PrintEnd(entity);
+#endif
+#if !DEBUG
+       SegmentationWeightPrint.PrintEnd5050(entity);
+#endif
     }
 
     private string GetEndBarCode()

SegmentationWeight/SegmentationWeightPrint.cs

@@ -55,6 +55,45 @@ namespace SegmentationWeight
       PrintAPI.B_Print_Out(1);
       PrintAPI.B_ClosePrn();
     }
+
+    public static void PrintEnd5050(PrintEntity entity)
+    {
+      PrintAPI.B_GetUSBBufferLen();
+      PrintAPI.B_EnumUSB(new byte[128]);
+      PrintAPI.B_CreateUSBPort(1);
+
+      PrintAPI.B_Prn_Text_TrueType(40, 25, 31, "宋体", 1, 700, 0, 0, 0, "C1", "万福");
+
+      PrintAPI.B_Prn_Text_TrueType(40, 60, 27, "宋体", 1, 400, 0, 0, 0, "C4", string.Format("总重量：{0}", entity.Weight));
+
+      PrintAPI.B_Prn_Text_TrueType(40, 95, 27, "宋体", 1, 400, 0, 0, 0, "C6", string.Format("总数量：{0}", entity.Number));
+
+      PrintAPI.B_Prn_Barcode(10, 320, 0, "1", 3, 22, 35, 'N', entity.BarCode.Replace("A26091201", ""));
+      PrintAPI.B_Prn_Text_TrueType(40, 400, 25, "宋体", 1, 500, 0, 0, 0, "C9", entity.BarCode.Replace("A26091201", ""));
+      PrintAPI.B_Bar2d_QR(40, 130, 2, 6, 'M', 'A', 0, 0, 0, entity.BarCode.Replace("A26091201", ""));
+
+      PrintAPI.B_Set_Direction('B');
+      PrintAPI.B_Print_Out(1);
+      PrintAPI.B_ClosePrn();
+    }
+    public static void Print5050(PrintEntity entity)
+    {
+      PrintAPI.B_GetUSBBufferLen();
+      PrintAPI.B_EnumUSB(new byte[128]);
+      PrintAPI.B_CreateUSBPort(1);
+
+      PrintAPI.B_Prn_Text_TrueType(40, 26, 31, "黑体", 1, 700, 0, 0, 0, "C1", entity.Goods_Name);
+      PrintAPI.B_Prn_Text_TrueType(40, 70, 31, "黑体", 1, 400, 0, 0, 0, "C2", string.Format("产品重量：{0}", entity.Weight));
+
+
+      PrintAPI.B_Prn_Barcode(10, 320, 0, "1", 3, 22, 35, 'N', entity.BarCode.Replace("A26091201",""));
+      PrintAPI.B_Prn_Text_TrueType(40, 360, 25, "宋体", 1, 500, 0, 0, 0, "C9", entity.BarCode.Replace("A26091201", ""));
+      PrintAPI.B_Bar2d_QR(40, 105, 2, 6, 'M', 'A', 0, 0, 0, entity._2DQRCode.Replace("A26091201", ""));
+
+      PrintAPI.B_Set_Direction('B');
+      PrintAPI.B_Print_Out(1);
+      PrintAPI.B_ClosePrn();
+    }
   }
   public class PrintEntity
   {