diff --git a/ButcherFactory.Form/ButcherFactory.Form.csproj b/ButcherFactory.Form/ButcherFactory.Form.csproj
index 6e29ffb..9f6c659 100644
--- a/ButcherFactory.Form/ButcherFactory.Form.csproj
+++ b/ButcherFactory.Form/ButcherFactory.Form.csproj
@@ -57,6 +57,7 @@
CarcassInStoreForm.cs
+
Form
diff --git a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs
index 571c5f4..58fb720 100644
--- a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs
+++ b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.Designer.cs
@@ -28,18 +28,19 @@
///
private void InitializeComponent()
{
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CarcassInStoreForm));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.noWeightBtn = new WinFormControl.UButton();
this.noCodeBtn = new WinFormControl.UButton();
this.closeBtn = new WinFormControl.UButton();
this.uTimerLabel1 = new WinFormControl.UTimerLabel();
@@ -68,7 +69,8 @@
this.U_Weight = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.uLabel3 = new WinFormControl.ULabel();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
- this.noWeightBtn = new WinFormControl.UButton();
+ this.uLabel5 = new WinFormControl.ULabel();
+ this.lowWeight = new WinFormControl.UTextBoxWithPad();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -97,6 +99,7 @@
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.BackColor = System.Drawing.Color.Transparent;
+ this.splitContainer1.Panel1.Controls.Add(this.lowWeight);
this.splitContainer1.Panel1.Controls.Add(this.noWeightBtn);
this.splitContainer1.Panel1.Controls.Add(this.noCodeBtn);
this.splitContainer1.Panel1.Controls.Add(this.closeBtn);
@@ -108,14 +111,35 @@
this.splitContainer1.Panel1.Controls.Add(this.uWeightControl1);
this.splitContainer1.Panel1.Controls.Add(this.uLabel1);
this.splitContainer1.Panel1.Controls.Add(this.uLabel2);
+ this.splitContainer1.Panel1.Controls.Add(this.uLabel5);
//
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
- this.splitContainer1.Size = new System.Drawing.Size(1164, 611);
+ this.splitContainer1.Size = new System.Drawing.Size(1228, 611);
this.splitContainer1.SplitterDistance = 86;
this.splitContainer1.TabIndex = 0;
//
+ // noWeightBtn
+ //
+ this.noWeightBtn.AsClicked = false;
+ this.noWeightBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("noWeightBtn.BackgroundImage")));
+ this.noWeightBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
+ this.noWeightBtn.FlatAppearance.BorderSize = 0;
+ this.noWeightBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.noWeightBtn.Font = new System.Drawing.Font("宋体", 15F);
+ this.noWeightBtn.ForeColor = System.Drawing.Color.Black;
+ this.noWeightBtn.Location = new System.Drawing.Point(358, 44);
+ this.noWeightBtn.Name = "noWeightBtn";
+ this.noWeightBtn.PlaySound = false;
+ this.noWeightBtn.Size = new System.Drawing.Size(111, 34);
+ this.noWeightBtn.SoundType = WinFormControl.SoundType.Click;
+ this.noWeightBtn.TabIndex = 11;
+ this.noWeightBtn.Text = "落 称";
+ this.noWeightBtn.UseVisualStyleBackColor = true;
+ this.noWeightBtn.WithStataHode = false;
+ this.noWeightBtn.Click += new System.EventHandler(this.noWeightBtn_Click);
+ //
// noCodeBtn
//
this.noCodeBtn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -126,7 +150,7 @@
this.noCodeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.noCodeBtn.Font = new System.Drawing.Font("宋体", 15F);
this.noCodeBtn.ForeColor = System.Drawing.Color.Black;
- this.noCodeBtn.Location = new System.Drawing.Point(503, 44);
+ this.noCodeBtn.Location = new System.Drawing.Point(567, 44);
this.noCodeBtn.Name = "noCodeBtn";
this.noCodeBtn.PlaySound = false;
this.noCodeBtn.Size = new System.Drawing.Size(111, 34);
@@ -147,7 +171,7 @@
this.closeBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.closeBtn.Font = new System.Drawing.Font("宋体", 15F);
this.closeBtn.ForeColor = System.Drawing.Color.Black;
- this.closeBtn.Location = new System.Drawing.Point(1046, 7);
+ this.closeBtn.Location = new System.Drawing.Point(1110, 7);
this.closeBtn.Name = "closeBtn";
this.closeBtn.PlaySound = false;
this.closeBtn.Size = new System.Drawing.Size(111, 34);
@@ -165,7 +189,7 @@
this.uTimerLabel1.BackColor = System.Drawing.Color.Transparent;
this.uTimerLabel1.Font = new System.Drawing.Font("黑体", 12F);
this.uTimerLabel1.Format = "M月d日 H:mm:ss";
- this.uTimerLabel1.Location = new System.Drawing.Point(1024, 53);
+ this.uTimerLabel1.Location = new System.Drawing.Point(1088, 53);
this.uTimerLabel1.Name = "uTimerLabel1";
this.uTimerLabel1.Size = new System.Drawing.Size(128, 16);
this.uTimerLabel1.TabIndex = 8;
@@ -176,7 +200,7 @@
this.productBatchSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.productBatchSelect.Font = new System.Drawing.Font("宋体", 15F);
this.productBatchSelect.FormattingEnabled = true;
- this.productBatchSelect.Location = new System.Drawing.Point(843, 47);
+ this.productBatchSelect.Location = new System.Drawing.Point(907, 47);
this.productBatchSelect.Name = "productBatchSelect";
this.productBatchSelect.Size = new System.Drawing.Size(170, 28);
this.productBatchSelect.TabIndex = 4;
@@ -186,7 +210,7 @@
this.workUnitSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.workUnitSelect.Font = new System.Drawing.Font("宋体", 15F);
this.workUnitSelect.FormattingEnabled = true;
- this.workUnitSelect.Location = new System.Drawing.Point(843, 11);
+ this.workUnitSelect.Location = new System.Drawing.Point(907, 11);
this.workUnitSelect.Name = "workUnitSelect";
this.workUnitSelect.Size = new System.Drawing.Size(170, 28);
this.workUnitSelect.TabIndex = 3;
@@ -195,7 +219,7 @@
//
this.uScanPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.uScanPanel1.BackColor = System.Drawing.Color.Transparent;
- this.uScanPanel1.Location = new System.Drawing.Point(439, 9);
+ this.uScanPanel1.Location = new System.Drawing.Point(503, 9);
this.uScanPanel1.Name = "uScanPanel1";
this.uScanPanel1.Size = new System.Drawing.Size(303, 32);
this.uScanPanel1.TabIndex = 2;
@@ -223,7 +247,7 @@
this.uLabel1.AutoSize = true;
this.uLabel1.BackColor = System.Drawing.Color.Transparent;
this.uLabel1.Font = new System.Drawing.Font("宋体", 15F);
- this.uLabel1.Location = new System.Drawing.Point(742, 14);
+ this.uLabel1.Location = new System.Drawing.Point(806, 14);
this.uLabel1.Name = "uLabel1";
this.uLabel1.Size = new System.Drawing.Size(109, 20);
this.uLabel1.TabIndex = 5;
@@ -235,7 +259,7 @@
this.uLabel2.AutoSize = true;
this.uLabel2.BackColor = System.Drawing.Color.Transparent;
this.uLabel2.Font = new System.Drawing.Font("宋体", 15F);
- this.uLabel2.Location = new System.Drawing.Point(742, 50);
+ this.uLabel2.Location = new System.Drawing.Point(806, 50);
this.uLabel2.Name = "uLabel2";
this.uLabel2.Size = new System.Drawing.Size(109, 20);
this.uLabel2.TabIndex = 6;
@@ -260,8 +284,8 @@
//
this.splitContainer2.Panel2.BackColor = System.Drawing.Color.Transparent;
this.splitContainer2.Panel2.Controls.Add(this.flowLayoutPanel1);
- this.splitContainer2.Size = new System.Drawing.Size(1164, 521);
- this.splitContainer2.SplitterDistance = 609;
+ this.splitContainer2.Size = new System.Drawing.Size(1228, 521);
+ this.splitContainer2.SplitterDistance = 673;
this.splitContainer2.TabIndex = 0;
//
// groupBox2
@@ -274,7 +298,7 @@
this.groupBox2.Location = new System.Drawing.Point(11, 254);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(5);
- this.groupBox2.Size = new System.Drawing.Size(584, 254);
+ this.groupBox2.Size = new System.Drawing.Size(648, 254);
this.groupBox2.TabIndex = 1;
this.groupBox2.TabStop = false;
//
@@ -284,15 +308,15 @@
this.historyDataGrid.AllowUserToDeleteRows = false;
this.historyDataGrid.AllowUserToResizeColumns = false;
this.historyDataGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.historyDataGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle31.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.historyDataGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle31;
this.historyDataGrid.BackgroundColor = System.Drawing.Color.White;
this.historyDataGrid.BorderStyle = System.Windows.Forms.BorderStyle.None;
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.historyDataGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle32.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle32.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.historyDataGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32;
this.historyDataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.historyDataGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.H_ID,
@@ -307,12 +331,12 @@
this.historyDataGrid.Name = "historyDataGrid";
this.historyDataGrid.ReadOnly = true;
this.historyDataGrid.RowHeadersVisible = false;
- dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.historyDataGrid.RowsDefaultCellStyle = dataGridViewCellStyle6;
+ dataGridViewCellStyle36.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle36.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.historyDataGrid.RowsDefaultCellStyle = dataGridViewCellStyle36;
this.historyDataGrid.RowTemplate.Height = 23;
this.historyDataGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.historyDataGrid.Size = new System.Drawing.Size(574, 230);
+ this.historyDataGrid.Size = new System.Drawing.Size(638, 230);
this.historyDataGrid.TabIndex = 2;
//
// H_ID
@@ -342,8 +366,8 @@
// H_Weight
//
this.H_Weight.DataPropertyName = "Weight";
- dataGridViewCellStyle3.Format = "#0.######";
- this.H_Weight.DefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle33.Format = "#0.######";
+ this.H_Weight.DefaultCellStyle = dataGridViewCellStyle33;
this.H_Weight.HeaderText = "入库重量";
this.H_Weight.Name = "H_Weight";
this.H_Weight.ReadOnly = true;
@@ -351,8 +375,8 @@
// H_BeforeWeight
//
this.H_BeforeWeight.DataPropertyName = "BeforeWeight";
- dataGridViewCellStyle4.Format = "#0.######";
- this.H_BeforeWeight.DefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle34.Format = "#0.######";
+ this.H_BeforeWeight.DefaultCellStyle = dataGridViewCellStyle34;
this.H_BeforeWeight.HeaderText = "胴体重量";
this.H_BeforeWeight.Name = "H_BeforeWeight";
this.H_BeforeWeight.ReadOnly = true;
@@ -360,8 +384,8 @@
// H_Discont
//
this.H_Discont.DataPropertyName = "Discont";
- dataGridViewCellStyle5.Format = "#0.######";
- this.H_Discont.DefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle35.Format = "#0.######";
+ this.H_Discont.DefaultCellStyle = dataGridViewCellStyle35;
this.H_Discont.HeaderText = "损耗";
this.H_Discont.Name = "H_Discont";
this.H_Discont.ReadOnly = true;
@@ -386,7 +410,7 @@
this.groupBox1.Location = new System.Drawing.Point(11, 15);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(5);
- this.groupBox1.Size = new System.Drawing.Size(584, 226);
+ this.groupBox1.Size = new System.Drawing.Size(648, 226);
this.groupBox1.TabIndex = 0;
this.groupBox1.TabStop = false;
//
@@ -396,15 +420,15 @@
this.needSubmitGrid.AllowUserToDeleteRows = false;
this.needSubmitGrid.AllowUserToResizeColumns = false;
this.needSubmitGrid.AllowUserToResizeRows = false;
- dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
- this.needSubmitGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
+ this.needSubmitGrid.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37;
this.needSubmitGrid.BackgroundColor = System.Drawing.Color.White;
this.needSubmitGrid.BorderStyle = System.Windows.Forms.BorderStyle.None;
- dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
- dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 12F);
- dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.needSubmitGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+ dataGridViewCellStyle38.Font = new System.Drawing.Font("宋体", 12F);
+ dataGridViewCellStyle38.ForeColor = System.Drawing.Color.White;
+ dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.needSubmitGrid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38;
this.needSubmitGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.needSubmitGrid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.U_ID,
@@ -417,12 +441,12 @@
this.needSubmitGrid.Name = "needSubmitGrid";
this.needSubmitGrid.ReadOnly = true;
this.needSubmitGrid.RowHeadersVisible = false;
- dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
- this.needSubmitGrid.RowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle40.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle40.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(66)))), ((int)(((byte)(163)))), ((int)(((byte)(218)))));
+ this.needSubmitGrid.RowsDefaultCellStyle = dataGridViewCellStyle40;
this.needSubmitGrid.RowTemplate.Height = 23;
this.needSubmitGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
- this.needSubmitGrid.Size = new System.Drawing.Size(574, 202);
+ this.needSubmitGrid.Size = new System.Drawing.Size(638, 202);
this.needSubmitGrid.TabIndex = 1;
//
// U_ID
@@ -452,8 +476,8 @@
// U_Weight
//
this.U_Weight.DataPropertyName = "Weight";
- dataGridViewCellStyle9.Format = "#0.######";
- this.U_Weight.DefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle39.Format = "#0.######";
+ this.U_Weight.DefaultCellStyle = dataGridViewCellStyle39;
this.U_Weight.HeaderText = "重量";
this.U_Weight.Name = "U_Weight";
this.U_Weight.ReadOnly = true;
@@ -478,35 +502,35 @@
this.flowLayoutPanel1.Size = new System.Drawing.Size(549, 519);
this.flowLayoutPanel1.TabIndex = 0;
//
- // noWeightBtn
+ // uLabel5
//
- this.noWeightBtn.AsClicked = false;
- this.noWeightBtn.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("noWeightBtn.BackgroundImage")));
- this.noWeightBtn.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(155)))), ((int)(((byte)(214)))));
- this.noWeightBtn.FlatAppearance.BorderSize = 0;
- this.noWeightBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.noWeightBtn.Font = new System.Drawing.Font("宋体", 15F);
- this.noWeightBtn.ForeColor = System.Drawing.Color.Black;
- this.noWeightBtn.Location = new System.Drawing.Point(374, 44);
- this.noWeightBtn.Name = "noWeightBtn";
- this.noWeightBtn.PlaySound = false;
- this.noWeightBtn.Size = new System.Drawing.Size(111, 34);
- this.noWeightBtn.SoundType = WinFormControl.SoundType.Click;
- this.noWeightBtn.TabIndex = 11;
- this.noWeightBtn.Text = "落 称";
- this.noWeightBtn.UseVisualStyleBackColor = true;
- this.noWeightBtn.WithStataHode = false;
- this.noWeightBtn.Click += new System.EventHandler(this.noWeightBtn_Click);
+ this.uLabel5.AutoSize = true;
+ this.uLabel5.BackColor = System.Drawing.Color.Transparent;
+ this.uLabel5.Font = new System.Drawing.Font("宋体", 15F);
+ this.uLabel5.Location = new System.Drawing.Point(468, 53);
+ this.uLabel5.Name = "uLabel5";
+ this.uLabel5.Size = new System.Drawing.Size(49, 20);
+ this.uLabel5.TabIndex = 12;
+ this.uLabel5.Text = "低重";
+ //
+ // lowWeight
+ //
+ this.lowWeight.Font = new System.Drawing.Font("宋体", 15F);
+ this.lowWeight.Location = new System.Drawing.Point(512, 47);
+ this.lowWeight.Name = "lowWeight";
+ this.lowWeight.Size = new System.Drawing.Size(49, 30);
+ this.lowWeight.TabIndex = 13;
+ this.lowWeight.Type = WinFormControl.UTextBoxWithPad.TextBoxType.Number;
//
// CarcassInStoreForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
- this.ClientSize = new System.Drawing.Size(1164, 611);
+ this.ClientSize = new System.Drawing.Size(1228, 611);
this.Controls.Add(this.splitContainer1);
this.KeyPreview = true;
- this.MinimumSize = new System.Drawing.Size(1180, 650);
+ this.MinimumSize = new System.Drawing.Size(1244, 650);
this.Name = "CarcassInStoreForm";
this.Text = "白条入库";
this.splitContainer1.Panel1.ResumeLayout(false);
@@ -560,6 +584,8 @@
private System.Windows.Forms.DataGridViewTextBoxColumn U_Weight;
private WinFormControl.UButton noCodeBtn;
private WinFormControl.UButton noWeightBtn;
+ private WinFormControl.ULabel uLabel5;
+ private WinFormControl.UTextBoxWithPad lowWeight;
}
diff --git a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs
index 0614474..74c851f 100644
--- a/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs
+++ b/ButcherFactory.Form/CarcassInStore_/CarcassInStoreForm.cs
@@ -40,6 +40,7 @@ namespace ButcherFactory.CarcassInStore_
BindingList historyList;
long? workUnitID;
long? batchID;
+ decimal? errorWeight = null;
public CarcassInStoreForm()
{
InitializeComponent();
@@ -67,8 +68,39 @@ namespace ButcherFactory.CarcassInStore_
else
batchID = (long)productBatchSelect.SelectedValue;
};
+ var lw = XmlUtil.DeserializeFromFile().Weight;
+ if (lw.HasValue){
+ lowWeight.Text = lw.Value.ToString("#0.######");
+ errorWeight=lw;
+ }
+ lowWeight.LostFocus += lowWeight_LostFocus;
}
+ void lowWeight_LostFocus(object sender, EventArgs e)
+ {
+ var txt = lowWeight.Text.Trim();
+ if (string.IsNullOrEmpty(txt))
+ {
+ XmlUtil.SerializerObjToFile(new LowWeight());
+ errorWeight = null;
+ }
+ else
+ {
+ decimal v;
+ if (decimal.TryParse(lowWeight.Text.Trim(), out v))
+ {
+ XmlUtil.SerializerObjToFile(new LowWeight { Weight = v });
+ errorWeight = v;
+ }
+ else
+ {
+ lowWeight.Focus();
+ throw new Exception("低重设置错误");
+ }
+ }
+ }
+
+
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
@@ -90,6 +122,8 @@ namespace ButcherFactory.CarcassInStore_
{
lock (_lock)
{
+ if (errorWeight.HasValue && weight != 0 && weight < errorWeight)
+ SoundPalyUtil.PlaySound("Sounds\\wtl.wav");
this.Invoke(new Action(() =>
{
var last = needSubmitedList.LastOrDefault();
diff --git a/ButcherFactory.Form/CarcassInStore_/LowWeight.cs b/ButcherFactory.Form/CarcassInStore_/LowWeight.cs
new file mode 100644
index 0000000..199ca64
--- /dev/null
+++ b/ButcherFactory.Form/CarcassInStore_/LowWeight.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ButcherFactory.CarcassInStore_
+{
+ public class LowWeight
+ {
+ public decimal? Weight { get; set; }
+ }
+}
diff --git a/ButcherFactorySolution/ButcherFactorySolution.vdproj b/ButcherFactorySolution/ButcherFactorySolution.vdproj
index c5c16da..fa3edd4 100644
--- a/ButcherFactorySolution/ButcherFactorySolution.vdproj
+++ b/ButcherFactorySolution/ButcherFactorySolution.vdproj
@@ -34,13 +34,13 @@
"Entry"
{
"MsmKey" = "8:_0B4AB528830CB4E40C14DBEE2E8D5A65"
- "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
+ "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0B4AB528830CB4E40C14DBEE2E8D5A65"
- "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
+ "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -51,6 +51,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_1493C2EEDBF841C59DE5CCDF8F8AD409"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_1923D338B09175DB8F68551435A3DF74"
"OwnerKey" = "8:_0B4AB528830CB4E40C14DBEE2E8D5A65"
"MsmSig" = "8:_UNDEFINED"
@@ -58,13 +64,13 @@
"Entry"
{
"MsmKey" = "8:_1923D338B09175DB8F68551435A3DF74"
- "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
+ "OwnerKey" = "8:_9759E4E6D6C49610F09AE960530B7ED3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_1923D338B09175DB8F68551435A3DF74"
- "OwnerKey" = "8:_9759E4E6D6C49610F09AE960530B7ED3"
+ "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -82,7 +88,7 @@
"Entry"
{
"MsmKey" = "8:_2E593EF5A0D4AC17B99431F19C9CE68F"
- "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
+ "OwnerKey" = "8:_2CC25BB5F794DE4347B7195C2A708C7E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -94,7 +100,7 @@
"Entry"
{
"MsmKey" = "8:_2E593EF5A0D4AC17B99431F19C9CE68F"
- "OwnerKey" = "8:_2CC25BB5F794DE4347B7195C2A708C7E"
+ "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -118,13 +124,13 @@
"Entry"
{
"MsmKey" = "8:_49E12BEED39445C13DF8F061668A0047"
- "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
+ "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_49E12BEED39445C13DF8F061668A0047"
- "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
+ "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -154,13 +160,13 @@
"Entry"
{
"MsmKey" = "8:_876BA02FCF7C1F3EB8FA6EA8FF9584CE"
- "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
+ "OwnerKey" = "8:_A83CBE7185AD9EFAF6A5522D0ACEFF62"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_876BA02FCF7C1F3EB8FA6EA8FF9584CE"
- "OwnerKey" = "8:_A83CBE7185AD9EFAF6A5522D0ACEFF62"
+ "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -196,13 +202,13 @@
"Entry"
{
"MsmKey" = "8:_A83CBE7185AD9EFAF6A5522D0ACEFF62"
- "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
+ "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_A83CBE7185AD9EFAF6A5522D0ACEFF62"
- "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
+ "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@@ -232,73 +238,73 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
+ "OwnerKey" = "8:_876BA02FCF7C1F3EB8FA6EA8FF9584CE"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_3E728084E6413DC3E740199EBCA6CF15"
+ "OwnerKey" = "8:_2E593EF5A0D4AC17B99431F19C9CE68F"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
+ "OwnerKey" = "8:_1923D338B09175DB8F68551435A3DF74"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_89814BF7669437D0B867AFB5935AA6C2"
+ "OwnerKey" = "8:_9759E4E6D6C49610F09AE960530B7ED3"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_2CC25BB5F794DE4347B7195C2A708C7E"
+ "OwnerKey" = "8:_0B4AB528830CB4E40C14DBEE2E8D5A65"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_49E12BEED39445C13DF8F061668A0047"
+ "OwnerKey" = "8:_A83CBE7185AD9EFAF6A5522D0ACEFF62"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_A83CBE7185AD9EFAF6A5522D0ACEFF62"
+ "OwnerKey" = "8:_49E12BEED39445C13DF8F061668A0047"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_0B4AB528830CB4E40C14DBEE2E8D5A65"
+ "OwnerKey" = "8:_2CC25BB5F794DE4347B7195C2A708C7E"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_9759E4E6D6C49610F09AE960530B7ED3"
+ "OwnerKey" = "8:_89814BF7669437D0B867AFB5935AA6C2"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_1923D338B09175DB8F68551435A3DF74"
+ "OwnerKey" = "8:_01E56548E879FA791BE1522C98562ED5"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_2E593EF5A0D4AC17B99431F19C9CE68F"
+ "OwnerKey" = "8:_3E728084E6413DC3E740199EBCA6CF15"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
- "OwnerKey" = "8:_876BA02FCF7C1F3EB8FA6EA8FF9584CE"
+ "OwnerKey" = "8:_7BC73039AAAE423AB1ADC71EDB603430"
"MsmSig" = "8:_UNDEFINED"
}
}
@@ -423,11 +429,6 @@
"AssemblyAsmDisplayName" = "8:ButcherFactory.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_01E56548E879FA791BE1522C98562ED5"
- {
- "Name" = "8:ButcherFactory.BO.dll"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:ButcherFactory.BO.dll"
"TargetName" = "8:"
@@ -454,11 +455,6 @@
"AssemblyAsmDisplayName" = "8:Forks.EnterpriseServices, Version=3.1.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_0B4AB528830CB4E40C14DBEE2E8D5A65"
- {
- "Name" = "8:Forks.EnterpriseServices.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:Forks.EnterpriseServices.DLL"
"TargetName" = "8:"
@@ -498,6 +494,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+ "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1493C2EEDBF841C59DE5CCDF8F8AD409"
+ {
+ "SourcePath" = "8:..\\ButcherFactory.Login\\bin\\Debug\\Sounds\\wtl.wav"
+ "TargetName" = "8:wtl.wav"
+ "Tag" = "8:"
+ "Folder" = "8:_6866532246094A308566729453EB35CA"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:1"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1923D338B09175DB8F68551435A3DF74"
{
"AssemblyRegister" = "3:1"
@@ -505,11 +521,6 @@
"AssemblyAsmDisplayName" = "8:MongoDB.Bson, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_1923D338B09175DB8F68551435A3DF74"
- {
- "Name" = "8:MongoDB.Bson.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:MongoDB.Bson.DLL"
"TargetName" = "8:"
@@ -536,11 +547,6 @@
"AssemblyAsmDisplayName" = "8:ButcherFactory.BO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_2CC25BB5F794DE4347B7195C2A708C7E"
- {
- "Name" = "8:ButcherFactory.BO.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:ButcherFactory.BO.DLL"
"TargetName" = "8:"
@@ -567,11 +573,6 @@
"AssemblyAsmDisplayName" = "8:Forks.Utils, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_2E593EF5A0D4AC17B99431F19C9CE68F"
- {
- "Name" = "8:Forks.Utils.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:Forks.Utils.DLL"
"TargetName" = "8:"
@@ -598,11 +599,6 @@
"AssemblyAsmDisplayName" = "8:WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_3E728084E6413DC3E740199EBCA6CF15"
- {
- "Name" = "8:WinFormControl.dll"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:WinFormControl.dll"
"TargetName" = "8:"
@@ -649,11 +645,6 @@
"AssemblyAsmDisplayName" = "8:Newtonsoft.Json, Version=4.0.3.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_49E12BEED39445C13DF8F061668A0047"
- {
- "Name" = "8:Newtonsoft.Json.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:Newtonsoft.Json.DLL"
"TargetName" = "8:"
@@ -720,11 +711,6 @@
"AssemblyAsmDisplayName" = "8:Forks.Json, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_876BA02FCF7C1F3EB8FA6EA8FF9584CE"
- {
- "Name" = "8:Forks.Json.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:Forks.Json.DLL"
"TargetName" = "8:"
@@ -751,11 +737,6 @@
"AssemblyAsmDisplayName" = "8:WinFormControl, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_89814BF7669437D0B867AFB5935AA6C2"
- {
- "Name" = "8:WinFormControl.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:WinFormControl.DLL"
"TargetName" = "8:"
@@ -782,11 +763,6 @@
"AssemblyAsmDisplayName" = "8:MongoDB.Driver, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_9759E4E6D6C49610F09AE960530B7ED3"
- {
- "Name" = "8:MongoDB.Driver.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:MongoDB.Driver.DLL"
"TargetName" = "8:"
@@ -833,11 +809,6 @@
"AssemblyAsmDisplayName" = "8:Forks.JsonRpc.Client, Version=1.0.0.0, Culture=neutral, PublicKeyToken=7254430f49d10aae, processorArchitecture=MSIL"
"ScatterAssemblies"
{
- "_A83CBE7185AD9EFAF6A5522D0ACEFF62"
- {
- "Name" = "8:Forks.JsonRpc.Client.DLL"
- "Attributes" = "3:512"
- }
}
"SourcePath" = "8:Forks.JsonRpc.Client.DLL"
"TargetName" = "8:"