需求单No.3208

ButcherFactory.Form/ButcherFactory.Form.csproj

@@ -117,6 +117,7 @@
       <DependentUpon>UserControl1.cs</DependentUpon>
     </Compile>
     <Compile Include="Controls\Utils\AoHaoSi3000DataFormat.cs" />
+    <Compile Include="Controls\Utils\JST8180DataFormat.cs" />
     <Compile Include="Controls\Utils\DataFormatBase.cs" />
     <Compile Include="Controls\Utils\IND560DataFormat.cs" />
     <Compile Include="Controls\Utils\JST2018SDataFormat.cs" />

ButcherFactory.Form/Controls/Utils/JST2018SDataFormat.cs

@@ -8,6 +8,9 @@ namespace ButcherFactory.Controls
 {
   internal class JST2018SDataFormat : DataFormatBase
   {
+    // 00007RX:  FF 43 78 40 00 10 00 00 00 37
+    // 00009RX:  FF 43 88 40 00 10 00 00 00 37
+
     public override int DataLength
     {
       get { return 8; }

ButcherFactory.Form/Controls/Utils/JST8180DataFormat.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ButcherFactory.Controls
+{
+  internal class JST8180DataFormat : DataFormatBase
+  {
+    public override int DataLength => 8;
+    public override char Beginchar => (char)0x3D; // = 开头
+    public override char Endchar => (char)0xFF;
+    public override short Bufsize => 7;
+
+    public override string ParseData(string buf, out bool isStatic)
+    {
+      // 3D 34 39 2E 36 30 30 30 
+      // 6.94
+
+      isStatic = true;
+      try
+      {
+        // 1. 去掉 = 和 .  例：=49.6000 → 496000
+        string raw = buf.TrimStart('=').Replace(".", "");
+
+        // 2. 反转数字  496000 → 000694
+        char[] arr = raw.ToCharArray();
+        Array.Reverse(arr);
+        string reversed = new string(arr);
+
+        // 3. 插入小数点（固定2位小数）
+        decimal weight = decimal.Parse(reversed) / 100m;
+
+        // 4. 输出仪表显示值
+        return weight.ToString("0.00");
+      }
+      catch
+      {
+        return "0.00";
+      }
+    }
+
+    public override bool ParseAscii(string buf, out string weight, out bool isStatic)
+    {
+      weight = string.Empty;
+      isStatic = false;
+      string frame = FindDataFrame(buf, DataLength);
+      if (string.IsNullOrEmpty(frame)) return false;
+
+      weight = ParseData(frame, out isStatic);
+      return true;
+    }
+
+    public override string FindDataFrame(string buf, int fSize)
+    {
+      if (buf == null || buf.Length < fSize) return "";
+      int idx = buf.IndexOf(Beginchar);
+      if (idx < 0 || idx + fSize > buf.Length) return "";
+      return buf.Substring(idx, fSize);
+    }
+
+    public override bool ParseAscii(string buf, out string weight, out bool isStatic, out string subStr)
+    {
+      weight = ""; isStatic = false; subStr = ""; return false;
+    }
+  }
+
+   
+}

ButcherFactory.Form/Controls/WeightControl.cs

@@ -145,6 +145,9 @@ namespace ButcherFactory.Controls
         case "JST2018S":
           _dataFormat = new JST2018SDataFormat();
           break;
+        case "JST8180":
+          _dataFormat = new JST8180DataFormat();
+          break;
         case "一体称"://02 10 53 54 2C 47 53 3A 20 30 30 30 31 2E 37 31 6B 67 A8 FE 00 49 01 00 AC 99 A8 FE 00
           _dataFormat = new CombineWeightDataFormat();
           break;

ButcherFactory.Form/Controls/WeightSettingFrom.cs

@@ -12,7 +12,7 @@ namespace ButcherFactory.Controls
 {
   public partial class WeightSettingFrom : Form
   {
-    List<string> weight = new List<string> { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10", "IND231", "AHS3000", "JST2018S", "一体称" };
+    List<string> weight = new List<string> { "IND560", "Xk3124", "Xk3190A9", "Xk3190D10", "IND231", "AHS3000", "JST2018S", "一体称" , "JST8180" };
     List<string> com = new List<string> { "COM1", "COM2", "COM3", "COM4", "COM5" };
     List<string> rate = new List<string> { "1200", "2400", "4800", "7200", "9600" };
     List<string> bit = new List<string> { "5", "6", "7", "8" };

ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs

@@ -1,34 +1,33 @@
-namespace ButcherFactory.SegmentProductionAuto_
-{
-  partial class SegmentProductionAutoForm
-  {
-    /// <summary>
-    /// Required designer variable.
-    /// </summary>
-    private System.ComponentModel.IContainer components = null;
-
-    /// <summary>
-    /// Clean up any resources being used.
-    /// </summary>
-    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-    protected override void Dispose(bool disposing)
-    {
-      if (disposing && (components != null))
-      {
-        components.Dispose();
-      }
-      base.Dispose(disposing);
-    }
-
-    #region Windows Form Designer generated code
-
-    /// <summary>
-    /// Required method for Designer support - do not modify
-    /// the contents of this method with the code editor.
-    /// </summary>
-    private void InitializeComponent()
-    {
-      this.components = new System.ComponentModel.Container();
+namespace ButcherFactory.SegmentProductionAuto_
+{
+  partial class SegmentProductionAutoForm
+  {
+    /// <summary>
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary>
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing)
+    {
+      if (disposing && (components != null))
+      {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Windows Form Designer generated code
+
+    /// <summary>
+    /// Required method for Designer support - do not modify
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent()
+    {
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
       System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@@ -50,7 +49,10 @@
       this.label2 = new System.Windows.Forms.Label();
       this.statisticNumberBox = new System.Windows.Forms.TextBox();
       this.label1 = new System.Windows.Forms.Label();
+      this.logBtn = new ButcherFactory.Controls.ColorButton();
       this.msglbl = new System.Windows.Forms.Label();
+      this.closeBtn = new ButcherFactory.Controls.ColorButton();
+      this.uWeightControl1 = new ButcherFactory.Controls.WeightControl();
       this.barPrintCheck = new System.Windows.Forms.CheckBox();
       this.uTimerLabel1 = new WinFormControl.UTimerLabel();
       this.productBatchSelect = new System.Windows.Forms.ComboBox();
@@ -59,27 +61,17 @@
       this.uLabel2 = new WinFormControl.ULabel();
       this.netStateWatch1 = new WinFormControl.NetStateWatch();
       this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+      this.goodsSetBtn = new ButcherFactory.Controls.ColorButton();
       this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
       this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-      this.groupBox1 = new System.Windows.Forms.GroupBox();
-      this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel();
-      this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
-      this.timer1 = new System.Windows.Forms.Timer(this.components);
-      this.serialPort1 = new System.IO.Ports.SerialPort(this.components);
-      this.weightSwitch = new ButcherFactory.Controls.ColorButton();
-      this.zeroBtn = new ButcherFactory.Controls.ColorButton();
-      this.roundPanel2 = new ButcherFactory.Controls.RoundPanel(this.components);
-      this.labelStable = new System.Windows.Forms.Label();
-      this.labelZero = new System.Windows.Forms.Label();
-      this.lblChengZhong = new System.Windows.Forms.Label();
-      this.logBtn = new ButcherFactory.Controls.ColorButton();
-      this.closeBtn = new ButcherFactory.Controls.ColorButton();
-      this.goodsSetBtn = new ButcherFactory.Controls.ColorButton();
       this.colorButton2 = new ButcherFactory.Controls.ColorButton();
       this.viewTaskBtn = new ButcherFactory.Controls.ColorButton();
       this.colorButton1 = new ButcherFactory.Controls.ColorButton();
       this.deleteBtn = new ButcherFactory.Controls.ColorButton();
       this.rePrintBtn = new ButcherFactory.Controls.ColorButton();
+      this.groupBox1 = new System.Windows.Forms.GroupBox();
+      this.flowLayoutPanel4 = new System.Windows.Forms.FlowLayoutPanel();
+      this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
       this.groupBox2.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.taskDataGrid)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -91,7 +83,6 @@
       this.splitContainer2.Panel2.SuspendLayout();
       this.splitContainer2.SuspendLayout();
       this.groupBox1.SuspendLayout();
-      this.roundPanel2.SuspendLayout();
       this.SuspendLayout();
       // 
       // uLabel3
@@ -101,7 +92,7 @@
       this.uLabel3.Font = new System.Drawing.Font("宋体", 12F);
       this.uLabel3.Location = new System.Drawing.Point(8, 0);
       this.uLabel3.Name = "uLabel3";
-      this.uLabel3.Size = new System.Drawing.Size(71, 16);
+      this.uLabel3.Size = new System.Drawing.Size(72, 16);
       this.uLabel3.TabIndex = 1;
       this.uLabel3.Text = "生产历史";
       // 
@@ -110,7 +101,7 @@
       this.groupBox2.Controls.Add(this.taskDataGrid);
       this.groupBox2.Location = new System.Drawing.Point(3, 3);
       this.groupBox2.Name = "groupBox2";
-      this.groupBox2.Padding = new System.Windows.Forms.Padding(5);
+      this.groupBox2.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
       this.groupBox2.Size = new System.Drawing.Size(452, 120);
       this.groupBox2.TabIndex = 4;
       this.groupBox2.TabStop = false;
@@ -142,6 +133,7 @@
       this.taskDataGrid.Name = "taskDataGrid";
       this.taskDataGrid.ReadOnly = true;
       this.taskDataGrid.RowHeadersVisible = false;
+      this.taskDataGrid.RowHeadersWidth = 51;
       dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
       dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
       this.taskDataGrid.RowsDefaultCellStyle = dataGridViewCellStyle6;
@@ -154,8 +146,10 @@
       // 
       this.T_Item.DataPropertyName = "Item";
       this.T_Item.HeaderText = "项目";
+      this.T_Item.MinimumWidth = 6;
       this.T_Item.Name = "T_Item";
       this.T_Item.ReadOnly = true;
+      this.T_Item.Width = 125;
       // 
       // T_Need
       // 
@@ -164,6 +158,7 @@
       dataGridViewCellStyle3.Format = "#0.######";
       this.T_Need.DefaultCellStyle = dataGridViewCellStyle3;
       this.T_Need.HeaderText = "订货";
+      this.T_Need.MinimumWidth = 6;
       this.T_Need.Name = "T_Need";
       this.T_Need.ReadOnly = true;
       // 
@@ -174,6 +169,7 @@
       dataGridViewCellStyle4.Format = "#0.######";
       this.T_Done.DefaultCellStyle = dataGridViewCellStyle4;
       this.T_Done.HeaderText = "完工";
+      this.T_Done.MinimumWidth = 6;
       this.T_Done.Name = "T_Done";
       this.T_Done.ReadOnly = true;
       // 
@@ -184,6 +180,7 @@
       dataGridViewCellStyle5.Format = "#0.######";
       this.T_Last.DefaultCellStyle = dataGridViewCellStyle5;
       this.T_Last.HeaderText = "剩余";
+      this.T_Last.MinimumWidth = 6;
       this.T_Last.Name = "T_Last";
       this.T_Last.ReadOnly = true;
       // 
@@ -195,7 +192,7 @@
       this.GoodsLabel.ForeColor = System.Drawing.Color.Blue;
       this.GoodsLabel.Location = new System.Drawing.Point(144, 178);
       this.GoodsLabel.Name = "GoodsLabel";
-      this.GoodsLabel.Size = new System.Drawing.Size(71, 16);
+      this.GoodsLabel.Size = new System.Drawing.Size(72, 16);
       this.GoodsLabel.TabIndex = 1;
       this.GoodsLabel.Text = "存货名称";
       // 
@@ -211,9 +208,6 @@
       // 
       // splitContainer1.Panel1
       // 
-      this.splitContainer1.Panel1.Controls.Add(this.weightSwitch);
-      this.splitContainer1.Panel1.Controls.Add(this.zeroBtn);
-      this.splitContainer1.Panel1.Controls.Add(this.roundPanel2);
       this.splitContainer1.Panel1.Controls.Add(this.butcherDateBox);
       this.splitContainer1.Panel1.Controls.Add(this.label3);
       this.splitContainer1.Panel1.Controls.Add(this.numberInput);
@@ -223,6 +217,7 @@
       this.splitContainer1.Panel1.Controls.Add(this.logBtn);
       this.splitContainer1.Panel1.Controls.Add(this.msglbl);
       this.splitContainer1.Panel1.Controls.Add(this.closeBtn);
+      this.splitContainer1.Panel1.Controls.Add(this.uWeightControl1);
       this.splitContainer1.Panel1.Controls.Add(this.barPrintCheck);
       this.splitContainer1.Panel1.Controls.Add(this.uTimerLabel1);
       this.splitContainer1.Panel1.Controls.Add(this.productBatchSelect);
@@ -234,8 +229,8 @@
       // splitContainer1.Panel2
       // 
       this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
-      this.splitContainer1.Size = new System.Drawing.Size(1226, 704);
-      this.splitContainer1.SplitterDistance = 87;
+      this.splitContainer1.Size = new System.Drawing.Size(1155, 676);
+      this.splitContainer1.SplitterDistance = 100;
       this.splitContainer1.TabIndex = 1;
       // 
       // butcherDateBox
@@ -299,15 +294,54 @@
       this.label1.TabIndex = 26;
       this.label1.Text = "统计数量：";
       // 
+      // logBtn
+      // 
+      this.logBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.logBtn.BackColor = System.Drawing.Color.CadetBlue;
+      this.logBtn.Font = new System.Drawing.Font("宋体", 15F);
+      this.logBtn.ForeColor = System.Drawing.Color.White;
+      this.logBtn.Location = new System.Drawing.Point(609, 4);
+      this.logBtn.Name = "logBtn";
+      this.logBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
+      this.logBtn.Size = new System.Drawing.Size(101, 41);
+      this.logBtn.TabIndex = 25;
+      this.logBtn.Text = "日志";
+      this.logBtn.UseVisualStyleBackColor = false;
+      this.logBtn.Click += new System.EventHandler(this.logBtn_Click);
+      // 
       // msglbl
       // 
       this.msglbl.AutoSize = true;
       this.msglbl.ForeColor = System.Drawing.Color.Red;
       this.msglbl.Location = new System.Drawing.Point(388, 6);
       this.msglbl.Name = "msglbl";
-      this.msglbl.Size = new System.Drawing.Size(101, 12);
+      this.msglbl.Size = new System.Drawing.Size(0, 12);
       this.msglbl.TabIndex = 24;
-      this.msglbl.Text = "";
+      // 
+      // closeBtn
+      // 
+      this.closeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.closeBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
+      this.closeBtn.Font = new System.Drawing.Font("宋体", 15F);
+      this.closeBtn.ForeColor = System.Drawing.Color.White;
+      this.closeBtn.Location = new System.Drawing.Point(1038, 7);
+      this.closeBtn.Name = "closeBtn";
+      this.closeBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
+      this.closeBtn.Size = new System.Drawing.Size(111, 41);
+      this.closeBtn.TabIndex = 18;
+      this.closeBtn.Text = "关闭";
+      this.closeBtn.UseVisualStyleBackColor = false;
+      this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click);
+      // 
+      // uWeightControl1
+      // 
+      this.uWeightControl1.BackColor = System.Drawing.Color.Transparent;
+      this.uWeightControl1.Location = new System.Drawing.Point(12, 7);
+      this.uWeightControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+      this.uWeightControl1.Name = "uWeightControl1";
+      this.uWeightControl1.Size = new System.Drawing.Size(262, 74);
+      this.uWeightControl1.TabIndex = 17;
+      this.uWeightControl1.WeightFalg = null;
       // 
       // barPrintCheck
       // 
@@ -327,9 +361,9 @@
       this.uTimerLabel1.BackColor = System.Drawing.Color.Transparent;
       this.uTimerLabel1.Font = new System.Drawing.Font("黑体", 12F);
       this.uTimerLabel1.Format = "M月d日 H:mm:ss";
-      this.uTimerLabel1.Location = new System.Drawing.Point(1084, 53);
+      this.uTimerLabel1.Location = new System.Drawing.Point(1012, 53);
       this.uTimerLabel1.Name = "uTimerLabel1";
-      this.uTimerLabel1.Size = new System.Drawing.Size(135, 16);
+      this.uTimerLabel1.Size = new System.Drawing.Size(136, 16);
       this.uTimerLabel1.TabIndex = 14;
       this.uTimerLabel1.Text = "4月21日 16:32:19";
       // 
@@ -338,7 +372,7 @@
       this.productBatchSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.productBatchSelect.Font = new System.Drawing.Font("宋体", 15F);
       this.productBatchSelect.FormattingEnabled = true;
-      this.productBatchSelect.Location = new System.Drawing.Point(903, 47);
+      this.productBatchSelect.Location = new System.Drawing.Point(832, 47);
       this.productBatchSelect.Name = "productBatchSelect";
       this.productBatchSelect.Size = new System.Drawing.Size(170, 28);
       this.productBatchSelect.TabIndex = 11;
@@ -348,7 +382,7 @@
       this.workUnitSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
       this.workUnitSelect.Font = new System.Drawing.Font("宋体", 15F);
       this.workUnitSelect.FormattingEnabled = true;
-      this.workUnitSelect.Location = new System.Drawing.Point(903, 11);
+      this.workUnitSelect.Location = new System.Drawing.Point(832, 11);
       this.workUnitSelect.Name = "workUnitSelect";
       this.workUnitSelect.Size = new System.Drawing.Size(170, 28);
       this.workUnitSelect.TabIndex = 10;
@@ -359,7 +393,7 @@
       this.uLabel1.AutoSize = true;
       this.uLabel1.BackColor = System.Drawing.Color.Transparent;
       this.uLabel1.Font = new System.Drawing.Font("宋体", 15F);
-      this.uLabel1.Location = new System.Drawing.Point(802, 14);
+      this.uLabel1.Location = new System.Drawing.Point(730, 14);
       this.uLabel1.Name = "uLabel1";
       this.uLabel1.Size = new System.Drawing.Size(109, 20);
       this.uLabel1.TabIndex = 12;
@@ -371,7 +405,7 @@
       this.uLabel2.AutoSize = true;
       this.uLabel2.BackColor = System.Drawing.Color.Transparent;
       this.uLabel2.Font = new System.Drawing.Font("宋体", 15F);
-      this.uLabel2.Location = new System.Drawing.Point(802, 50);
+      this.uLabel2.Location = new System.Drawing.Point(730, 50);
       this.uLabel2.Name = "uLabel2";
       this.uLabel2.Size = new System.Drawing.Size(109, 20);
       this.uLabel2.TabIndex = 13;
@@ -381,6 +415,7 @@
       // 
       this.netStateWatch1.BackColor = System.Drawing.Color.Transparent;
       this.netStateWatch1.Location = new System.Drawing.Point(292, 2);
+      this.netStateWatch1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
       this.netStateWatch1.Name = "netStateWatch1";
       this.netStateWatch1.Size = new System.Drawing.Size(90, 39);
       this.netStateWatch1.TabIndex = 1;
@@ -409,10 +444,25 @@
       this.splitContainer2.Panel2.Controls.Add(this.rePrintBtn);
       this.splitContainer2.Panel2.Controls.Add(this.groupBox1);
       this.splitContainer2.Panel2.Controls.Add(this.groupBox2);
-      this.splitContainer2.Size = new System.Drawing.Size(1226, 613);
-      this.splitContainer2.SplitterDistance = 761;
+      this.splitContainer2.Size = new System.Drawing.Size(1155, 572);
+      this.splitContainer2.SplitterDistance = 697;
       this.splitContainer2.TabIndex = 0;
       // 
+      // goodsSetBtn
+      // 
+      this.goodsSetBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.goodsSetBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
+      this.goodsSetBtn.Font = new System.Drawing.Font("宋体", 15F);
+      this.goodsSetBtn.ForeColor = System.Drawing.Color.White;
+      this.goodsSetBtn.Location = new System.Drawing.Point(596, 3);
+      this.goodsSetBtn.Name = "goodsSetBtn";
+      this.goodsSetBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
+      this.goodsSetBtn.Size = new System.Drawing.Size(111, 62);
+      this.goodsSetBtn.TabIndex = 19;
+      this.goodsSetBtn.Text = "产品设置";
+      this.goodsSetBtn.UseVisualStyleBackColor = false;
+      this.goodsSetBtn.Click += new System.EventHandler(this.goodsSetBtn_Click);
+      // 
       // flowLayoutPanel2
       // 
       this.flowLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
@@ -422,7 +472,7 @@
       this.flowLayoutPanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
       this.flowLayoutPanel2.Location = new System.Drawing.Point(-1, 75);
       this.flowLayoutPanel2.Name = "flowLayoutPanel2";
-      this.flowLayoutPanel2.Size = new System.Drawing.Size(757, 536);
+      this.flowLayoutPanel2.Size = new System.Drawing.Size(708, 495);
       this.flowLayoutPanel2.TabIndex = 24;
       // 
       // flowLayoutPanel1
@@ -432,182 +482,9 @@
       this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
       this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1);
       this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-      this.flowLayoutPanel1.Size = new System.Drawing.Size(640, 70);
+      this.flowLayoutPanel1.Size = new System.Drawing.Size(591, 70);
       this.flowLayoutPanel1.TabIndex = 22;
       // 
-      // groupBox1
-      // 
-      this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-      this.groupBox1.Controls.Add(this.flowLayoutPanel4);
-      this.groupBox1.Controls.Add(this.flowLayoutPanel3);
-      this.groupBox1.Controls.Add(this.uLabel3);
-      this.groupBox1.Location = new System.Drawing.Point(8, 222);
-      this.groupBox1.Name = "groupBox1";
-      this.groupBox1.Padding = new System.Windows.Forms.Padding(5);
-      this.groupBox1.Size = new System.Drawing.Size(447, 381);
-      this.groupBox1.TabIndex = 5;
-      this.groupBox1.TabStop = false;
-      // 
-      // flowLayoutPanel4
-      // 
-      this.flowLayoutPanel4.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.flowLayoutPanel4.AutoScroll = true;
-      this.flowLayoutPanel4.Location = new System.Drawing.Point(5, 90);
-      this.flowLayoutPanel4.Name = "flowLayoutPanel4";
-      this.flowLayoutPanel4.Size = new System.Drawing.Size(437, 286);
-      this.flowLayoutPanel4.TabIndex = 5;
-      // 
-      // flowLayoutPanel3
-      // 
-      this.flowLayoutPanel3.AutoScroll = true;
-      this.flowLayoutPanel3.BackColor = System.Drawing.Color.White;
-      this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Top;
-      this.flowLayoutPanel3.Location = new System.Drawing.Point(5, 19);
-      this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0);
-      this.flowLayoutPanel3.Name = "flowLayoutPanel3";
-      this.flowLayoutPanel3.Size = new System.Drawing.Size(437, 68);
-      this.flowLayoutPanel3.TabIndex = 4;
-      this.flowLayoutPanel3.WrapContents = false;
-      // 
-      // timer1
-      // 
-      this.timer1.Interval = 50;
-      this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
-      // 
-      // serialPort1
-      // 
-      this.serialPort1.PortName = "COM3";
-      // 
-      // weightSwitch
-      // 
-      this.weightSwitch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
-      this.weightSwitch.Font = new System.Drawing.Font("宋体", 10F);
-      this.weightSwitch.ForeColor = System.Drawing.Color.White;
-      this.weightSwitch.Location = new System.Drawing.Point(173, 43);
-      this.weightSwitch.Name = "weightSwitch";
-      this.weightSwitch.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.weightSwitch.Size = new System.Drawing.Size(90, 32);
-      this.weightSwitch.StateHold = true;
-      this.weightSwitch.TabIndex = 38;
-      this.weightSwitch.Text = "启用称重";
-      this.weightSwitch.UseVisualStyleBackColor = false;
-      this.weightSwitch.Click += new System.EventHandler(this.weightSwitch_Click);
-      // 
-      // zeroBtn
-      // 
-      this.zeroBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(144)))), ((int)(((byte)(98)))), ((int)(((byte)(222)))));
-      this.zeroBtn.Font = new System.Drawing.Font("宋体", 10F);
-      this.zeroBtn.ForeColor = System.Drawing.Color.White;
-      this.zeroBtn.Location = new System.Drawing.Point(173, 4);
-      this.zeroBtn.Name = "zeroBtn";
-      this.zeroBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.zeroBtn.Size = new System.Drawing.Size(90, 32);
-      this.zeroBtn.TabIndex = 37;
-      this.zeroBtn.Text = "归零";
-      this.zeroBtn.UseVisualStyleBackColor = false;
-      this.zeroBtn.Click += new System.EventHandler(this.zeroBtn_Click);
-      // 
-      // roundPanel2
-      // 
-      this.roundPanel2._setRoundRadius = 15;
-      this.roundPanel2.BackColor = System.Drawing.Color.Black;
-      this.roundPanel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-      this.roundPanel2.Controls.Add(this.labelStable);
-      this.roundPanel2.Controls.Add(this.labelZero);
-      this.roundPanel2.Controls.Add(this.lblChengZhong);
-      this.roundPanel2.Location = new System.Drawing.Point(6, 3);
-      this.roundPanel2.Margin = new System.Windows.Forms.Padding(0);
-      this.roundPanel2.Name = "roundPanel2";
-      this.roundPanel2.Size = new System.Drawing.Size(162, 74);
-      this.roundPanel2.TabIndex = 36;
-      // 
-      // labelStable
-      // 
-      this.labelStable.AutoSize = true;
-      this.labelStable.BackColor = System.Drawing.Color.White;
-      this.labelStable.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.labelStable.Font = new System.Drawing.Font("微软雅黑", 9F);
-      this.labelStable.ImeMode = System.Windows.Forms.ImeMode.NoControl;
-      this.labelStable.Location = new System.Drawing.Point(119, 1);
-      this.labelStable.Name = "labelStable";
-      this.labelStable.Size = new System.Drawing.Size(17, 19);
-      this.labelStable.TabIndex = 13;
-      this.labelStable.Text = "S";
-      this.labelStable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-      // 
-      // labelZero
-      // 
-      this.labelZero.AutoSize = true;
-      this.labelZero.BackColor = System.Drawing.Color.White;
-      this.labelZero.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.labelZero.Font = new System.Drawing.Font("微软雅黑", 9F);
-      this.labelZero.Location = new System.Drawing.Point(138, 1);
-      this.labelZero.Name = "labelZero";
-      this.labelZero.Size = new System.Drawing.Size(17, 19);
-      this.labelZero.TabIndex = 12;
-      this.labelZero.Text = "0";
-      this.labelZero.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-      // 
-      // lblChengZhong
-      // 
-      this.lblChengZhong.AutoSize = true;
-      this.lblChengZhong.Font = new System.Drawing.Font("宋体", 25F);
-      this.lblChengZhong.ForeColor = System.Drawing.Color.Red;
-      this.lblChengZhong.Location = new System.Drawing.Point(5, 19);
-      this.lblChengZhong.Margin = new System.Windows.Forms.Padding(0);
-      this.lblChengZhong.Name = "lblChengZhong";
-      this.lblChengZhong.Size = new System.Drawing.Size(83, 34);
-      this.lblChengZhong.TabIndex = 0;
-      this.lblChengZhong.Text = "0.00";
-      // 
-      // logBtn
-      // 
-      this.logBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.logBtn.BackColor = System.Drawing.Color.CadetBlue;
-      this.logBtn.Font = new System.Drawing.Font("宋体", 15F);
-      this.logBtn.ForeColor = System.Drawing.Color.White;
-      this.logBtn.Location = new System.Drawing.Point(680, 4);
-      this.logBtn.Name = "logBtn";
-      this.logBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.logBtn.Size = new System.Drawing.Size(101, 41);
-      this.logBtn.TabIndex = 25;
-      this.logBtn.Text = "日志";
-      this.logBtn.UseVisualStyleBackColor = false;
-      this.logBtn.Click += new System.EventHandler(this.logBtn_Click);
-      // 
-      // closeBtn
-      // 
-      this.closeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.closeBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
-      this.closeBtn.Font = new System.Drawing.Font("宋体", 15F);
-      this.closeBtn.ForeColor = System.Drawing.Color.White;
-      this.closeBtn.Location = new System.Drawing.Point(1109, 7);
-      this.closeBtn.Name = "closeBtn";
-      this.closeBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.closeBtn.Size = new System.Drawing.Size(111, 41);
-      this.closeBtn.TabIndex = 18;
-      this.closeBtn.Text = "关闭";
-      this.closeBtn.UseVisualStyleBackColor = false;
-      this.closeBtn.Click += new System.EventHandler(this.closeBtn_Click);
-      // 
-      // goodsSetBtn
-      // 
-      this.goodsSetBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.goodsSetBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
-      this.goodsSetBtn.Font = new System.Drawing.Font("宋体", 15F);
-      this.goodsSetBtn.ForeColor = System.Drawing.Color.White;
-      this.goodsSetBtn.Location = new System.Drawing.Point(645, 3);
-      this.goodsSetBtn.Name = "goodsSetBtn";
-      this.goodsSetBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
-      this.goodsSetBtn.Size = new System.Drawing.Size(111, 62);
-      this.goodsSetBtn.TabIndex = 19;
-      this.goodsSetBtn.Text = "产品设置";
-      this.goodsSetBtn.UseVisualStyleBackColor = false;
-      this.goodsSetBtn.Click += new System.EventHandler(this.goodsSetBtn_Click);
-      // 
       // colorButton2
       // 
       this.colorButton2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
@@ -628,7 +505,7 @@
       this.viewTaskBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245)))));
       this.viewTaskBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.viewTaskBtn.ForeColor = System.Drawing.Color.White;
