From 13e64fb5b4abec0bfc880d28185e5c919d964b16 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 24 三月 2025 16:27:52 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 184 ++++++++++++++++++++++++---------------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 2
3 files changed, 102 insertions(+), 85 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index 00aeae9..007b66e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -31,6 +31,8 @@
private void InitializeComponent()
{
this.SuspendLayout();
+ // this.jyxm1 = new QC.Jyxm("iqc");
+ this.jyxm1 = new QC.Jyxm("iqc");
//
// jyxm1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 3aa56dd..a90c79a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -29,15 +29,15 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womcaa));
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -113,6 +113,7 @@
this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
this.txt_caa005 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_srcBillNo = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -132,6 +133,8 @@
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -161,9 +164,7 @@
this.gvMx1scrapqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.txt_srcBillNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -201,6 +202,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -220,21 +222,21 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -512,7 +514,7 @@
this.gv_caa024.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_caa024.AppearanceCell.Options.UseFont = true;
this.gv_caa024.Caption = "宸插叆搴撴暟";
- this.gv_caa024.FieldName = "caa024";
+ this.gv_caa024.FieldName = "rkqty";
this.gv_caa024.MaxWidth = 50;
this.gv_caa024.MinWidth = 50;
this.gv_caa024.Name = "gv_caa024";
@@ -799,7 +801,7 @@
this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 38;
+ this.gridColumn31.VisibleIndex = 36;
this.gridColumn31.Width = 94;
//
// gridColumn32
@@ -809,7 +811,7 @@
this.gridColumn32.MinWidth = 25;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 39;
+ this.gridColumn32.VisibleIndex = 37;
this.gridColumn32.Width = 94;
//
// gridColumn33
@@ -819,7 +821,7 @@
this.gridColumn33.MinWidth = 25;
this.gridColumn33.Name = "gridColumn33";
this.gridColumn33.Visible = true;
- this.gridColumn33.VisibleIndex = 40;
+ this.gridColumn33.VisibleIndex = 38;
this.gridColumn33.Width = 94;
//
// gridColumn34
@@ -829,7 +831,7 @@
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 41;
+ this.gridColumn34.VisibleIndex = 39;
this.gridColumn34.Width = 94;
//
// gridColumn35
@@ -839,7 +841,7 @@
this.gridColumn35.MinWidth = 25;
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.Visible = true;
- this.gridColumn35.VisibleIndex = 42;
+ this.gridColumn35.VisibleIndex = 40;
this.gridColumn35.Width = 94;
//
// gridColumn36
@@ -849,7 +851,7 @@
this.gridColumn36.MinWidth = 25;
this.gridColumn36.Name = "gridColumn36";
this.gridColumn36.Visible = true;
- this.gridColumn36.VisibleIndex = 43;
+ this.gridColumn36.VisibleIndex = 42;
this.gridColumn36.Width = 94;
//
// gridColumn37
@@ -859,7 +861,7 @@
this.gridColumn37.MinWidth = 25;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Visible = true;
- this.gridColumn37.VisibleIndex = 42;
+ this.gridColumn37.VisibleIndex = 41;
this.gridColumn37.Width = 94;
//
// gridColumn38
@@ -869,7 +871,7 @@
this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 45;
+ this.gridColumn38.VisibleIndex = 43;
this.gridColumn38.Width = 94;
//
// gridColumn39
@@ -879,7 +881,7 @@
this.gridColumn39.MinWidth = 25;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.Visible = true;
- this.gridColumn39.VisibleIndex = 46;
+ this.gridColumn39.VisibleIndex = 44;
this.gridColumn39.Width = 94;
//
// pageBar1
@@ -1142,6 +1144,14 @@
this.txt_caa005.StyleController = this.layoutMx1;
this.txt_caa005.TabIndex = 217;
//
+ // txt_srcBillNo
+ //
+ this.txt_srcBillNo.Location = new System.Drawing.Point(656, 108);
+ this.txt_srcBillNo.Name = "txt_srcBillNo";
+ this.txt_srcBillNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_srcBillNo.StyleController = this.layoutMx1;
+ this.txt_srcBillNo.TabIndex = 467;
+ //
// layoutControlItem19
//
this.layoutControlItem19.Control = this.lbGuid;
@@ -1180,35 +1190,35 @@
this.layoutControlItem15});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition9,
- columnDefinition10,
- columnDefinition11,
- columnDefinition12});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1105, 180);
this.Root.TextVisible = false;
//
@@ -1391,6 +1401,28 @@
this.layoutControlItem18.Text = "濮旀墭缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_srcBillNo;
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem20.Text = "婧愬崟绫诲瀷";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_itemModel;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1446,7 +1478,8 @@
this.gridColumn16,
this.gvMx1scraprate,
this.gvMx1scrapqty,
- this.gridColumn17});
+ this.gridColumn17,
+ this.gridColumn29});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1608,7 +1641,7 @@
//
// gridColumn13
//
- this.gridColumn13.Caption = "璐т富";
+ this.gridColumn13.Caption = "璐т富ID";
this.gridColumn13.FieldName = "ownerId";
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
@@ -1748,35 +1781,15 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_srcBillNo
+ // gridColumn29
//
- this.txt_srcBillNo.Location = new System.Drawing.Point(656, 108);
- this.txt_srcBillNo.Name = "txt_srcBillNo";
- this.txt_srcBillNo.Size = new System.Drawing.Size(165, 24);
- this.txt_srcBillNo.StyleController = this.layoutMx1;
- this.txt_srcBillNo.TabIndex = 467;
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_srcBillNo;
- this.layoutControlItem20.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem20.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_itemModel;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 128);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "浜у搧瑙勬牸";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.gridColumn29.Caption = "璐т富鍚嶇О";
+ this.gridColumn29.FieldName = "ownerName";
+ this.gridColumn29.MinWidth = 25;
+ this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.Visible = true;
+ this.gridColumn29.VisibleIndex = 23;
+ this.gridColumn29.Width = 94;
//
// Frm_Womcaa
//
@@ -1825,6 +1838,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_caa005.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1844,15 +1858,14 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
this.ResumeLayout(false);
}
@@ -1982,5 +1995,6 @@
private DevExpress.XtraEditors.TextEdit txt_srcBillNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index dd98c50..fdd5e2c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -184,6 +184,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
--
Gitblit v1.9.3