From ab188e6cb2228919b165f26f2a21a5643b5d8470 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 11 九月 2025 18:07:22 +0800
Subject: [PATCH] 成品检验报告代码调整
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs | 72 +++++++++++------------------------
2 files changed, 24 insertions(+), 50 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
index 8180169..3ece8fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
@@ -80,15 +80,13 @@
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_jyUSER = new DevExpress.XtraEditors.TextEdit();
+ this.txt_jyNAME = new DevExpress.XtraEditors.TextEdit();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
this.txt_ItemModel = new DevExpress.XtraEditors.TextEdit();
@@ -204,7 +202,7 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_jyUSER.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jyNAME.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ItemModel.Properties)).BeginInit();
@@ -384,8 +382,6 @@
this.gridColumn31,
this.gridColumn32,
this.gridColumn33,
- this.gridColumn34,
- this.gridColumn35,
this.gridColumn52});
this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
@@ -568,7 +564,7 @@
// gridColumn28
//
this.gridColumn28.Caption = "妫�楠岀粨鏋�";
- this.gridColumn28.FieldName = "CheckResult";
+ this.gridColumn28.FieldName = "checkResult";
this.gridColumn28.MinWidth = 30;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.Visible = true;
@@ -578,7 +574,7 @@
// gridColumn29
//
this.gridColumn29.Caption = "妫�楠屼汉";
- this.gridColumn29.FieldName = "jYUSER";
+ this.gridColumn29.FieldName = "jyName";
this.gridColumn29.MinWidth = 30;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.Visible = true;
@@ -588,7 +584,7 @@
// gridColumn30
//
this.gridColumn30.Caption = "妫�楠屾棩鏈�";
- this.gridColumn30.FieldName = "jYDATE";
+ this.gridColumn30.FieldName = "jyDate";
this.gridColumn30.MinWidth = 30;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
@@ -598,7 +594,7 @@
// gridColumn31
//
this.gridColumn31.Caption = "澶勭悊缁撴灉";
- this.gridColumn31.FieldName = "ProcessResults";
+ this.gridColumn31.FieldName = "processResults";
this.gridColumn31.MinWidth = 30;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
@@ -608,7 +604,7 @@
// gridColumn32
//
this.gridColumn32.Caption = "瀹℃牳浜�";
- this.gridColumn32.FieldName = "cHECKUSER";
+ this.gridColumn32.FieldName = "checkUser";
this.gridColumn32.MinWidth = 30;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
@@ -618,32 +614,12 @@
// gridColumn33
//
this.gridColumn33.Caption = "瀹℃牳鏃堕棿";
- this.gridColumn33.FieldName = "cHECKDATE";
+ this.gridColumn33.FieldName = "checkDate";
this.gridColumn33.MinWidth = 30;
this.gridColumn33.Name = "gridColumn33";
this.gridColumn33.Visible = true;
this.gridColumn33.VisibleIndex = 22;
this.gridColumn33.Width = 112;
- //
- // gridColumn34
- //
- this.gridColumn34.Caption = "瀹℃壒浜�";
- this.gridColumn34.FieldName = "sPUSER";
- this.gridColumn34.MinWidth = 30;
- this.gridColumn34.Name = "gridColumn34";
- this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 23;
- this.gridColumn34.Width = 112;
- //
- // gridColumn35
- //
- this.gridColumn35.Caption = "瀹℃壒鏃堕棿";
- this.gridColumn35.FieldName = "sPDATE";
- this.gridColumn35.MinWidth = 30;
- this.gridColumn35.Name = "gridColumn35";
- this.gridColumn35.Visible = true;
- this.gridColumn35.VisibleIndex = 24;
- this.gridColumn35.Width = 112;
//
// gridColumn52
//
@@ -652,7 +628,7 @@
this.gridColumn52.MinWidth = 30;
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.Visible = true;
- this.gridColumn52.VisibleIndex = 25;
+ this.gridColumn52.VisibleIndex = 23;
this.gridColumn52.Width = 112;
//
// pageBar1
@@ -700,7 +676,7 @@
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_jyUSER);
+ this.layoutMx1.Controls.Add(this.txt_jyNAME);
this.layoutMx1.Controls.Add(this.txt_checkUser);
this.layoutMx1.Controls.Add(this.txt_Guid);
this.layoutMx1.Controls.Add(this.txt_ItemModel);
@@ -751,16 +727,16 @@
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // txt_jyUSER
+ // txt_jyNAME
//
- this.txt_jyUSER.Location = new System.Drawing.Point(1155, 12);
- this.txt_jyUSER.Margin = new System.Windows.Forms.Padding(4);
- this.txt_jyUSER.Name = "txt_jyUSER";
- this.txt_jyUSER.Properties.Appearance.Options.UseFont = true;
- this.txt_jyUSER.Size = new System.Drawing.Size(241, 28);
- this.txt_jyUSER.StyleController = this.layoutMx1;
- this.txt_jyUSER.TabIndex = 231;
- this.txt_jyUSER.Tag = "readonly";
+ this.txt_jyNAME.Location = new System.Drawing.Point(1155, 12);
+ this.txt_jyNAME.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_jyNAME.Name = "txt_jyNAME";
+ this.txt_jyNAME.Properties.Appearance.Options.UseFont = true;
+ this.txt_jyNAME.Size = new System.Drawing.Size(241, 28);
+ this.txt_jyNAME.StyleController = this.layoutMx1;
+ this.txt_jyNAME.TabIndex = 231;
+ this.txt_jyNAME.Tag = "readonly";
//
// txt_checkUser
//
@@ -1010,7 +986,7 @@
this.txt_productionDate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.txt_productionDate.Properties.EditFormat.FormatString = "";
this.txt_productionDate.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
- this.txt_productionDate.Properties.MaskSettings.Set("mask", "");
+ this.txt_productionDate.Properties.MaskSettings.Set("mask", "yyyy-mm-dd");
this.txt_productionDate.Size = new System.Drawing.Size(241, 28);
this.txt_productionDate.StyleController = this.layoutMx1;
this.txt_productionDate.TabIndex = 250;
@@ -1444,7 +1420,7 @@
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_jyUSER;
+ this.layoutControlItem6.Control = this.txt_jyNAME;
this.layoutControlItem6.Location = new System.Drawing.Point(1041, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1965,7 +1941,7 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_jyUSER.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jyNAME.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ItemModel.Properties)).EndInit();
@@ -2053,7 +2029,7 @@
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.TextEdit txt_jyUSER;
+ private DevExpress.XtraEditors.TextEdit txt_jyNAME;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
@@ -2088,8 +2064,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
private DevExpress.XtraEditors.TextEdit txt_WorkShop;
private DevExpress.XtraEditors.TextEdit txt_Brand;
private DevExpress.XtraEditors.TextEdit txt_Temperature;
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
index 4eedd64..db0a890 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
@@ -375,7 +375,7 @@
sampleSize1 = txt_SampleSize1.Text.Trim(), // 鍖�閫熸娊鏍锋暟
sampleSize2 = txt_SampleSize2.Text.Trim(), // 闅忔満鎶芥牱鏁�
sampleSize3 = txt_SampleSize3.Text.Trim(), // 鏍锋湰鏁�
- jy_USER = txt_jyUSER.Text.Trim(), // 妫�楠屼汉
+ jy_USER = txt_jyNAME.Text.Trim(), // 妫�楠屼汉
jy_DATE = txt_jyDATE.Text.Trim(), // 妫�楠屾椂闂�
sp_USER = txt_SP_USER.Text.Trim(), // 瀹℃壒浜�
sp_DATE = txt_SP_DATE.Text.Trim(), // 瀹℃壒鏃ユ湡
--
Gitblit v1.9.3