-      this.viewTaskBtn.Location = new System.Drawing.Point(13, 124);
+      this.viewTaskBtn.Location = new System.Drawing.Point(-10, 124);
       this.viewTaskBtn.Name = "viewTaskBtn";
       this.viewTaskBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
       this.viewTaskBtn.Size = new System.Drawing.Size(100, 41);
@@ -657,7 +534,7 @@
       this.deleteBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25)))));
       this.deleteBtn.Font = new System.Drawing.Font("宋体", 15F);
       this.deleteBtn.ForeColor = System.Drawing.Color.White;
-      this.deleteBtn.Location = new System.Drawing.Point(178, 124);
+      this.deleteBtn.Location = new System.Drawing.Point(155, 124);
       this.deleteBtn.Name = "deleteBtn";
       this.deleteBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
       this.deleteBtn.Size = new System.Drawing.Size(85, 41);
@@ -682,17 +559,53 @@
       this.rePrintBtn.Visible = false;
       this.rePrintBtn.Click += new System.EventHandler(this.rePrintBtn_Click);
       // 
+      // groupBox1
+      // 
+      this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+      this.groupBox1.Controls.Add(this.flowLayoutPanel4);
+      this.groupBox1.Controls.Add(this.flowLayoutPanel3);
+      this.groupBox1.Controls.Add(this.uLabel3);
+      this.groupBox1.Location = new System.Drawing.Point(8, 222);
+      this.groupBox1.Name = "groupBox1";
+      this.groupBox1.Padding = new System.Windows.Forms.Padding(5, 5, 5, 5);
+      this.groupBox1.Size = new System.Drawing.Size(447, 339);
+      this.groupBox1.TabIndex = 5;
+      this.groupBox1.TabStop = false;
+      // 
+      // flowLayoutPanel4
+      // 
+      this.flowLayoutPanel4.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.flowLayoutPanel4.AutoScroll = true;
+      this.flowLayoutPanel4.Location = new System.Drawing.Point(5, 90);
+      this.flowLayoutPanel4.Name = "flowLayoutPanel4";
+      this.flowLayoutPanel4.Size = new System.Drawing.Size(437, 245);
+      this.flowLayoutPanel4.TabIndex = 5;
+      // 
+      // flowLayoutPanel3
+      // 
+      this.flowLayoutPanel3.AutoScroll = true;
+      this.flowLayoutPanel3.BackColor = System.Drawing.Color.White;
+      this.flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Top;
+      this.flowLayoutPanel3.Location = new System.Drawing.Point(5, 19);
+      this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0);
+      this.flowLayoutPanel3.Name = "flowLayoutPanel3";
+      this.flowLayoutPanel3.Size = new System.Drawing.Size(437, 68);
+      this.flowLayoutPanel3.TabIndex = 4;
+      this.flowLayoutPanel3.WrapContents = false;
+      // 
       // SegmentProductionAutoForm
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.BackColor = System.Drawing.Color.White;
-      this.ClientSize = new System.Drawing.Size(1226, 704);
+      this.ClientSize = new System.Drawing.Size(1155, 676);
       this.Controls.Add(this.splitContainer1);
       this.Name = "SegmentProductionAutoForm";
       this.Text = "分割品车间称重计数";
       this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-      this.Load += new System.EventHandler(this.SegmentProductionAutoForm_Load);
       this.groupBox2.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.taskDataGrid)).EndInit();
       this.splitContainer1.Panel1.ResumeLayout(false);
