From c75012abd8154b14d054d55dda687d4d22a82e83 Mon Sep 17 00:00:00 2001
From: "Robin_PC\\robin" <3504557@qq.com>
Date: Sat, 21 Nov 2026 20:48:14 +0800
Subject: [PATCH] =?UTF-8?q?..=20=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SegmentProductionAutoForm.Designer.cs | 222 +++++++++---------
.../SegmentProductionAutoForm.cs | 2 +-
.../ButcherFactory.Login.csproj | 12 +
ButcherFactory.Login/app.Designer.cs | 26 ++
ButcherFactory.Login/app.manifest | 28 +++
5 files changed, 178 insertions(+), 112 deletions(-)
create mode 100644 ButcherFactory.Login/app.Designer.cs
create mode 100644 ButcherFactory.Login/app.manifest
diff --git a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs
index 021d6e9..6ed177d 100644
--- a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs
+++ b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs
@@ -51,7 +51,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();
@@ -60,20 +63,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.logBtn = new ButcherFactory.Controls.ColorButton();
- this.closeBtn = new ButcherFactory.Controls.ColorButton();
- this.uWeightControl1 = new ButcherFactory.Controls.WeightControl();
- 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();
@@ -334,6 +334,21 @@
this.label1.TabIndex = 26;
this.label1.Text = "统计数量:";
//
+ // logBtn
+ //
+ this.logBtn.BackColor = System.Drawing.Color.CadetBlue;
+ this.logBtn.Font = new System.Drawing.Font("宋体", 14F);
+ this.logBtn.ForeColor = System.Drawing.Color.White;
+ this.logBtn.Location = new System.Drawing.Point(1133, 2);
+ this.logBtn.Margin = new System.Windows.Forms.Padding(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(107, 51);
+ 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;
@@ -344,6 +359,31 @@
this.msglbl.Size = new System.Drawing.Size(0, 15);
this.msglbl.TabIndex = 24;
//
+ // closeBtn
+ //
+ 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(1245, 1);
+ this.closeBtn.Margin = new System.Windows.Forms.Padding(4);
+ 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(148, 51);
+ 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(16, 9);
+ this.uWeightControl1.Margin = new System.Windows.Forms.Padding(5);
+ this.uWeightControl1.Name = "uWeightControl1";
+ this.uWeightControl1.Size = new System.Drawing.Size(349, 92);
+ this.uWeightControl1.TabIndex = 17;
+ this.uWeightControl1.WeightFalg = null;
+ //
// barPrintCheck
//
this.barPrintCheck.AutoSize = true;
@@ -448,130 +488,51 @@
this.splitContainer2.Panel2.Controls.Add(this.groupBox1);
this.splitContainer2.Panel2.Controls.Add(this.groupBox2);
this.splitContainer2.Size = new System.Drawing.Size(1440, 655);
- this.splitContainer2.SplitterDistance = 823;
+ this.splitContainer2.SplitterDistance = 821;
this.splitContainer2.SplitterWidth = 5;
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(688, 14);
+ this.goodsSetBtn.Margin = new System.Windows.Forms.Padding(4);
+ 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(134, 77);
+ 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)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
+ this.flowLayoutPanel2.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.flowLayoutPanel2.AutoScroll = true;
this.flowLayoutPanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.flowLayoutPanel2.Location = new System.Drawing.Point(-1, 89);
+ this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 89);
this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
- this.flowLayoutPanel2.Size = new System.Drawing.Size(818, 564);
+ this.flowLayoutPanel2.Size = new System.Drawing.Size(816, 564);
this.flowLayoutPanel2.TabIndex = 24;
//
// flowLayoutPanel1
//
- this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right)));
+ this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
this.flowLayoutPanel1.AutoScroll = true;
- this.flowLayoutPanel1.WrapContents = true; // 关键:禁止换行,横向滚动
this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 4);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
- this.flowLayoutPanel1.Size = new System.Drawing.Size(681, 87);
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(682, 87);
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(4, 279);
- this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);
- this.groupBox1.Size = new System.Drawing.Size(603, 364);
- 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(7, 112);
- this.flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
- this.flowLayoutPanel4.Name = "flowLayoutPanel4";
- this.flowLayoutPanel4.Size = new System.Drawing.Size(590, 246);
- 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(7, 24);
- this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0);
- this.flowLayoutPanel3.Name = "flowLayoutPanel3";
- this.flowLayoutPanel3.Size = new System.Drawing.Size(589, 84);
- this.flowLayoutPanel3.TabIndex = 4;
- this.flowLayoutPanel3.WrapContents = false;
- //
- // logBtn
- //
- this.logBtn.BackColor = System.Drawing.Color.CadetBlue;
- this.logBtn.Font = new System.Drawing.Font("宋体", 14F);
- this.logBtn.ForeColor = System.Drawing.Color.White;
- this.logBtn.Location = new System.Drawing.Point(1133, 2);
- this.logBtn.Margin = new System.Windows.Forms.Padding(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(107, 51);
- this.logBtn.TabIndex = 25;
- this.logBtn.Text = "日志";
- this.logBtn.UseVisualStyleBackColor = false;
- this.logBtn.Click += new System.EventHandler(this.logBtn_Click);
- //
- // closeBtn
- //
- 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(1245, 1);
- this.closeBtn.Margin = new System.Windows.Forms.Padding(4);
- 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(148, 51);
- 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(16, 9);
- this.uWeightControl1.Margin = new System.Windows.Forms.Padding(5);
- this.uWeightControl1.Name = "uWeightControl1";
- this.uWeightControl1.Size = new System.Drawing.Size(349, 92);
- this.uWeightControl1.TabIndex = 17;
- this.uWeightControl1.WeightFalg = null;
- //
- // 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(683, 14);
- this.goodsSetBtn.Margin = new System.Windows.Forms.Padding(4);
- 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(134, 77);
- 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)))));
@@ -651,6 +612,45 @@
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(4, 279);
+ this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);
+ this.groupBox1.Size = new System.Drawing.Size(603, 364);
+ 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(7, 112);
+ this.flowLayoutPanel4.Margin = new System.Windows.Forms.Padding(4);
+ this.flowLayoutPanel4.Name = "flowLayoutPanel4";
+ this.flowLayoutPanel4.Size = new System.Drawing.Size(590, 246);
+ 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(7, 24);
+ this.flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0);
+ this.flowLayoutPanel3.Name = "flowLayoutPanel3";
+ this.flowLayoutPanel3.Size = new System.Drawing.Size(589, 84);
+ this.flowLayoutPanel3.TabIndex = 4;
+ this.flowLayoutPanel3.WrapContents = false;
+ //
// SegmentProductionAutoForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
diff --git a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
index 1c1691a..dbdea99 100644
--- a/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
+++ b/ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
@@ -1212,6 +1212,6 @@ namespace ButcherFactory.SegmentProductionAuto_
scDate .Text = scDateValue.ToString("yyyy-MM-dd");
}
}
-
+
}
}
diff --git a/ButcherFactory.Login/ButcherFactory.Login.csproj b/ButcherFactory.Login/ButcherFactory.Login.csproj
index 43bf823..914f1bd 100644
--- a/ButcherFactory.Login/ButcherFactory.Login.csproj
+++ b/ButcherFactory.Login/ButcherFactory.Login.csproj
@@ -40,6 +40,9 @@
+
+ app.manifest
+
@@ -64,6 +67,11 @@
MSBuild:Compile
Designer
+
+ True
+ True
+ app.manifest
+
App.xaml
Code
@@ -104,6 +112,10 @@
+
+ SettingsSingleFileGenerator
+ app.Designer.cs
+
+
+
+
+
+
+
+
+
+
+