Compare commits

...

13 Commits

18 changed files with 1271 additions and 1241 deletions
Unified View
  1. +1
    -1
      ButcherFactory.BO/ButcherFactory.BO.csproj
  2. +6
    -0
      ButcherFactory.BO/LocalBL/SegmentProductionBL.cs
  3. +1
    -0
      ButcherFactory.BO/Utils/AppContext.cs
  4. +2
    -1
      ButcherFactory.Form/ButcherFactory.Form.csproj
  5. +3
    -0
      ButcherFactory.Form/Controls/Utils/JST2018SDataFormat.cs
  6. +70
    -0
      ButcherFactory.Form/Controls/Utils/JST8180DataFormat.cs
  7. +3
    -0
      ButcherFactory.Form/Controls/WeightControl.cs
  8. +2
    -2
      ButcherFactory.Form/Controls/WeightSettingFrom.cs
  9. +290
    -328
      ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs
  10. +797
    -880
      ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
  11. +0
    -6
      ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.resx
  12. +13
    -1
      ButcherFactory.Login/ButcherFactory.Login.csproj
  13. +20
    -19
      ButcherFactory.Login/Login.xaml.cs
  14. +26
    -0
      ButcherFactory.Login/app.Designer.cs
  15. +7
    -1
      ButcherFactory.Login/app.config
  16. +28
    -0
      ButcherFactory.Login/app.manifest
  17. +1
    -1
      ButcherFactory.Tools/ButcherFactory.Tools.csproj
  18. +1
    -1
      ButcherFactory.Tools/app.config

+ 1
- 1
ButcherFactory.BO/ButcherFactory.BO.csproj View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ButcherFactory.BO</RootNamespace> <RootNamespace>ButcherFactory.BO</RootNamespace>
<AssemblyName>ButcherFactory.BO</AssemblyName> <AssemblyName>ButcherFactory.BO</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>


+ 6
- 0
ButcherFactory.BO/LocalBL/SegmentProductionBL.cs View File

@ -18,6 +18,7 @@ namespace ButcherFactory.BO.LocalBL
const string RpcPath = @"/MainSystem/B3ClientService/Rpcs/SegmentProductionRpc/"; const string RpcPath = @"/MainSystem/B3ClientService/Rpcs/SegmentProductionRpc/";
const string ProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/GetSaleOutStoreNumber"; const string ProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/GetSaleOutStoreNumber";
const string BatchProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/BatchGetSaleOutStoreNumber"; const string BatchProductTaskRpc = @"/MainSystem/B3Sale/Rpcs/SaleOutStoreRpc/BatchGetSaleOutStoreNumber";
const string GetMinWeightMethod = @"/MainSystem/B3ClientService/Rpcs/SegmentProductionRpc/GetMinWeight";
public static BindingList<SegmentProduction> GetListByState(bool submited) public static BindingList<SegmentProduction> GetListByState(bool submited)
{ {
@ -691,6 +692,11 @@ namespace ButcherFactory.BO.LocalBL
session.Commit(); session.Commit();
} }
} }
public static decimal GetMinWeight()
{
return RpcFacade.Call<decimal>(GetMinWeightMethod);
}
} }
class SegmentProductionMin class SegmentProductionMin


+ 1
- 0
ButcherFactory.BO/Utils/AppContext.cs View File