@@ -707,37 +620,36 @@
       this.splitContainer2.ResumeLayout(false);
       this.groupBox1.ResumeLayout(false);
       this.groupBox1.PerformLayout();
-      this.roundPanel2.ResumeLayout(false);
-      this.roundPanel2.PerformLayout();
       this.ResumeLayout(false);
 
-    }
-
-    #endregion
-
-    private WinFormControl.ULabel uLabel3;
-    private System.Windows.Forms.GroupBox groupBox2;
-    private WinFormControl.UDataGridView taskDataGrid;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Item;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Need;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Done;
-    private System.Windows.Forms.DataGridViewTextBoxColumn T_Last;
-    private WinFormControl.ULabel GoodsLabel;
-    private System.Windows.Forms.SplitContainer splitContainer1;
-    private WinFormControl.UTimerLabel uTimerLabel1;
-    private System.Windows.Forms.ComboBox productBatchSelect;
-    private System.Windows.Forms.ComboBox workUnitSelect;
-    private WinFormControl.ULabel uLabel1;
-    private WinFormControl.ULabel uLabel2;
-    private WinFormControl.NetStateWatch netStateWatch1;
+    }
+
+    #endregion
+
+    private WinFormControl.ULabel uLabel3;
+    private System.Windows.Forms.GroupBox groupBox2;
+    private WinFormControl.UDataGridView taskDataGrid;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Item;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Need;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Done;
+    private System.Windows.Forms.DataGridViewTextBoxColumn T_Last;
+    private WinFormControl.ULabel GoodsLabel;
+    private System.Windows.Forms.SplitContainer splitContainer1;
+    private WinFormControl.UTimerLabel uTimerLabel1;
+    private System.Windows.Forms.ComboBox productBatchSelect;
+    private System.Windows.Forms.ComboBox workUnitSelect;
+    private WinFormControl.ULabel uLabel1;
+    private WinFormControl.ULabel uLabel2;
+    private WinFormControl.NetStateWatch netStateWatch1;
     private System.Windows.Forms.SplitContainer splitContainer2;
