From d6cc6e59e67f9ad43bd6c5f373761f94ea77aabf Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 29 十月 2025 11:04:25 +0800
Subject: [PATCH] 增加iqc称重控制
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs | 10 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx | 18 +++---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 15 ++++
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 5 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs | 92 +++++++++++++++++++-----------
6 files changed, 93 insertions(+), 51 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 432ab84..8cf35bf 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index dfbc936..ee5ad32 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -118,6 +118,7 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -282,7 +283,8 @@
this.gridColumn8,
this.gridColumn5,
this.gridColumn9,
- this.gridColumn10});
+ this.gridColumn10,
+ this.gridColumn11});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
this.gridView1.IndicatorWidth = 50;
@@ -1144,6 +1146,16 @@
this.layoutControlItem20.Text = "榛樿浠撳簱";
this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
//
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "IQC绉伴噸";
+ this.gridColumn11.FieldName = "bz09";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 13;
+ this.gridColumn11.Width = 94;
+ //
// Frm_MesItems
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1294,5 +1306,6 @@
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
index 1138a93..acd2ddc 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.Designer.cs
@@ -30,38 +30,57 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemsShow));
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_lossPercent = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_day = new System.Windows.Forms.NumericUpDown();
this.btnCancel = new DevExpress.XtraEditors.SimpleButton();
this.btnSave = new DevExpress.XtraEditors.SimpleButton();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_lossPercent = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_bz09 = new System.Windows.Forms.NumericUpDown();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_day)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lossPercent.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_day)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_bz09)).BeginInit();
this.SuspendLayout();
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_bz09);
+ this.panel1.Controls.Add(this.labelControl3);
this.panel1.Controls.Add(this.txt_lossPercent);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_day);
this.panel1.Controls.Add(this.btnCancel);
this.panel1.Controls.Add(this.btnSave);
this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Location = new System.Drawing.Point(36, 62);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Location = new System.Drawing.Point(29, 51);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(450, 263);
+ this.panel1.Size = new System.Drawing.Size(360, 222);
this.panel1.TabIndex = 3;
+ //
+ // txt_lossPercent
+ //
+ this.txt_lossPercent.Location = new System.Drawing.Point(205, 81);
+ this.txt_lossPercent.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.txt_lossPercent.Name = "txt_lossPercent";
+ this.txt_lossPercent.Size = new System.Drawing.Size(120, 24);
+ this.txt_lossPercent.TabIndex = 247;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Location = new System.Drawing.Point(117, 87);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(75, 18);
+ this.labelControl2.TabIndex = 246;
+ this.labelControl2.Text = "瓒呴噰姣斾緥锛�";
//
// txt_day
//
- this.txt_day.Location = new System.Drawing.Point(215, 73);
- this.txt_day.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_day.Location = new System.Drawing.Point(205, 40);
this.txt_day.Name = "txt_day";
- this.txt_day.Size = new System.Drawing.Size(150, 29);
+ this.txt_day.Size = new System.Drawing.Size(120, 26);
this.txt_day.TabIndex = 245;
//
// btnCancel
@@ -70,10 +89,10 @@
this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image")));
- this.btnCancel.Location = new System.Drawing.Point(256, 175);
- this.btnCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.btnCancel.Location = new System.Drawing.Point(238, 170);
+ this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(109, 45);
+ this.btnCancel.Size = new System.Drawing.Size(87, 37);
this.btnCancel.TabIndex = 244;
this.btnCancel.Text = "鍙栨秷 (&C)";
//
@@ -83,46 +102,48 @@
this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat;
this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image")));
- this.btnSave.Location = new System.Drawing.Point(49, 175);
- this.btnSave.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.btnSave.Location = new System.Drawing.Point(72, 170);
+ this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(109, 45);
+ this.btnSave.Size = new System.Drawing.Size(87, 37);
this.btnSave.TabIndex = 243;
this.btnSave.Text = "纭畾 (&L)";
//
// labelControl1
//
- this.labelControl1.Location = new System.Drawing.Point(49, 76);
- this.labelControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.labelControl1.Location = new System.Drawing.Point(87, 47);
this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(126, 22);
+ this.labelControl1.Size = new System.Drawing.Size(105, 18);
this.labelControl1.TabIndex = 242;
this.labelControl1.Text = "鎻愬墠鍒拌揣澶╂暟锛�";
//
- // labelControl2
+ // labelControl3
//
- this.labelControl2.Location = new System.Drawing.Point(49, 125);
- this.labelControl2.Margin = new System.Windows.Forms.Padding(4);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(90, 22);
- this.labelControl2.TabIndex = 246;
- this.labelControl2.Text = "瓒呴噰姣斾緥锛�";
+ this.labelControl3.Location = new System.Drawing.Point(18, 127);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(174, 18);
+ this.labelControl3.TabIndex = 248;
+ this.labelControl3.Text = "IQC绉伴噸(1寮哄埗绉伴噸0鍚�)锛�";
//
- // txt_lossPercent
+ // txt_bz09
//
- this.txt_lossPercent.Location = new System.Drawing.Point(215, 125);
- this.txt_lossPercent.Name = "txt_lossPercent";
- this.txt_lossPercent.Size = new System.Drawing.Size(150, 28);
- this.txt_lossPercent.TabIndex = 247;
+ this.txt_bz09.Location = new System.Drawing.Point(205, 119);
+ this.txt_bz09.Maximum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.txt_bz09.Name = "txt_bz09";
+ this.txt_bz09.Size = new System.Drawing.Size(120, 26);
+ this.txt_bz09.TabIndex = 249;
//
// Frm_MesItemsShow
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(525, 419);
+ this.ClientSize = new System.Drawing.Size(420, 343);
this.Controls.Add(this.panel1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "Frm_MesItemsShow";
@@ -130,8 +151,9 @@
this.Text = "Frm_MesItemsShow";
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_day)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lossPercent.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_day)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_bz09)).EndInit();
this.ResumeLayout(false);
}
@@ -145,5 +167,7 @@
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.TextEdit txt_lossPercent;
private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private System.Windows.Forms.NumericUpDown txt_bz09;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
index 5c8091b..cf48216 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.cs
@@ -34,7 +34,7 @@
{
if (value < 0.0 || value > 1.0)
{
- MsgHelper.Warning("瓒呴噰鐜囧繀椤诲湪0鍒�1涔嬮棿锛�");
+ MsgHelper.ShowError("瓒呴噰鐜囧繀椤诲湪0鍒�1涔嬮棿锛�");
txt_lossPercent.Focus();
return false;
}
@@ -45,7 +45,7 @@
}
else
{
- MsgHelper.Warning("璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�");
+ MsgHelper.ShowError("璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�");
txt_lossPercent.EditValue = 0.0;
txt_lossPercent.Focus();
return false;
@@ -59,12 +59,12 @@
{
return;
}
-
var _obj = new
{
guidList = this.guidList,
- bz10 = txt_day.Value,
- percent = txt_lossPercent.EditValue
+ bz10 = txt_day.Value,//鎻愬墠鍒拌揣澶╂暟
+ percent = txt_lossPercent.EditValue,
+ bz09= txt_bz09.Value,//鍚庢潵鏀逛负iqc绉伴噸灞炴��1瑕佺О閲�0涓嶇О閲�
};
try
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
index 07a1044..c0dfd5d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemsShow.resx
@@ -121,20 +121,20 @@
<data name="btnCancel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
- bGUAQ2xvc2U7RXhpdDsFGf+FAAAAqElEQVQ4T7WSMQoCQRRDtxNk1RsIaydi4R1ykxxSrC1sLVPqJQQR
- HfnLCJ913BlcLTJFII+EP1UIoRqi9hERvtFfAbcS7xNAIpYiDs7biViJOOUAVxGNCPNmEWLhcfTWIu59
- ANNWxCgGpi5ci9jnGqQgyXAO4Gv7OUUAH564Jm+QFOAiYu7CVtvP2Yh49AFMRxGLzmaD2GnPuQYv2Tm7
- XvFHKtbvAEP0BKkDdTUPi1CNAAAAAElFTkSuQmCC
+ bGUAQ2xvc2U7RXhpdDsFGf+FAAAArElEQVQ4T7XSOwoCQRCE4c0E8XEDQTMRA+/gTTykGBuYGm6olxBE
+ tP1LHGl1WoZVg2+DYrqYZrYys6/cPvVibk38teBUkkUFNcbYuGyFCXYuyxYcMYSyPlSi4fY9m+KMsECW
+ aEF5D2m4gzUeZ6MC8SXZYflU4K8taZ2nc1GBH+4i3eStJFdwwABpWNf268xwQVggW4zgd1aJnnbvsrBA
+ 9JyvWfGPVOx3Bc1ZdQWpA3U147gCvgAAAABJRU5ErkJggg==
</value>
</data>
<data name="btnSave.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
- bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA10lEQVQ4T52RPQoCMRCF9wIeQhELK9HO
- 2l4rhTnS1B5AS7G2ezcQsbGzUCy2WLH2p4kMJDBmx0QsPrJvkvcRskW1GRcKp7NzLosuDqK1dtgiCEIp
- ILkghnAjxpwYDZ9rAl38yL4gq7D4JsjdIAjuKYH5BqosXFMC8y9EgpUp0CEcIEafGC9Vlm+Z/SwQpsQo
- PTO9lxNI8UKMlio1iXEmxiQn6BHj6a+9J0abGB1iHPxM9ropwTp6OItlSlAZhZgyJTgZhZhjSjAixo4Y
- D6Mosy0xhl8F//AGi1+L7i5kYh4AAAAASUVORK5CYII=
+ bGUATmV3O05ld0VtcGxveWVlO05ld1BlcnNvbjveWVScAAAA3ElEQVQ4T5WOPQ5BQRSF3wYsgohCJXRq
+ PRWJJaktgFLUOjsQ0egURKEgaj/NOEfuyJl5E4/iy8y5c7+Tyc6LruI0O+cKUbEVnUkhxhd4ycOcDUdL
+ cgVjULKcK1AxyCbwJBPLuYKiH/iCm+VkgZf0VJlcKJNUgRZ9sshkRpkEBRr8AmiCJ/Ay75z9XED64GQM
+ bPZGnSDYAsUjqFgmZXAAPWZ1goDHBngAfnsDqqAGtjbjW12duGBui9+YqhMXnKPlFCd14oJ9tJxip05c
+ 0AFrcLdlhbMVaKsTFPyPy16LX4vunIH/egAAAABJRU5ErkJggg==
</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 469769d..0da5062 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -932,6 +932,7 @@
this.txt_weight1.Size = new System.Drawing.Size(76, 24);
this.txt_weight1.StyleController = this.layWeight;
this.txt_weight1.TabIndex = 4;
+ this.txt_weight1.Tag = "readonly";
//
// txt_weight2
//
@@ -941,6 +942,7 @@
this.txt_weight2.Size = new System.Drawing.Size(79, 24);
this.txt_weight2.StyleController = this.layWeight;
this.txt_weight2.TabIndex = 5;
+ this.txt_weight2.Tag = "readonly";
//
// txt_weight3
//
@@ -950,6 +952,7 @@
this.txt_weight3.Size = new System.Drawing.Size(79, 24);
this.txt_weight3.StyleController = this.layWeight;
this.txt_weight3.TabIndex = 6;
+ this.txt_weight3.Tag = "readonly";
//
// txt_weight4
//
@@ -959,6 +962,7 @@
this.txt_weight4.Size = new System.Drawing.Size(79, 24);
this.txt_weight4.StyleController = this.layWeight;
this.txt_weight4.TabIndex = 7;
+ this.txt_weight4.Tag = "readonly";
//
// btnW
//
@@ -994,6 +998,7 @@
this.txt_weight5.Size = new System.Drawing.Size(79, 24);
this.txt_weight5.StyleController = this.layWeight;
this.txt_weight5.TabIndex = 11;
+ this.txt_weight5.Tag = "readonly";
//
// btnClean
//
--
Gitblit v1.9.3