@ -9,6 +9,7 @@ namespace ButcherFactory.BO.Utils
{ {
public static class AppContext public static class AppContext
{ {
public static string Version = "202611181920";
public static bool RpcFacadeInited { get; set; } public static bool RpcFacadeInited { get; set; }
static ServerUrlConfig _connectInfo = ServerUrlConfig.Init(); static ServerUrlConfig _connectInfo = ServerUrlConfig.Init();
public static ServerUrlConfig ConnectInfo { get { return _connectInfo; } } public static ServerUrlConfig ConnectInfo { get { return _connectInfo; } }


+ 2
- 1
ButcherFactory.Form/ButcherFactory.Form.csproj View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ButcherFactory</RootNamespace> <RootNamespace>ButcherFactory</RootNamespace>
<AssemblyName>ButcherFactory.Form</AssemblyName> <AssemblyName>ButcherFactory.Form</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
@ -117,6 +117,7 @@
<DependentUpon>UserControl1.cs</DependentUpon> <DependentUpon>UserControl1.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\Utils\AoHaoSi3000DataFormat.cs" /> <Compile Include="Controls\Utils\AoHaoSi3000DataFormat.cs" />
<Compile Include="Controls\Utils\JST8180DataFormat.cs" />
<Compile Include="Controls\Utils\DataFormatBase.cs" /> <Compile Include="Controls\Utils\DataFormatBase.cs" />
<Compile Include="Controls\Utils\IND560DataFormat.cs" /> <Compile Include="Controls\Utils\IND560DataFormat.cs" />
<Compile Include="Controls\Utils\JST2018SDataFormat.cs" /> <Compile Include="Controls\Utils\JST2018SDataFormat.cs" />


+ 3
- 0
ButcherFactory.Form/Controls/Utils/JST2018SDataFormat.cs View File

@ -8,6 +8,9 @@ namespace ButcherFactory.Controls
{ {
internal class JST2018SDataFormat : DataFormatBase 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 public override int DataLength
{ {
get { return 8; } get { return 8; }


+ 70
- 0
ButcherFactory.Form/Controls/Utils/JST8180DataFormat.cs View File

@ -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;
}
}
}

+ 3
- 0
ButcherFactory.Form/Controls/WeightControl.cs View File

@ -145,6 +145,9 @@ namespace ButcherFactory.Controls
case "JST2018S": case "JST2018S":
_dataFormat = new JST2018SDataFormat(); _dataFormat = new JST2018SDataFormat();
break; 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 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(); _dataFormat = new CombineWeightDataFormat();
break; break;


+ 2
- 2
ButcherFactory.Form/Controls/WeightSettingFrom.cs View File

@ -12,9 +12,9 @@ namespace ButcherFactory.Controls
{ {
public partial class WeightSettingFrom : Form 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> com = new List<string> { "COM1", "COM2", "COM3", "COM4", "COM5" };
List<string> rate = new List<string> { "1200", "2400", "4800", "7200", "9600" };
List<string> rate = new List<string> { "1200", "2400", "4800", "7200", "9600" , "115200" };
List<string> bit = new List<string> { "5", "6", "7", "8" }; List<string> bit = new List<string> { "5", "6", "7", "8" };
List<string> weightRead = new List<string> { "稳定读取", "连续发送" }; List<string> weightRead = new List<string> { "稳定读取", "连续发送" };
string _flag; string _flag;


+ 290
- 328
ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.Designer.cs View File

@ -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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
@ -44,13 +43,18 @@
this.T_Last = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.T_Last = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.GoodsLabel = new WinFormControl.ULabel(); this.GoodsLabel = new WinFormControl.ULabel();
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.scDate = new WinFormControl.ULabel();
this.label4 = new System.Windows.Forms.Label();
this.butcherDateBox = new WinFormControl.ULabel(); this.butcherDateBox = new WinFormControl.ULabel();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.numberInput = new System.Windows.Forms.TextBox(); this.numberInput = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.statisticNumberBox = new System.Windows.Forms.TextBox(); this.statisticNumberBox = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.logBtn = new ButcherFactory.Controls.ColorButton();
this.msglbl = new System.Windows.Forms.Label(); 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.barPrintCheck = new System.Windows.Forms.CheckBox();
this.uTimerLabel1 = new WinFormControl.UTimerLabel(); this.uTimerLabel1 = new WinFormControl.UTimerLabel();
this.productBatchSelect = new System.Windows.Forms.ComboBox(); this.productBatchSelect = new System.Windows.Forms.ComboBox();
@ -59,27 +63,17 @@
this.uLabel2 = new WinFormControl.ULabel(); this.uLabel2 = new WinFormControl.ULabel();
this.netStateWatch1 = new WinFormControl.NetStateWatch(); this.netStateWatch1 = new WinFormControl.NetStateWatch();
this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.goodsSetBtn = new ButcherFactory.Controls.ColorButton();
this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel(); this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
this.flowLayoutPanel1 = 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.colorButton2 = new ButcherFactory.Controls.ColorButton();
this.viewTaskBtn = new ButcherFactory.Controls.ColorButton(); this.viewTaskBtn = new ButcherFactory.Controls.ColorButton();
this.colorButton1 = new ButcherFactory.Controls.ColorButton(); this.colorButton1 = new ButcherFactory.Controls.ColorButton();
this.deleteBtn = new ButcherFactory.Controls.ColorButton(); this.deleteBtn = new ButcherFactory.Controls.ColorButton();
this.rePrintBtn = 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(); this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.taskDataGrid)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.taskDataGrid)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@ -91,7 +85,6 @@
this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout(); this.splitContainer2.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.roundPanel2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// uLabel3 // uLabel3
@ -99,19 +92,21 @@
this.uLabel3.AutoSize = true; this.uLabel3.AutoSize = true;
this.uLabel3.BackColor = System.Drawing.Color.White; this.uLabel3.BackColor = System.Drawing.Color.White;
this.uLabel3.Font = new System.Drawing.Font("宋体", 12F); this.uLabel3.Font = new System.Drawing.Font("宋体", 12F);
this.uLabel3.Location = new System.Drawing.Point(8, 0);
this.uLabel3.Location = new System.Drawing.Point(11, 0);
this.uLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.uLabel3.Name = "uLabel3"; this.uLabel3.Name = "uLabel3";
this.uLabel3.Size = new System.Drawing.Size(71, 16);
this.uLabel3.Size = new System.Drawing.Size(89, 20);
this.uLabel3.TabIndex = 1; this.uLabel3.TabIndex = 1;
this.uLabel3.Text = "生产历史"; this.uLabel3.Text = "生产历史";
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.taskDataGrid); this.groupBox2.Controls.Add(this.taskDataGrid);
this.groupBox2.Location = new System.Drawing.Point(3, 3);
this.groupBox2.Location = new System.Drawing.Point(4, 4);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(5);
this.groupBox2.Size = new System.Drawing.Size(452, 120);
this.groupBox2.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);
this.groupBox2.Size = new System.Drawing.Size(603, 150);
this.groupBox2.TabIndex = 4; this.groupBox2.TabIndex = 4;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
@ -137,25 +132,29 @@
this.T_Done, this.T_Done,
this.T_Last}); this.T_Last});
this.taskDataGrid.Dock = System.Windows.Forms.DockStyle.Fill; this.taskDataGrid.Dock = System.Windows.Forms.DockStyle.Fill;
this.taskDataGrid.Location = new System.Drawing.Point(5, 19);
this.taskDataGrid.Location = new System.Drawing.Point(7, 24);
this.taskDataGrid.Margin = new System.Windows.Forms.Padding(4);
this.taskDataGrid.MultiSelect = false; this.taskDataGrid.MultiSelect = false;
this.taskDataGrid.Name = "taskDataGrid"; this.taskDataGrid.Name = "taskDataGrid";
this.taskDataGrid.ReadOnly = true; this.taskDataGrid.ReadOnly = true;
this.taskDataGrid.RowHeadersVisible = false; 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.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))))); dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
this.taskDataGrid.RowsDefaultCellStyle = dataGridViewCellStyle6; this.taskDataGrid.RowsDefaultCellStyle = dataGridViewCellStyle6;
this.taskDataGrid.RowTemplate.Height = 23; this.taskDataGrid.RowTemplate.Height = 23;
this.taskDataGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.taskDataGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.taskDataGrid.Size = new System.Drawing.Size(442, 96);
this.taskDataGrid.Size = new System.Drawing.Size(589, 120);
this.taskDataGrid.TabIndex = 2; this.taskDataGrid.TabIndex = 2;
// //
// T_Item // T_Item
// //
this.T_Item.DataPropertyName = "Item"; this.T_Item.DataPropertyName = "Item";
this.T_Item.HeaderText = "项目"; this.T_Item.HeaderText = "项目";
this.T_Item.MinimumWidth = 6;
this.T_Item.Name = "T_Item"; this.T_Item.Name = "T_Item";
this.T_Item.ReadOnly = true; this.T_Item.ReadOnly = true;
this.T_Item.Width = 125;
// //
// T_Need // T_Need
// //
@ -164,6 +163,7 @@
dataGridViewCellStyle3.Format = "#0.######"; dataGridViewCellStyle3.Format = "#0.######";
this.T_Need.DefaultCellStyle = dataGridViewCellStyle3; this.T_Need.DefaultCellStyle = dataGridViewCellStyle3;
this.T_Need.HeaderText = "订货"; this.T_Need.HeaderText = "订货";
this.T_Need.MinimumWidth = 6;
this.T_Need.Name = "T_Need"; this.T_Need.Name = "T_Need";
this.T_Need.ReadOnly = true; this.T_Need.ReadOnly = true;
// //
@ -174,6 +174,7 @@
dataGridViewCellStyle4.Format = "#0.######"; dataGridViewCellStyle4.Format = "#0.######";
this.T_Done.DefaultCellStyle = dataGridViewCellStyle4; this.T_Done.DefaultCellStyle = dataGridViewCellStyle4;
this.T_Done.HeaderText = "完工"; this.T_Done.HeaderText = "完工";
this.T_Done.MinimumWidth = 6;
this.T_Done.Name = "T_Done"; this.T_Done.Name = "T_Done";
this.T_Done.ReadOnly = true; this.T_Done.ReadOnly = true;
// //
@ -184,6 +185,7 @@
dataGridViewCellStyle5.Format = "#0.######"; dataGridViewCellStyle5.Format = "#0.######";
this.T_Last.DefaultCellStyle = dataGridViewCellStyle5; this.T_Last.DefaultCellStyle = dataGridViewCellStyle5;
this.T_Last.HeaderText = "剩余"; this.T_Last.HeaderText = "剩余";
this.T_Last.MinimumWidth = 6;
this.T_Last.Name = "T_Last"; this.T_Last.Name = "T_Last";
this.T_Last.ReadOnly = true; this.T_Last.ReadOnly = true;
// //
@ -193,9 +195,10 @@
this.GoodsLabel.BackColor = System.Drawing.Color.White; this.GoodsLabel.BackColor = System.Drawing.Color.White;
this.GoodsLabel.Font = new System.Drawing.Font("宋体", 12F); this.GoodsLabel.Font = new System.Drawing.Font("宋体", 12F);
this.GoodsLabel.ForeColor = System.Drawing.Color.Blue; this.GoodsLabel.ForeColor = System.Drawing.Color.Blue;
this.GoodsLabel.Location = new System.Drawing.Point(144, 178);
this.GoodsLabel.Location = new System.Drawing.Point(190, 223);
this.GoodsLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.GoodsLabel.Name = "GoodsLabel"; this.GoodsLabel.Name = "GoodsLabel";
this.GoodsLabel.Size = new System.Drawing.Size(71, 16);
this.GoodsLabel.Size = new System.Drawing.Size(89, 20);
this.GoodsLabel.TabIndex = 1; this.GoodsLabel.TabIndex = 1;
this.GoodsLabel.Text = "存货名称"; this.GoodsLabel.Text = "存货名称";
// //
@ -206,14 +209,14 @@
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
this.splitContainer1.IsSplitterFixed = true; this.splitContainer1.IsSplitterFixed = true;
this.splitContainer1.Location = new System.Drawing.Point(0, 0); this.splitContainer1.Location = new System.Drawing.Point(0, 0);
this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Name = "splitContainer1";
this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
// //
// splitContainer1.Panel1 // 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.scDate);
this.splitContainer1.Panel1.Controls.Add(this.label4);
this.splitContainer1.Panel1.Controls.Add(this.butcherDateBox); this.splitContainer1.Panel1.Controls.Add(this.butcherDateBox);
this.splitContainer1.Panel1.Controls.Add(this.label3); this.splitContainer1.Panel1.Controls.Add(this.label3);
this.splitContainer1.Panel1.Controls.Add(this.numberInput); this.splitContainer1.Panel1.Controls.Add(this.numberInput);
@ -223,6 +226,7 @@
this.splitContainer1.Panel1.Controls.Add(this.logBtn); this.splitContainer1.Panel1.Controls.Add(this.logBtn);
this.splitContainer1.Panel1.Controls.Add(this.msglbl); this.splitContainer1.Panel1.Controls.Add(this.msglbl);
this.splitContainer1.Panel1.Controls.Add(this.closeBtn); 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.barPrintCheck);
this.splitContainer1.Panel1.Controls.Add(this.uTimerLabel1); this.splitContainer1.Panel1.Controls.Add(this.uTimerLabel1);
this.splitContainer1.Panel1.Controls.Add(this.productBatchSelect); this.splitContainer1.Panel1.Controls.Add(this.productBatchSelect);
@ -234,18 +238,44 @@
// splitContainer1.Panel2 // splitContainer1.Panel2
// //
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); 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(1440, 810);
this.splitContainer1.SplitterDistance = 150;
this.splitContainer1.SplitterWidth = 5;
this.splitContainer1.TabIndex = 1; this.splitContainer1.TabIndex = 1;
// //
// scDate
//
this.scDate.BackColor = System.Drawing.Color.Transparent;
this.scDate.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.scDate.Font = new System.Drawing.Font("宋体", 15F);
this.scDate.Location = new System.Drawing.Point(972, 8);
this.scDate.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.scDate.Name = "scDate";
this.scDate.Size = new System.Drawing.Size(153, 37);
this.scDate.TabIndex = 37;
this.scDate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.scDate.MouseClick += new System.Windows.Forms.MouseEventHandler(this.scDateBox_MouseClick);
//
// label4
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(873, 18);
this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(120, 22);
this.label4.TabIndex = 36;
this.label4.Text = "生产日期:";
//
// butcherDateBox // butcherDateBox
// //
this.butcherDateBox.BackColor = System.Drawing.Color.Transparent; this.butcherDateBox.BackColor = System.Drawing.Color.Transparent;
this.butcherDateBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.butcherDateBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.butcherDateBox.Font = new System.Drawing.Font("宋体", 15F); this.butcherDateBox.Font = new System.Drawing.Font("宋体", 15F);
this.butcherDateBox.Location = new System.Drawing.Point(502, 15);
this.butcherDateBox.Location = new System.Drawing.Point(647, 10);
this.butcherDateBox.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.butcherDateBox.Name = "butcherDateBox"; this.butcherDateBox.Name = "butcherDateBox";
this.butcherDateBox.Size = new System.Drawing.Size(115, 30);
this.butcherDateBox.Size = new System.Drawing.Size(153, 37);
this.butcherDateBox.TabIndex = 35; this.butcherDateBox.TabIndex = 35;
this.butcherDateBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.butcherDateBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.butcherDateBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.butcherDateBox_MouseClick); this.butcherDateBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.butcherDateBox_MouseClick);
@ -253,19 +283,21 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("宋体", 15F);
this.label3.Location = new System.Drawing.Point(400, 21);
this.label3.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(529, 18);
this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(109, 20);
this.label3.Size = new System.Drawing.Size(120, 22);
this.label3.TabIndex = 30; this.label3.TabIndex = 30;
this.label3.Text = "屠宰日期:"; this.label3.Text = "屠宰日期:";
// //
// numberInput // numberInput
// //
this.numberInput.Font = new System.Drawing.Font("宋体", 15F); this.numberInput.Font = new System.Drawing.Font("宋体", 15F);
this.numberInput.Location = new System.Drawing.Point(680, 47);
this.numberInput.Location = new System.Drawing.Point(972, 60);
this.numberInput.Margin = new System.Windows.Forms.Padding(4);
this.numberInput.Name = "numberInput"; this.numberInput.Name = "numberInput";
this.numberInput.Size = new System.Drawing.Size(115, 30);
this.numberInput.Size = new System.Drawing.Size(152, 36);
this.numberInput.TabIndex = 29; this.numberInput.TabIndex = 29;
this.numberInput.Text = "1"; this.numberInput.Text = "1";
this.numberInput.MouseClick += new System.Windows.Forms.MouseEventHandler(this.numberInput_MouseClick); this.numberInput.MouseClick += new System.Windows.Forms.MouseEventHandler(this.numberInput_MouseClick);
@ -273,116 +305,161 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("宋体", 15F);
this.label2.Location = new System.Drawing.Point(623, 51);
this.label2.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(873, 66);
this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(69, 20);
this.label2.Size = new System.Drawing.Size(76, 22);
this.label2.TabIndex = 28; this.label2.TabIndex = 28;
this.label2.Text = "数量:"; this.label2.Text = "数量:";
// //
// statisticNumberBox // statisticNumberBox
// //
this.statisticNumberBox.Font = new System.Drawing.Font("宋体", 15F); this.statisticNumberBox.Font = new System.Drawing.Font("宋体", 15F);
this.statisticNumberBox.Location = new System.Drawing.Point(502, 47);
this.statisticNumberBox.Location = new System.Drawing.Point(647, 61);
this.statisticNumberBox.Margin = new System.Windows.Forms.Padding(4);
this.statisticNumberBox.Name = "statisticNumberBox"; this.statisticNumberBox.Name = "statisticNumberBox";
this.statisticNumberBox.Size = new System.Drawing.Size(115, 30);
this.statisticNumberBox.Size = new System.Drawing.Size(152, 36);
this.statisticNumberBox.TabIndex = 27; this.statisticNumberBox.TabIndex = 27;
this.statisticNumberBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.StatisticNumberBox_MouseClick); this.statisticNumberBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.StatisticNumberBox_MouseClick);
// //
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("宋体", 15F);
this.label1.Location = new System.Drawing.Point(400, 51);
this.label1.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(529, 65);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(109, 20);
this.label1.Size = new System.Drawing.Size(120, 22);
this.label1.TabIndex = 26; this.label1.TabIndex = 26;
this.label1.Text = "统计数量:"; 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 // msglbl
// //
this.msglbl.AutoSize = true; this.msglbl.AutoSize = true;
this.msglbl.ForeColor = System.Drawing.Color.Red; this.msglbl.ForeColor = System.Drawing.Color.Red;
this.msglbl.Location = new System.Drawing.Point(388, 6);
this.msglbl.Location = new System.Drawing.Point(23, 119);
this.msglbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.msglbl.Name = "msglbl"; this.msglbl.Name = "msglbl";
this.msglbl.Size = new System.Drawing.Size(101, 12);
this.msglbl.Size = new System.Drawing.Size(0, 15);
this.msglbl.TabIndex = 24; this.msglbl.TabIndex = 24;
this.msglbl.Text = "";
//
// 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 // barPrintCheck
// //
this.barPrintCheck.AutoSize = true; this.barPrintCheck.AutoSize = true;
this.barPrintCheck.Font = new System.Drawing.Font("宋体", 15F); this.barPrintCheck.Font = new System.Drawing.Font("宋体", 15F);
this.barPrintCheck.Location = new System.Drawing.Point(292, 50);
this.barPrintCheck.Location = new System.Drawing.Point(389, 62);
this.barPrintCheck.Margin = new System.Windows.Forms.Padding(4);
this.barPrintCheck.Name = "barPrintCheck"; this.barPrintCheck.Name = "barPrintCheck";
this.barPrintCheck.Size = new System.Drawing.Size(108, 24);
this.barPrintCheck.Size = new System.Drawing.Size(134, 29);
this.barPrintCheck.TabIndex = 16; this.barPrintCheck.TabIndex = 16;
this.barPrintCheck.Text = "启用打码"; this.barPrintCheck.Text = "启用打码";
this.barPrintCheck.UseVisualStyleBackColor = true; this.barPrintCheck.UseVisualStyleBackColor = true;
// //
// uTimerLabel1 // uTimerLabel1
// //
this.uTimerLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.uTimerLabel1.AutoSize = true; this.uTimerLabel1.AutoSize = true;
this.uTimerLabel1.BackColor = System.Drawing.Color.Transparent; this.uTimerLabel1.BackColor = System.Drawing.Color.Transparent;
this.uTimerLabel1.Font = new System.Drawing.Font("黑体", 12F); this.uTimerLabel1.Font = new System.Drawing.Font("黑体", 12F);
this.uTimerLabel1.Format = "M月d日 H:mm:ss"; this.uTimerLabel1.Format = "M月d日 H:mm:ss";
this.uTimerLabel1.Location = new System.Drawing.Point(1084, 53);
this.uTimerLabel1.Location = new System.Drawing.Point(1224, 62);
this.uTimerLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.uTimerLabel1.Name = "uTimerLabel1"; this.uTimerLabel1.Name = "uTimerLabel1";
this.uTimerLabel1.Size = new System.Drawing.Size(135, 16);
this.uTimerLabel1.Size = new System.Drawing.Size(169, 20);
this.uTimerLabel1.TabIndex = 14; this.uTimerLabel1.TabIndex = 14;
this.uTimerLabel1.Text = "4月21日 16:32:19"; this.uTimerLabel1.Text = "4月21日 16:32:19";
// //
// productBatchSelect // productBatchSelect
// //
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.Font = new System.Drawing.Font("宋体", 15F);
this.productBatchSelect.FormattingEnabled = true; this.productBatchSelect.FormattingEnabled = true;
this.productBatchSelect.Location = new System.Drawing.Point(903, 47);
this.productBatchSelect.Location = new System.Drawing.Point(984, 109);
this.productBatchSelect.Margin = new System.Windows.Forms.Padding(4);
this.productBatchSelect.Name = "productBatchSelect"; this.productBatchSelect.Name = "productBatchSelect";
this.productBatchSelect.Size = new System.Drawing.Size(170, 28);
this.productBatchSelect.Size = new System.Drawing.Size(225, 33);
this.productBatchSelect.TabIndex = 11; this.productBatchSelect.TabIndex = 11;
// //
// workUnitSelect // workUnitSelect
// //
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.Font = new System.Drawing.Font("宋体", 15F);
this.workUnitSelect.FormattingEnabled = true; this.workUnitSelect.FormattingEnabled = true;
this.workUnitSelect.Location = new System.Drawing.Point(903, 11);
this.workUnitSelect.Location = new System.Drawing.Point(640, 107);
this.workUnitSelect.Margin = new System.Windows.Forms.Padding(4);
this.workUnitSelect.Name = "workUnitSelect"; this.workUnitSelect.Name = "workUnitSelect";
this.workUnitSelect.Size = new System.Drawing.Size(170, 28);
this.workUnitSelect.Size = new System.Drawing.Size(225, 33);
this.workUnitSelect.TabIndex = 10; this.workUnitSelect.TabIndex = 10;
// //
// uLabel1 // uLabel1
// //
this.uLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.uLabel1.AutoSize = true; this.uLabel1.AutoSize = true;
this.uLabel1.BackColor = System.Drawing.Color.Transparent; 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.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uLabel1.Location = new System.Drawing.Point(529, 114);
this.uLabel1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.uLabel1.Name = "uLabel1"; this.uLabel1.Name = "uLabel1";
this.uLabel1.Size = new System.Drawing.Size(109, 20);
this.uLabel1.Size = new System.Drawing.Size(120, 22);
this.uLabel1.TabIndex = 12; this.uLabel1.TabIndex = 12;
this.uLabel1.Text = "工作单元:"; this.uLabel1.Text = "工作单元:";
// //
// uLabel2 // uLabel2
// //
this.uLabel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.uLabel2.AutoSize = true; this.uLabel2.AutoSize = true;
this.uLabel2.BackColor = System.Drawing.Color.Transparent; 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.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uLabel2.Location = new System.Drawing.Point(873, 113);
this.uLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.uLabel2.Name = "uLabel2"; this.uLabel2.Name = "uLabel2";
this.uLabel2.Size = new System.Drawing.Size(109, 20);
this.uLabel2.Size = new System.Drawing.Size(120, 22);
this.uLabel2.TabIndex = 13; this.uLabel2.TabIndex = 13;
this.uLabel2.Text = "生产批次:"; this.uLabel2.Text = "生产批次:";
// //
// netStateWatch1 // netStateWatch1
// //
this.netStateWatch1.BackColor = System.Drawing.Color.Transparent; this.netStateWatch1.BackColor = System.Drawing.Color.Transparent;
this.netStateWatch1.Location = new System.Drawing.Point(292, 2);
this.netStateWatch1.Location = new System.Drawing.Point(389, 2);
this.netStateWatch1.Margin = new System.Windows.Forms.Padding(5);
this.netStateWatch1.Name = "netStateWatch1"; this.netStateWatch1.Name = "netStateWatch1";
this.netStateWatch1.Size = new System.Drawing.Size(90, 39);
this.netStateWatch1.Size = new System.Drawing.Size(120, 49);
this.netStateWatch1.TabIndex = 1; this.netStateWatch1.TabIndex = 1;
// //
// splitContainer2 // splitContainer2
@ -391,6 +468,7 @@
this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainer2.Location = new System.Drawing.Point(0, 0); this.splitContainer2.Location = new System.Drawing.Point(0, 0);
this.splitContainer2.Margin = new System.Windows.Forms.Padding(4);
this.splitContainer2.Name = "splitContainer2"; this.splitContainer2.Name = "splitContainer2";
// //
// splitContainer2.Panel1 // splitContainer2.Panel1
@ -409,10 +487,27 @@
this.splitContainer2.Panel2.Controls.Add(this.rePrintBtn); this.splitContainer2.Panel2.Controls.Add(this.rePrintBtn);
this.splitContainer2.Panel2.Controls.Add(this.groupBox1); this.splitContainer2.Panel2.Controls.Add(this.groupBox1);
this.splitContainer2.Panel2.Controls.Add(this.groupBox2); 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(1440, 655);
this.splitContainer2.SplitterDistance = 821;
this.splitContainer2.SplitterWidth = 5;
this.splitContainer2.TabIndex = 0; 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 // flowLayoutPanel2
// //
this.flowLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.flowLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@ -420,203 +515,34 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.flowLayoutPanel2.AutoScroll = true; this.flowLayoutPanel2.AutoScroll = true;
this.flowLayoutPanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.flowLayoutPanel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.flowLayoutPanel2.Location = new System.Drawing.Point(-1, 75);
this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 89);
this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
this.flowLayoutPanel2.Name = "flowLayoutPanel2"; this.flowLayoutPanel2.Name = "flowLayoutPanel2";
this.flowLayoutPanel2.Size = new System.Drawing.Size(757, 536);
this.flowLayoutPanel2.Size = new System.Drawing.Size(816, 564);
this.flowLayoutPanel2.TabIndex = 24; this.flowLayoutPanel2.TabIndex = 24;
// //
// flowLayoutPanel1 // flowLayoutPanel1
// //
this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.flowLayoutPanel1.AutoScroll = true;
this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.flowLayoutPanel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.flowLayoutPanel1.Location = new System.Drawing.Point(-1, -1);
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 4);
this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(640, 70);
this.flowLayoutPanel1.Size = new System.Drawing.Size(682, 87);
this.flowLayoutPanel1.TabIndex = 22; 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 // colorButton2
// //
this.colorButton2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); this.colorButton2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192)))));
this.colorButton2.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.colorButton2.Font = new System.Drawing.Font("宋体", 13F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.colorButton2.ForeColor = System.Drawing.Color.White; this.colorButton2.ForeColor = System.Drawing.Color.White;
this.colorButton2.Location = new System.Drawing.Point(344, 178);
this.colorButton2.Location = new System.Drawing.Point(457, 223);
this.colorButton2.Margin = new System.Windows.Forms.Padding(4);
this.colorButton2.Name = "colorButton2"; this.colorButton2.Name = "colorButton2";
this.colorButton2.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107))))); this.colorButton2.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
this.colorButton2.Size = new System.Drawing.Size(91, 38);
this.colorButton2.Size = new System.Drawing.Size(121, 48);
this.colorButton2.TabIndex = 5; this.colorButton2.TabIndex = 5;
this.colorButton2.Text = "打总码"; this.colorButton2.Text = "打总码";
this.colorButton2.UseVisualStyleBackColor = false; this.colorButton2.UseVisualStyleBackColor = false;
@ -628,10 +554,11 @@
this.viewTaskBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(77)))), ((int)(((byte)(135)))), ((int)(((byte)(245))))); 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.Font = new System.Drawing.Font("宋体", 15F);
this.viewTaskBtn.ForeColor = System.Drawing.Color.White; this.viewTaskBtn.ForeColor = System.Drawing.Color.White;
this.viewTaskBtn.Location = new System.Drawing.Point(13, 124);
this.viewTaskBtn.Location = new System.Drawing.Point(-9, 156);
this.viewTaskBtn.Margin = new System.Windows.Forms.Padding(4);
this.viewTaskBtn.Name = "viewTaskBtn"; this.viewTaskBtn.Name = "viewTaskBtn";
this.viewTaskBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106))))); 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);
this.viewTaskBtn.Size = new System.Drawing.Size(133, 51);
this.viewTaskBtn.TabIndex = 24; this.viewTaskBtn.TabIndex = 24;
this.viewTaskBtn.Text = "完工"; this.viewTaskBtn.Text = "完工";
this.viewTaskBtn.UseVisualStyleBackColor = false; this.viewTaskBtn.UseVisualStyleBackColor = false;
@ -642,10 +569,11 @@
this.colorButton1.BackColor = System.Drawing.Color.Blue; this.colorButton1.BackColor = System.Drawing.Color.Blue;
this.colorButton1.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.colorButton1.Font = new System.Drawing.Font("宋体", 28F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.colorButton1.ForeColor = System.Drawing.Color.White; this.colorButton1.ForeColor = System.Drawing.Color.White;
this.colorButton1.Location = new System.Drawing.Point(13, 178);
this.colorButton1.Location = new System.Drawing.Point(4, 223);
this.colorButton1.Margin = new System.Windows.Forms.Padding(4);
this.colorButton1.Name = "colorButton1"; this.colorButton1.Name = "colorButton1";
this.colorButton1.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107))))); this.colorButton1.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(15)))), ((int)(((byte)(215)))), ((int)(((byte)(107)))));
this.colorButton1.Size = new System.Drawing.Size(100, 38);
this.colorButton1.Size = new System.Drawing.Size(133, 48);
this.colorButton1.TabIndex = 3; this.colorButton1.TabIndex = 3;
this.colorButton1.Text = "+"; this.colorButton1.Text = "+";
this.colorButton1.UseVisualStyleBackColor = false; this.colorButton1.UseVisualStyleBackColor = false;
@ -657,10 +585,11 @@
this.deleteBtn.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(25))))); 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.Font = new System.Drawing.Font("宋体", 15F);
this.deleteBtn.ForeColor = System.Drawing.Color.White; this.deleteBtn.ForeColor = System.Drawing.Color.White;
this.deleteBtn.Location = new System.Drawing.Point(178, 124);
this.deleteBtn.Location = new System.Drawing.Point(211, 156);
this.deleteBtn.Margin = new System.Windows.Forms.Padding(4);
this.deleteBtn.Name = "deleteBtn"; this.deleteBtn.Name = "deleteBtn";
this.deleteBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106))))); 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);
this.deleteBtn.Size = new System.Drawing.Size(113, 51);
this.deleteBtn.TabIndex = 23; this.deleteBtn.TabIndex = 23;
this.deleteBtn.Text = "删除"; this.deleteBtn.Text = "删除";
this.deleteBtn.UseVisualStyleBackColor = false; this.deleteBtn.UseVisualStyleBackColor = false;
@ -672,27 +601,67 @@
this.rePrintBtn.Enabled = false; this.rePrintBtn.Enabled = false;
this.rePrintBtn.Font = new System.Drawing.Font("宋体", 15F); this.rePrintBtn.Font = new System.Drawing.Font("宋体", 15F);
this.rePrintBtn.ForeColor = System.Drawing.Color.White; this.rePrintBtn.ForeColor = System.Drawing.Color.White;
this.rePrintBtn.Location = new System.Drawing.Point(344, 126);
this.rePrintBtn.Location = new System.Drawing.Point(457, 159);
this.rePrintBtn.Margin = new System.Windows.Forms.Padding(4);
this.rePrintBtn.Name = "rePrintBtn"; this.rePrintBtn.Name = "rePrintBtn";
this.rePrintBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106))))); this.rePrintBtn.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(234)))), ((int)(((byte)(106)))));
this.rePrintBtn.Size = new System.Drawing.Size(91, 39);
this.rePrintBtn.Size = new System.Drawing.Size(121, 49);
this.rePrintBtn.TabIndex = 22; this.rePrintBtn.TabIndex = 22;
this.rePrintBtn.Text = "补打"; this.rePrintBtn.Text = "补打";
this.rePrintBtn.UseVisualStyleBackColor = false; this.rePrintBtn.UseVisualStyleBackColor = false;
this.rePrintBtn.Visible = false; this.rePrintBtn.Visible = false;
this.rePrintBtn.Click += new System.EventHandler(this.rePrintBtn_Click); 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 // SegmentProductionAutoForm
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1226, 704);
this.ClientSize = new System.Drawing.Size(1440, 810);
this.Controls.Add(this.splitContainer1); this.Controls.Add(this.splitContainer1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "SegmentProductionAutoForm"; this.Name = "SegmentProductionAutoForm";
this.Text = "分割品车间称重计数"; this.Text = "分割品车间称重计数";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized; this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.SegmentProductionAutoForm_Load);
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.taskDataGrid)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.taskDataGrid)).EndInit();
this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel1.ResumeLayout(false);
@ -707,37 +676,36 @@
this.splitContainer2.ResumeLayout(false); this.splitContainer2.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.roundPanel2.ResumeLayout(false);
this.roundPanel2.PerformLayout();
this.ResumeLayout(false); 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.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.Label msglbl;
private System.Windows.Forms.CheckBox barPrintCheck; private System.Windows.Forms.CheckBox barPrintCheck;
private Controls.ColorButton logBtn; private Controls.ColorButton logBtn;
@ -752,13 +720,7 @@
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel4; private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel4;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private WinFormControl.ULabel butcherDateBox; 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;
}
private WinFormControl.ULabel scDate;
private System.Windows.Forms.Label label4;
}
} }