-    private System.Windows.Forms.GroupBox groupBox1;
-    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
-    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
-    private Controls.ColorButton rePrintBtn;
-    private Controls.ColorButton closeBtn;
-    private Controls.ColorButton goodsSetBtn;
-    private Controls.ColorButton deleteBtn;
+    private System.Windows.Forms.GroupBox groupBox1;
+    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
+    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+    private Controls.WeightControl uWeightControl1;
+    private Controls.ColorButton rePrintBtn;
+    private Controls.ColorButton closeBtn;
+    private Controls.ColorButton goodsSetBtn;
+    private Controls.ColorButton deleteBtn;
     private System.Windows.Forms.Label msglbl;
     private System.Windows.Forms.CheckBox barPrintCheck;
     private Controls.ColorButton logBtn;
@@ -752,13 +664,5 @@
     private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel4;
     private System.Windows.Forms.Label label3;
     private WinFormControl.ULabel butcherDateBox;
-    private Controls.ColorButton weightSwitch;
-    private Controls.ColorButton zeroBtn;
-    private Controls.RoundPanel roundPanel2;
-    private System.Windows.Forms.Label lblChengZhong;
-    private System.Windows.Forms.Timer timer1;
-    private System.IO.Ports.SerialPort serialPort1;
-    private System.Windows.Forms.Label labelStable;
-    private System.Windows.Forms.Label labelZero;
-  }
+  }
 }

ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.resx

@@ -120,10 +120,4 @@
   <metadata name="T_Last.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>216, 16</value>
-  </metadata>
-  <metadata name="serialPort1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>306, 16</value>
-  </metadata>
 </root>