+ 797
- 880
ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.cs
File diff suppressed because it is too large
View File


+ 0
- 6
ButcherFactory.Form/SegmentProductionAuto_/SegmentProductionAutoForm.resx View File

@ -120,10 +120,4 @@
<metadata name="T_Last.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="T_Last.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </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> </root>

+ 13
- 1
ButcherFactory.Login/ButcherFactory.Login.csproj View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ButcherFactory.Login</RootNamespace> <RootNamespace>ButcherFactory.Login</RootNamespace>
<AssemblyName>ButcherFactory.Login</AssemblyName> <AssemblyName>ButcherFactory.Login</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -40,6 +40,9 @@
<StartupObject> <StartupObject>
</StartupObject> </StartupObject>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@ -64,6 +67,11 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</ApplicationDefinition> </ApplicationDefinition>
<Compile Include="app.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>app.manifest</DependentUpon>
</Compile>
<Compile Include="App.xaml.cs"> <Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon> <DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType> <SubType>Code</SubType>
@ -104,6 +112,10 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" /> <None Include="app.config" />
<None Include="app.manifest">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>app.Designer.cs</LastGenOutput>
</None>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.


+ 20
- 19
ButcherFactory.Login/Login.xaml.cs View File

@ -111,27 +111,28 @@ namespace ButcherFactory.Login
void Login_Loaded(object sender, RoutedEventArgs e) void Login_Loaded(object sender, RoutedEventArgs e)
{ {
if (!File.Exists("ButcherFactory.AutoUpdate.exe"))
return;
var versionInfo = new ClientVersion();
if (File.Exists("ClientVersion.xml"))
{
versionInfo = XmlUtil.DeserializeFromFile<ClientVersion>("ClientVersion.xml");
versionLbl.Text = versionInfo.Version;
}
if (string.IsNullOrEmpty(versionInfo.ServerUrl))
versionInfo.ServerUrl = serUri;
versionLbl.Text = BO.Utils.AppContext.Version;
//if (!File.Exists("ButcherFactory.AutoUpdate.exe"))
// return;
//var versionInfo = new ClientVersion();
//if (File.Exists("ClientVersion.xml"))
//{
// versionInfo = XmlUtil.DeserializeFromFile<ClientVersion>("ClientVersion.xml");
// versionLbl.Text = versionInfo.Version;
//}
//if (string.IsNullOrEmpty(versionInfo.ServerUrl))
// versionInfo.ServerUrl = serUri;
HttpWebRequest req = (HttpWebRequest)WebRequest.Create(versionInfo.ServerUrl);
req.Timeout = 5000;
HttpWebResponse resp = (HttpWebResponse)req.GetResponse();
if (resp.StatusCode != HttpStatusCode.OK)
return;
//HttpWebRequest req = (HttpWebRequest)WebRequest.Create(versionInfo.ServerUrl);
//req.Timeout = 5000;
//HttpWebResponse resp = (HttpWebResponse)req.GetResponse();
//if (resp.StatusCode != HttpStatusCode.OK)
// return;
var down = new System.Net.WebClient();
var serverVersion = XmlUtil.XmlDeserializeObject<ClientVersion>(down.DownloadString(versionInfo.ServerUrl));
if (versionInfo.Version != serverVersion.Version)
updateImg.Visibility = Visibility.Visible;
//var down = new System.Net.WebClient();
//var serverVersion = XmlUtil.XmlDeserializeObject<ClientVersion>(down.DownloadString(versionInfo.ServerUrl));
//if (versionInfo.Version != serverVersion.Version)
// updateImg.Visibility = Visibility.Visible;
} }
private void UpdateBtn_Click(object sender, MouseButtonEventArgs e) private void UpdateBtn_Click(object sender, MouseButtonEventArgs e)


+ 26
- 0
ButcherFactory.Login/app.Designer.cs View File

@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
// 运行时版本:4.0.30319.42000
//
// 对此文件的更改可能会导致不正确的行为,并且如果
// 重新生成代码,这些更改将会丢失。
// </auto-generated>
//------------------------------------------------------------------------------
namespace ButcherFactory.Login {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
internal sealed partial class app : global::System.Configuration.ApplicationSettingsBase {
private static app defaultInstance = ((app)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new app())));
public static app Default {
get {
return defaultInstance;
}
}
}
}

+ 7
- 1
ButcherFactory.Login/app.config View File

@ -1,3 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
</startup>
<runtime>
<loadFromRemoteSources enabled="true"/>
</runtime>
</configuration>

+ 28
- 0
ButcherFactory.Login/app.manifest View File

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" name="ButcherFactory" type="win32" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges>
</security>
</trustInfo>
<application xmlns="urn:schemas-microsoft-com:asm.v3">
<windowsSettings>
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
</windowsSettings>
</application>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
<!-- Windows 10、Windows 11 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
<!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
<!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
<!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
</application>
</compatibility>
</assembly>

+ 1
- 1
ButcherFactory.Tools/ButcherFactory.Tools.csproj View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ButcherFactory.Tools</RootNamespace> <RootNamespace>ButcherFactory.Tools</RootNamespace>
<AssemblyName>ButcherFactory.Tools</AssemblyName> <AssemblyName>ButcherFactory.Tools</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>


+ 1
- 1
ButcherFactory.Tools/app.config View File

@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>

Loading…
Cancel
Save