From 0c2cfbb7a852e94b22a11751b9b15c5532c8c3ef Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期二, 25 十一月 2025 11:21:05 +0800
Subject: [PATCH] 删除了h5页面的首检，同时增加了cs的首检
---
/dev/null | 120 --
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs | 322 ++++++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 741 +++++++--------
DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs | 8
DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs | 1506 +++++++++++++++------------------
5 files changed, 1,312 insertions(+), 1,385 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
index 91aedbb..f4c84b0 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.Designer.cs
@@ -1,4 +1,7 @@
-锘縩amespace Gs.DevApp.DevFrm.IPQC
+锘縰sing Gs.DevApp.DevFrm.RkQC;
+using Gs.DevApp.ToolBox;
+
+namespace Gs.DevApp.DevFrm.IPQC
{
partial class Frm_ShouJianDetect01
{
@@ -29,11 +32,6 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -57,81 +55,68 @@
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.bandedGridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptButtonUrl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn7 = 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.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
this.txt_fcheckDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_lotNo1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
- this.txt_guid = new DevExpress.XtraEditors.TextEdit();
- this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
- this.txt_fngDesc = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fcheckByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_slOrg = new DevExpress.XtraEditors.TextEdit();
+ this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
+ this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_iqcRemark = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -154,6 +139,7 @@
this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -177,10 +163,12 @@
this.panMsg = new DevExpress.XtraEditors.PanelControl();
this.layoutMxMsg = new DevExpress.XtraLayout.LayoutControl();
this.btnIpt = new DevExpress.XtraEditors.SimpleButton();
+ this.btnLoad = new DevExpress.XtraEditors.SimpleButton();
this.txtJianYan = new DevExpress.XtraEditors.TextEdit();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList();
this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -189,6 +177,10 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -200,7 +192,6 @@
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptButtonUrl)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -210,50 +201,41 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -287,12 +269,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -314,10 +301,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1680, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1437, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -325,11 +312,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1680, 880);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1437, 720);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -338,9 +324,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1678, 842);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1435, 688);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -349,7 +334,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -362,21 +346,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1678, 842);
+ this.split1.Size = new System.Drawing.Size(1435, 688);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.rptButtonUrl});
- this.gcMain1.Size = new System.Drawing.Size(1678, 781);
+ this.gcMain1.Size = new System.Drawing.Size(1435, 638);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -390,34 +370,29 @@
this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fsubmit,
- this.gv_releaseNo,
this.gv_lotNo,
- this.gridColumn23,
+ this.gv_lifnr,
+ this.gv_releaseNo,
this.gv_itemId,
this.gv_itemNo,
this.gv_boardStyle,
this.gridColumn14,
- this.gv_fcovertQty,
this.gv_fbatchQty,
this.gv_fcheckResu,
- this.gv_remarks,
this.gv_fcheckBy,
this.gv_fcheckDate,
this.gv_createBy,
this.gridColumn15,
this.gv_lastupdateBy,
this.gv_lastupdateDate,
+ this.bandedGridColumn1,
this.gridColumn18,
this.gridColumn19,
- this.gridColumn30,
- this.gridColumn13,
this.gridColumn17,
- this.gridColumn5,
- this.gridColumn6,
- this.gridColumn7});
- this.gridView1.DetailHeight = 428;
+ this.gridColumn30,
+ this.gridColumn5});
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -428,325 +403,274 @@
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmitTxt";
- this.gv_fsubmit.MinWidth = 37;
+ this.gv_fsubmit.MinWidth = 30;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 0;
- this.gv_fsubmit.Width = 62;
- //
- // gv_releaseNo
- //
- this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
- this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
- this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 37;
- this.gv_releaseNo.Name = "gv_releaseNo";
- this.gv_releaseNo.OptionsColumn.AllowEdit = false;
- this.gv_releaseNo.Tag = "query_a.release_no";
- this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 2;
- this.gv_releaseNo.Width = 125;
+ this.gv_fsubmit.Width = 33;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "宸ュ崟鍗曞彿";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 37;
+ this.gv_lotNo.MinWidth = 30;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 3;
- this.gv_lotNo.Width = 150;
+ this.gv_lotNo.VisibleIndex = 2;
+ this.gv_lotNo.Width = 79;
//
- // gridColumn23
+ // gv_lifnr
//
- this.gridColumn23.Caption = "浜х嚎鍚嶇О";
- this.gridColumn23.FieldName = "lineName";
- this.gridColumn23.MinWidth = 31;
- this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 4;
- this.gridColumn23.Width = 117;
+ this.gv_lifnr.AppearanceCell.Options.UseFont = true;
+ this.gv_lifnr.Caption = "浜х嚎鍚嶇О";
+ this.gv_lifnr.FieldName = "lineName";
+ this.gv_lifnr.MinWidth = 30;
+ this.gv_lifnr.Name = "gv_lifnr";
+ this.gv_lifnr.OptionsColumn.AllowEdit = false;
+ this.gv_lifnr.Tag = "query_a.lifnr";
+ this.gv_lifnr.Visible = true;
+ this.gv_lifnr.VisibleIndex = 5;
+ this.gv_lifnr.Width = 132;
+ //
+ // gv_releaseNo
+ //
+ this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
+ this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
+ this.gv_releaseNo.FieldName = "releaseNo";
+ this.gv_releaseNo.MinWidth = 30;
+ this.gv_releaseNo.Name = "gv_releaseNo";
+ this.gv_releaseNo.OptionsColumn.AllowEdit = false;
+ this.gv_releaseNo.Tag = "query_a.release_no";
+ this.gv_releaseNo.Visible = true;
+ this.gv_releaseNo.VisibleIndex = 1;
+ this.gv_releaseNo.Width = 66;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 37;
+ this.gv_itemId.MinWidth = 30;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Width = 37;
+ this.gv_itemId.Width = 30;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
- this.gv_itemNo.FieldName = "itemNo2";
- this.gv_itemNo.MinWidth = 37;
+ this.gv_itemNo.FieldName = "itemNo";
+ this.gv_itemNo.MinWidth = 30;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 7;
- this.gv_itemNo.Width = 170;
+ this.gv_itemNo.VisibleIndex = 6;
+ this.gv_itemNo.Width = 89;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 37;
+ this.gv_boardStyle.MinWidth = 30;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
- this.gv_boardStyle.VisibleIndex = 8;
- this.gv_boardStyle.Width = 205;
+ this.gv_boardStyle.VisibleIndex = 7;
+ this.gv_boardStyle.Width = 108;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 37;
+ this.gridColumn14.MinWidth = 30;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 9;
- this.gridColumn14.Width = 250;
- //
- // gv_fcovertQty
- //
- this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
- this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺";
- this.gv_fcovertQty.FieldName = "daaQty";
- this.gv_fcovertQty.MinWidth = 37;
- this.gv_fcovertQty.Name = "gv_fcovertQty";
- this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
- this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
- this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
- this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 10;
+ this.gridColumn14.VisibleIndex = 8;
+ this.gridColumn14.Width = 132;
//
// gv_fbatchQty
//
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "鎶芥鏁伴噺";
+ this.gv_fbatchQty.Caption = "宸ュ崟鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 37;
+ this.gv_fbatchQty.MinWidth = 30;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
- this.gv_fbatchQty.Width = 100;
+ this.gv_fbatchQty.Visible = true;
+ this.gv_fbatchQty.VisibleIndex = 9;
+ this.gv_fbatchQty.Width = 52;
//
// gv_fcheckResu
//
- this.gv_fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.CornflowerBlue;
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.AppearanceCell.Options.UseForeColor = true;
- this.gv_fcheckResu.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
- this.gv_fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 37;
+ this.gv_fcheckResu.MinWidth = 30;
this.gv_fcheckResu.Name = "gv_fcheckResu";
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 6;
- this.gv_fcheckResu.Width = 62;
- //
- // gv_remarks
- //
- this.gv_remarks.AppearanceCell.Options.UseFont = true;
- this.gv_remarks.Caption = "澶囨敞璇存槑";
- this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 37;
- this.gv_remarks.Name = "gv_remarks";
- this.gv_remarks.OptionsColumn.AllowEdit = false;
- this.gv_remarks.Tag = "query_a.remarks";
- this.gv_remarks.Width = 125;
+ this.gv_fcheckResu.VisibleIndex = 4;
+ this.gv_fcheckResu.Width = 33;
//
// gv_fcheckBy
//
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
this.gv_fcheckBy.FieldName = "fcheckByName";
- this.gv_fcheckBy.MinWidth = 37;
+ this.gv_fcheckBy.MinWidth = 30;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 11;
- this.gv_fcheckBy.Width = 147;
+ this.gv_fcheckBy.VisibleIndex = 10;
+ this.gv_fcheckBy.Width = 77;
//
// gv_fcheckDate
//
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 37;
+ this.gv_fcheckDate.MinWidth = 30;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 12;
- this.gv_fcheckDate.Width = 227;
+ this.gv_fcheckDate.VisibleIndex = 11;
+ this.gv_fcheckDate.Width = 120;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createByName";
- this.gv_createBy.MinWidth = 37;
+ this.gv_createBy.MinWidth = 30;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 13;
- this.gv_createBy.Width = 84;
+ this.gv_createBy.VisibleIndex = 12;
+ this.gv_createBy.Width = 44;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 14;
- this.gridColumn15.Width = 117;
+ this.gridColumn15.VisibleIndex = 13;
+ this.gridColumn15.Width = 68;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 37;
+ this.gv_lastupdateBy.FieldName = "lastupdateByName";
+ this.gv_lastupdateBy.MinWidth = 30;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
+ this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 37;
+ this.gv_lastupdateDate.MinWidth = 30;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Width = 150;
+ this.gv_lastupdateDate.Width = 120;
+ //
+ // bandedGridColumn1
+ //
+ this.bandedGridColumn1.Caption = "鐢熶骇缁勭粐";
+ this.bandedGridColumn1.FieldName = "fSubsidiary";
+ this.bandedGridColumn1.MinWidth = 50;
+ this.bandedGridColumn1.Name = "bandedGridColumn1";
+ this.bandedGridColumn1.Tag = "org.fnamber";
+ this.bandedGridColumn1.Visible = true;
+ this.bandedGridColumn1.VisibleIndex = 14;
+ this.bandedGridColumn1.Width = 161;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
- this.gridColumn18.FieldName = "fsubmitBy";
- this.gridColumn18.MinWidth = 31;
+ this.gridColumn18.FieldName = "fcheckByName";
+ this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 15;
- this.gridColumn18.Width = 117;
+ this.gridColumn18.Width = 60;
//
// gridColumn19
//
this.gridColumn19.Caption = "瀹℃牳鏃ユ湡";
this.gridColumn19.FieldName = "fsubmitDate";
- this.gridColumn19.MinWidth = 31;
+ this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 16;
- this.gridColumn19.Width = 117;
- //
- // gridColumn30
- //
- this.gridColumn30.Caption = "绫诲瀷";
- this.gridColumn30.FieldName = "orderType";
- this.gridColumn30.MinWidth = 31;
- this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Width = 117;
- //
- // gridColumn13
- //
- this.gridColumn13.Caption = "浜х嚎ID";
- this.gridColumn13.FieldName = "daa020";
- this.gridColumn13.MinWidth = 31;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Width = 117;
+ this.gridColumn19.Width = 67;
//
// gridColumn17
//
this.gridColumn17.Caption = "涓婚敭Guid";
this.gridColumn17.FieldName = "guid";
- this.gridColumn17.MinWidth = 31;
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 117;
+ this.gridColumn17.Width = 94;
+ //
+ // gridColumn30
+ //
+ this.gridColumn30.Caption = "绫诲瀷";
+ this.gridColumn30.FieldName = "orderType";
+ this.gridColumn30.MinWidth = 25;
+ this.gridColumn30.Name = "gridColumn30";
+ this.gridColumn30.Width = 94;
//
// gridColumn5
//
- this.gridColumn5.Caption = "瀹℃牳鐘舵��";
+ this.gridColumn5.Caption = "妫�楠岀姸鎬�";
this.gridColumn5.FieldName = "txtColor";
- this.gridColumn5.MinWidth = 31;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 117;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "鍘绘楠�";
- this.gridColumn6.ColumnEdit = this.rptButtonUrl;
- this.gridColumn6.MinWidth = 31;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 1;
- this.gridColumn6.Width = 117;
- //
- // rptButtonUrl
- //
- this.rptButtonUrl.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x162;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.rptButtonUrl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍘绘楠�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.rptButtonUrl.Name = "rptButtonUrl";
- this.rptButtonUrl.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.rptButtonUrl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptButtonUrl_ButtonClick);
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "鐢熶骇缁勭粐";
- this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 31;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 17;
- this.gridColumn7.Width = 117;
+ this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 62;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 781);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 638);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1678, 46);
+ this.pageBar1.Size = new System.Drawing.Size(1435, 38);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.PageVisible = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(1678, 842);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1435, 688);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -754,7 +678,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -767,274 +690,240 @@
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1678, 842);
- this.splitMx1.SplitterPosition = 226;
+ this.splitMx1.Size = new System.Drawing.Size(1435, 688);
+ this.splitMx1.SplitterPosition = 210;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_fngDesc);
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_remarks);
this.layoutMx1.Controls.Add(this.txt_fcheckResu);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_releaseNo);
this.layoutMx1.Controls.Add(this.txt_fcheckDate);
- this.layoutMx1.Controls.Add(this.txt_lotNo1);
+ this.layoutMx1.Controls.Add(this.txt_lotNo);
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemModel);
- this.layoutMx1.Controls.Add(this.txt_fcheckBy);
- this.layoutMx1.Controls.Add(this.txt_fbatchQty);
- this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
- this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
- this.layoutMx1.Controls.Add(this.txt_fsubmit);
- this.layoutMx1.Controls.Add(this.txt_guid);
- this.layoutMx1.Controls.Add(this.txt_lotNo);
- this.layoutMx1.Controls.Add(this.txt_checkStates);
- this.layoutMx1.Controls.Add(this.txt_createBy);
- this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_itemName);
- this.layoutMx1.Controls.Add(this.txt_lineName);
this.layoutMx1.Controls.Add(this.txt_itemId);
- this.layoutMx1.Controls.Add(this.txt_fngDesc);
+ this.layoutMx1.Controls.Add(this.txt_fcheckByName);
+ this.layoutMx1.Controls.Add(this.txt_fbatchQty);
+ this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
+ this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
+ this.layoutMx1.Controls.Add(this.txt_fsubmit);
+ this.layoutMx1.Controls.Add(this.txt_slOrg);
+ this.layoutMx1.Controls.Add(this.txt_guid);
+ this.layoutMx1.Controls.Add(this.txt_checkStates);
+ this.layoutMx1.Controls.Add(this.txt_freceQty);
+ this.layoutMx1.Controls.Add(this.txt_iqcRemark);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
- this.layoutControlItem21});
+ this.layoutControlItem7,
+ this.layoutControlItem21,
+ this.layoutControlItem23});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(827, 475, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(381, 412, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1678, 226);
+ this.layoutMx1.Size = new System.Drawing.Size(1435, 210);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
+ // txt_fngDesc
+ //
+ this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
+ this.txt_fngDesc.Location = new System.Drawing.Point(12, 138);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fngDesc.Name = "txt_fngDesc";
+ this.txt_fngDesc.Size = new System.Drawing.Size(703, 60);
+ this.txt_fngDesc.TabIndex = 815;
+ this.txt_fngDesc.TextTxt = "";
+ this.txt_fngDesc.WhereTxt = " a.s_type=\'QC寮傚父鎻忚堪\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
+ //
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1234, 132);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(987, 108);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(402, 34);
+ this.lbGuid.Size = new System.Drawing.Size(322, 28);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // txt_remarks
- //
- this.txt_remarks.Location = new System.Drawing.Point(101, 148);
- this.txt_remarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_remarks.Name = "txt_remarks";
- this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(735, 28);
- this.txt_remarks.StyleController = this.layoutMx1;
- this.txt_remarks.TabIndex = 797;
- //
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(927, 148);
- this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(791, 106);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(322, 28);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
//
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(84, 42);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(277, 24);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 800;
+ this.txt_itemName.Tag = "readonly";
+ //
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(101, 14);
- this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(322, 28);
+ this.txt_releaseNo.Size = new System.Drawing.Size(277, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(927, 46);
- this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(791, 12);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(322, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
- // txt_lotNo1
+ // txt_lotNo
//
- this.txt_lotNo1.Location = new System.Drawing.Point(927, 14);
- this.txt_lotNo1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_lotNo1.Name = "txt_lotNo1";
- this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo1.Size = new System.Drawing.Size(322, 28);
- this.txt_lotNo1.StyleController = this.layoutMx1;
- this.txt_lotNo1.TabIndex = 262;
- this.txt_lotNo1.Tag = "";
+ this.txt_lotNo.Location = new System.Drawing.Point(437, 12);
+ this.txt_lotNo.Name = "txt_lotNo";
+ this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_lotNo.Size = new System.Drawing.Size(278, 24);
+ this.txt_lotNo.StyleController = this.layoutMx1;
+ this.txt_lotNo.TabIndex = 262;
+ this.txt_lotNo.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(514, 80);
- this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(322, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(277, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(514, 114);
- this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 106);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(322, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
- // txt_fcheckBy
+ // txt_itemId
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(927, 80);
- this.txt_fcheckBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_fcheckBy.Name = "txt_fcheckBy";
- this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(322, 28);
- this.txt_fcheckBy.StyleController = this.layoutMx1;
- this.txt_fcheckBy.TabIndex = 217;
- this.txt_fcheckBy.Tag = "readonly";
+ this.txt_itemId.Location = new System.Drawing.Point(84, 140);
+ this.txt_itemId.Name = "txt_itemId";
+ this.txt_itemId.Size = new System.Drawing.Size(249, 24);
+ this.txt_itemId.StyleController = this.layoutMx1;
+ this.txt_itemId.TabIndex = 802;
+ this.txt_itemId.Tag = "readonly";
+ //
+ // txt_fcheckByName
+ //
+ this.txt_fcheckByName.Location = new System.Drawing.Point(791, 42);
+ this.txt_fcheckByName.Name = "txt_fcheckByName";
+ this.txt_fcheckByName.Properties.Appearance.Options.UseFont = true;
+ this.txt_fcheckByName.Size = new System.Drawing.Size(278, 24);
+ this.txt_fcheckByName.StyleController = this.layoutMx1;
+ this.txt_fcheckByName.TabIndex = 217;
+ this.txt_fcheckByName.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(514, 14);
- this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(437, 42);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(322, 28);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(278, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
- this.txt_fbatchQty.Tag = "";
- //
- // txt_fsubmitBy
- //
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1340, 114);
- this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(324, 28);
- this.txt_fsubmitBy.StyleController = this.layoutMx1;
- this.txt_fsubmitBy.TabIndex = 804;
- this.txt_fsubmitBy.Tag = "readonly";
+ this.txt_fbatchQty.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1340, 80);
- this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 42);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(324, 28);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
- this.txt_fsubmitDate.TabIndex = 805;
+ this.txt_fsubmitDate.TabIndex = 804;
this.txt_fsubmitDate.Tag = "readonly";
+ //
+ // txt_fsubmitBy
+ //
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 74);
+ this.txt_fsubmitBy.Name = "txt_fsubmitBy";
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
+ this.txt_fsubmitBy.StyleController = this.layoutMx1;
+ this.txt_fsubmitBy.TabIndex = 805;
+ this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1253, 148);
- this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1073, 12);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(411, 27);
+ this.txt_fsubmit.Size = new System.Drawing.Size(350, 24);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
+ // txt_slOrg
+ //
+ this.txt_slOrg.Location = new System.Drawing.Point(437, 74);
+ this.txt_slOrg.Name = "txt_slOrg";
+ this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
+ this.txt_slOrg.StyleController = this.layoutMx1;
+ this.txt_slOrg.TabIndex = 807;
+ this.txt_slOrg.Tag = "readonly";
+ //
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1331, 132);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_guid.Location = new System.Drawing.Point(1065, 108);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(305, 28);
+ this.txt_guid.Size = new System.Drawing.Size(244, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 808;
this.txt_guid.Tag = "readonly";
//
- // txt_lotNo
- //
- this.txt_lotNo.Location = new System.Drawing.Point(101, 46);
- this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_lotNo.Name = "txt_lotNo";
- this.txt_lotNo.Size = new System.Drawing.Size(322, 28);
- this.txt_lotNo.StyleController = this.layoutMx1;
- this.txt_lotNo.TabIndex = 815;
- this.txt_lotNo.Tag = "readonly";
- //
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(927, 114);
- this.txt_checkStates.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkStates.Location = new System.Drawing.Point(791, 74);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(322, 28);
+ this.txt_checkStates.Size = new System.Drawing.Size(278, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
- this.txt_checkStates.TabIndex = 819;
+ this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
//
- // txt_createBy
+ // txt_freceQty
//
- this.txt_createBy.Location = new System.Drawing.Point(1340, 14);
- this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(324, 28);
- this.txt_createBy.StyleController = this.layoutMx1;
- this.txt_createBy.TabIndex = 822;
- this.txt_createBy.Tag = "readonly";
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 102);
+ this.txt_freceQty.Name = "txt_freceQty";
+ this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
+ this.txt_freceQty.StyleController = this.layoutMx1;
+ this.txt_freceQty.TabIndex = 810;
+ this.txt_freceQty.Tag = "readonly";
//
- // txt_createDate
+ // txt_iqcRemark
//
- this.txt_createDate.Location = new System.Drawing.Point(1340, 46);
- this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(324, 28);
- this.txt_createDate.StyleController = this.layoutMx1;
- this.txt_createDate.TabIndex = 823;
- this.txt_createDate.Tag = "readonly";
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(101, 114);
- this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(322, 28);
- this.txt_itemName.StyleController = this.layoutMx1;
- this.txt_itemName.TabIndex = 825;
- this.txt_itemName.Tag = "readonly";
- //
- // txt_lineName
- //
- this.txt_lineName.Location = new System.Drawing.Point(514, 46);
- this.txt_lineName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(322, 28);
- this.txt_lineName.StyleController = this.layoutMx1;
- this.txt_lineName.TabIndex = 826;
- //
- // txt_itemId
- //
- this.txt_itemId.Location = new System.Drawing.Point(101, 80);
- this.txt_itemId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(322, 28);
- this.txt_itemId.StyleController = this.layoutMx1;
- this.txt_itemId.TabIndex = 827;
- //
- // txt_fngDesc
- //
- this.txt_fngDesc.Location = new System.Drawing.Point(101, 182);
- this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(735, 28);
- this.txt_fngDesc.StyleController = this.layoutMx1;
- this.txt_fngDesc.TabIndex = 828;
+ this.txt_iqcRemark.Location = new System.Drawing.Point(437, 106);
+ this.txt_iqcRemark.Name = "txt_iqcRemark";
+ this.txt_iqcRemark.Size = new System.Drawing.Size(278, 24);
+ this.txt_iqcRemark.StyleController = this.layoutMx1;
+ this.txt_iqcRemark.TabIndex = 819;
//
// layoutControlItem17
//
@@ -1048,6 +937,16 @@
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_itemId;
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 128);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem7.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem7.Text = "鐗╂枡ID";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_guid;
@@ -1057,33 +956,40 @@
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem21.Text = "涓婚敭GUID";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(62, 24);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_freceQty;
+ this.layoutControlItem23.Location = new System.Drawing.Point(990, 90);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem23.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem9,
- this.layoutControlItem31,
- this.layoutControlItem33,
- this.layoutControlItem16,
- this.layoutControlItem15,
- this.layoutControlItem14,
this.layoutControlItem1,
- this.layoutControlItem28,
- this.layoutControlItem3,
- this.layoutControlItem2,
- this.layoutControlItem8,
- this.layoutControlItem32,
- this.layoutControlItem10,
- this.layoutControlItem7,
this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem34,
this.layoutControlItem6,
- this.layoutControlItem12,
- this.layoutControlItem13});
+ this.layoutControlItem15,
+ this.layoutControlItem16,
+ this.layoutControlItem14,
+ this.layoutControlItem10,
+ this.layoutControlItem22,
+ this.layoutControlItem8,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem9,
+ this.layoutControlItem18,
+ this.layoutControlItem39,
+ this.layoutControlItem28});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1118,232 +1024,141 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1678, 226);
+ this.Root.Size = new System.Drawing.Size(1435, 210);
this.Root.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(413, 0);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(413, 32);
- this.layoutControlItem9.Text = "鎶芥鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(1239, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(415, 32);
- this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(1239, 32);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(415, 34);
- this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(1239, 66);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(415, 34);
- this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(1239, 100);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(415, 34);
- this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(1239, 134);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(415, 34);
- this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(413, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(353, 30);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_lotNo;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_lotNo1;
- this.layoutControlItem3.Location = new System.Drawing.Point(826, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(413, 32);
- this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(826, 32);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(826, 66);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem32
- //
- this.layoutControlItem32.Control = this.txt_checkStates;
- this.layoutControlItem32.Location = new System.Drawing.Point(826, 100);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(826, 134);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_lineName;
- this.layoutControlItem7.Location = new System.Drawing.Point(413, 32);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem7.Text = "浜х嚎鍚嶇О";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
- this.layoutControlItem4.Control = this.txt_itemId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem4.Control = this.txt_itemName;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem4.Text = "浜у搧ID";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(353, 32);
+ this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(413, 66);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem5.Size = new System.Drawing.Size(353, 32);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
- //
- // layoutControlItem34
- //
- this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 100);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(413, 34);
- this.layoutControlItem34.Text = "浜у搧鍚嶇О";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(413, 100);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 94);
this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem6.Size = new System.Drawing.Size(353, 32);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem12
+ // layoutControlItem15
//
- this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 134);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(826, 34);
- this.layoutControlItem12.Text = "澶囨敞璇存槑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem15.Control = this.txt_fsubmitDate;
+ this.layoutControlItem15.Location = new System.Drawing.Point(1061, 30);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem15.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem13
+ // layoutControlItem16
//
- this.layoutControlItem13.Control = this.txt_fngDesc;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 168);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem13.Size = new System.Drawing.Size(826, 34);
- this.layoutControlItem13.Text = "寮傚父澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem16.Control = this.txt_fsubmitBy;
+ this.layoutControlItem16.Location = new System.Drawing.Point(1061, 62);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fsubmit;
+ this.layoutControlItem14.Location = new System.Drawing.Point(1061, 0);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fcheckResu;
+ this.layoutControlItem10.Location = new System.Drawing.Point(707, 94);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_checkStates;
+ this.layoutControlItem22.Location = new System.Drawing.Point(707, 62);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem22.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fcheckByName;
+ this.layoutControlItem8.Location = new System.Drawing.Point(707, 30);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_fcheckDate;
+ this.layoutControlItem2.Location = new System.Drawing.Point(707, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_lotNo;
+ this.layoutControlItem3.Location = new System.Drawing.Point(353, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(354, 30);
+ this.layoutControlItem3.Text = "宸ュ崟鍗曞彿";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1678, 601);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1435, 466);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1353,17 +1168,15 @@
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1676, 563);
+ this.tabMxPage1.Size = new System.Drawing.Size(1433, 434);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
//
this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx2.Horizontal = false;
- this.splitMx2.Location = new System.Drawing.Point(0, 57);
- this.splitMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.splitMx2.Location = new System.Drawing.Point(0, 47);
this.splitMx2.Name = "splitMx2";
//
// splitMx2.Panel1
@@ -1375,19 +1188,17 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1676, 506);
- this.splitMx2.SplitterPosition = 351;
+ this.splitMx2.Size = new System.Drawing.Size(1433, 387);
+ this.splitMx2.SplitterPosition = 317;
this.splitMx2.TabIndex = 3;
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1676, 351);
+ this.gcMx1.Size = new System.Drawing.Size(1433, 317);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1396,7 +1207,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 61;
+ this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1fcheckItem,
@@ -1414,8 +1225,8 @@
this.gvMx1fngQty,
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
- this.gvMx1facLevel});
- this.gvMx1.DetailHeight = 428;
+ this.gvMx1facLevel,
+ this.gridColumn7});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1427,126 +1238,129 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 62;
+ this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 117;
+ this.gvMx1guid.Width = 94;
//
// gvMx1fcheckItem
//
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 62;
+ this.gvMx1fcheckItem.MinWidth = 50;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 0;
- this.gvMx1fcheckItem.Width = 150;
+ this.gvMx1fcheckItem.Width = 120;
//
// gvMx1fcheckTool
//
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 62;
+ this.gvMx1fcheckTool.MinWidth = 50;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 1;
- this.gvMx1fcheckTool.Width = 125;
+ this.gvMx1fcheckTool.Width = 100;
//
// gvMx1fcheckItemDesc
//
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 62;
+ this.gvMx1fcheckItemDesc.MinWidth = 50;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
+ this.gvMx1fcheckItemDesc.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Width = 150;
+ this.gvMx1fcheckItemDesc.Width = 120;
//
// gvMx1fspecRequ
//
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 62;
+ this.gvMx1fspecRequ.MinWidth = 50;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
this.gvMx1fspecRequ.VisibleIndex = 2;
- this.gvMx1fspecRequ.Width = 150;
+ this.gvMx1fspecRequ.Width = 120;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 62;
+ this.gvMx1fupAllow.MinWidth = 50;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 3;
- this.gvMx1fupAllow.Width = 62;
+ this.gvMx1fupAllow.Width = 50;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 62;
+ this.gvMx1fstand.MinWidth = 50;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 4;
- this.gvMx1fstand.Width = 87;
+ this.gvMx1fstand.Width = 70;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 62;
+ this.gvMx1fdownAllow.MinWidth = 50;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 5;
- this.gvMx1fdownAllow.Width = 62;
+ this.gvMx1fdownAllow.Width = 50;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
- this.gvMx1freQty.MinWidth = 62;
+ this.gvMx1freQty.MinWidth = 50;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
this.gvMx1freQty.VisibleIndex = 6;
- this.gvMx1freQty.Width = 62;
+ this.gvMx1freQty.Width = 50;
//
// gvMx1checkQyt
//
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 62;
+ this.gvMx1checkQyt.MinWidth = 50;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
this.gvMx1checkQyt.VisibleIndex = 7;
+ this.gvMx1checkQyt.Width = 60;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 75;
+ this.gvMx1fenterQty.MinWidth = 60;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
this.gvMx1fenterQty.VisibleIndex = 8;
+ this.gvMx1fenterQty.Width = 60;
//
// gvMx1fcheckResu
//
@@ -1557,78 +1371,85 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 62;
+ this.gvMx1fcheckResu.MinWidth = 50;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
this.gvMx1fcheckResu.VisibleIndex = 9;
- this.gvMx1fcheckResu.Width = 117;
+ this.gvMx1fcheckResu.Width = 94;
//
// gvMx1fngRate
//
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 62;
+ this.gvMx1fngRate.MinWidth = 50;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
this.gvMx1fngRate.VisibleIndex = 10;
- this.gvMx1fngRate.Width = 117;
+ this.gvMx1fngRate.Width = 94;
//
// gvMx1fngQty
//
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 62;
+ this.gvMx1fngQty.MinWidth = 50;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 11;
- this.gvMx1fngQty.Width = 62;
+ this.gvMx1fngQty.Width = 50;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 62;
+ this.gvMx1sampleSizeNo.MinWidth = 50;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 12;
- this.gvMx1sampleSizeNo.Width = 250;
+ this.gvMx1sampleSizeNo.Width = 200;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 62;
+ this.gvMx1fcheckLevel.MinWidth = 50;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 13;
- this.gvMx1fcheckLevel.Width = 250;
+ this.gvMx1fcheckLevel.Width = 200;
//
// gvMx1facLevel
//
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 62;
+ this.gvMx1facLevel.MinWidth = 50;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 14;
- this.gvMx1facLevel.Width = 250;
+ this.gvMx1facLevel.Width = 200;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鏍锋湰鏁�";
+ this.gridColumn7.FieldName = "ybsl";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Width = 94;
//
// splitYangLi
//
this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitYangLi.Location = new System.Drawing.Point(0, 0);
- this.splitYangLi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitYangLi.Name = "splitYangLi";
//
// splitYangLi.Panel1
@@ -1640,8 +1461,8 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1676, 140);
- this.splitYangLi.SplitterPosition = 845;
+ this.splitYangLi.Size = new System.Drawing.Size(1433, 58);
+ this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
// groupControl1
@@ -1649,21 +1470,18 @@
this.groupControl1.Controls.Add(this.gcMx2);
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
- this.groupControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(845, 140);
+ this.groupControl1.Size = new System.Drawing.Size(676, 58);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gcMx2.Location = new System.Drawing.Point(2, 34);
+ this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(841, 104);
+ this.gcMx2.Size = new System.Drawing.Size(672, 28);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1678,7 +1496,6 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn25});
- this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
@@ -1686,86 +1503,83 @@
//
this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Width = 117;
+ this.gridColumn4.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
- this.gridColumn3.MaxWidth = 240;
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MaxWidth = 192;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 240;
+ this.gridColumn3.Width = 192;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
- this.gridColumn2.MaxWidth = 100;
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MaxWidth = 80;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Width = 100;
+ this.gridColumn2.Width = 80;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn20.FieldName = "fstand";
- this.gridColumn20.MinWidth = 31;
+ this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 117;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "鎿嶄綔浜�";
- this.gridColumn21.FieldName = "createBy";
- this.gridColumn21.MinWidth = 31;
+ this.gridColumn21.FieldName = "createByName";
+ this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 117;
+ this.gridColumn21.Width = 94;
//
// gridColumn25
//
this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn25.FieldName = "createDate";
- this.gridColumn25.MinWidth = 31;
+ this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
- this.gridColumn25.Width = 117;
+ this.gridColumn25.Width = 94;
//
// groupControl2
//
this.groupControl2.Controls.Add(this.gcMx3);
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
- this.groupControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(816, 140);
+ this.groupControl2.Size = new System.Drawing.Size(745, 58);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gcMx3.Location = new System.Drawing.Point(2, 34);
+ this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
- this.gcMx3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(812, 104);
+ this.gcMx3.Size = new System.Drawing.Size(741, 28);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1781,7 +1595,6 @@
this.gridColumn24,
this.gridColumn26,
this.gridColumn27});
- this.gvMx3.DetailHeight = 428;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
//
@@ -1789,121 +1602,128 @@
//
this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn1.FieldName = "guid";
- this.gridColumn1.MinWidth = 31;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 117;
+ this.gridColumn1.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "椤圭洰";
this.gridColumn22.FieldName = "fcheckItemd5";
- this.gridColumn22.MaxWidth = 240;
- this.gridColumn22.MinWidth = 31;
+ this.gridColumn22.MaxWidth = 192;
+ this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 0;
- this.gridColumn22.Width = 240;
+ this.gridColumn22.Width = 192;
//
// gridColumn28
//
this.gridColumn28.Caption = "鏍锋湰搴�";
this.gridColumn28.FieldName = "fcheckItem";
- this.gridColumn28.MinWidth = 31;
+ this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 1;
- this.gridColumn28.Width = 117;
+ this.gridColumn28.Width = 94;
//
// gridColumn29
//
this.gridColumn29.Caption = "鏍锋湰鍊�";
this.gridColumn29.FieldName = "fcheckResu";
- this.gridColumn29.MinWidth = 31;
+ this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 2;
- this.gridColumn29.Width = 117;
+ this.gridColumn29.Width = 94;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn24.FieldName = "fstand";
- this.gridColumn24.MinWidth = 31;
+ this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
- this.gridColumn24.Width = 117;
+ this.gridColumn24.Width = 94;
//
// gridColumn26
//
this.gridColumn26.Caption = "鎿嶄綔浜�";
this.gridColumn26.FieldName = "createBy";
- this.gridColumn26.MinWidth = 31;
+ this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
- this.gridColumn26.Width = 117;
+ this.gridColumn26.Width = 94;
//
// gridColumn27
//
this.gridColumn27.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn27.FieldName = "createDate";
- this.gridColumn27.MinWidth = 31;
+ this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
- this.gridColumn27.Width = 117;
+ this.gridColumn27.Width = 94;
//
// panMsg
//
this.panMsg.Controls.Add(this.layoutMxMsg);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
- this.panMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1676, 57);
+ this.panMsg.Size = new System.Drawing.Size(1433, 47);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
//
this.layoutMxMsg.Controls.Add(this.btnIpt);
+ this.layoutMxMsg.Controls.Add(this.btnLoad);
this.layoutMxMsg.Controls.Add(this.txtJianYan);
this.layoutMxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMxMsg.Location = new System.Drawing.Point(2, 2);
- this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
- this.layoutMxMsg.Size = new System.Drawing.Size(1672, 53);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1429, 43);
this.layoutMxMsg.TabIndex = 0;
this.layoutMxMsg.Text = "layoutControl1";
//
// btnIpt
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
- this.btnIpt.Location = new System.Drawing.Point(1537, 2);
- this.btnIpt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnIpt.Location = new System.Drawing.Point(1321, 2);
this.btnIpt.Name = "btnIpt";
- this.btnIpt.Size = new System.Drawing.Size(133, 45);
+ this.btnIpt.Size = new System.Drawing.Size(106, 36);
this.btnIpt.StyleController = this.layoutMxMsg;
this.btnIpt.TabIndex = 4;
this.btnIpt.Text = "鏍锋湰绠＄悊";
//
+ // btnLoad
+ //
+ this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
+ this.btnLoad.Location = new System.Drawing.Point(1155, 2);
+ this.btnLoad.Name = "btnLoad";
+ this.btnLoad.Size = new System.Drawing.Size(162, 36);
+ this.btnLoad.StyleController = this.layoutMxMsg;
+ this.btnLoad.TabIndex = 3;
+ this.btnLoad.Text = "閲嶆柊鍔犺浇妫�楠岄」鐩�";
+ //
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(268, 2);
- this.txtJianYan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtJianYan.Location = new System.Drawing.Point(221, 2);
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
- this.txtJianYan.Size = new System.Drawing.Size(753, 42);
+ this.txtJianYan.Size = new System.Drawing.Size(656, 36);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -1913,7 +1733,8 @@
this.layoutControlGroup1.GroupBordersVisible = false;
this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem11,
- this.layoutControlItem20});
+ this.layoutControlItem20,
+ this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1923,7 +1744,7 @@
columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition7.Width = 100D;
columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition8.Width = 137D;
+ columnDefinition8.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6,
@@ -1934,7 +1755,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1672, 53);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 43);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -1944,42 +1765,56 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(1023, 53);
+ this.layoutControlItem11.Size = new System.Drawing.Size(879, 43);
this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(251, 22);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem20.Control = this.btnIpt;
- this.layoutControlItem20.Location = new System.Drawing.Point(1535, 0);
- this.layoutControlItem20.MaxSize = new System.Drawing.Size(137, 49);
- this.layoutControlItem20.MinSize = new System.Drawing.Size(137, 49);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1319, 0);
+ this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
+ this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(137, 53);
+ this.layoutControlItem20.Size = new System.Drawing.Size(110, 43);
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem20.Text = "鏍锋湰绠＄悊";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem20.TextVisible = false;
//
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
+ this.layoutControlItem19.Control = this.btnLoad;
+ this.layoutControlItem19.Location = new System.Drawing.Point(879, 0);
+ this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
+ this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem19.Size = new System.Drawing.Size(440, 43);
+ this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem19.TextVisible = false;
+ //
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1676, 558);
+ this.tabMxPage2.Size = new System.Drawing.Size(1433, 419);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
//
this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
- this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(4);
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1676, 558);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1433, 419);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -1995,10 +1830,9 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1151, 51);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.picCheckBox.Location = new System.Drawing.Point(921, 42);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
@@ -2016,17 +1850,62 @@
//
this.gridView4.Name = "gridView4";
//
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fbatchQty;
+ this.layoutControlItem9.Location = new System.Drawing.Point(353, 30);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem9.Text = "宸ュ崟鏁伴噺";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_slOrg;
+ this.layoutControlItem18.Location = new System.Drawing.Point(353, 62);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem18.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem18.Text = "鐢熶骇缁勭粐";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem39
+ //
+ this.layoutControlItem39.Control = this.txt_iqcRemark;
+ this.layoutControlItem39.Location = new System.Drawing.Point(353, 94);
+ this.layoutControlItem39.Name = "layoutControlItem39";
+ this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem39.Size = new System.Drawing.Size(354, 32);
+ this.layoutControlItem39.Text = "妫�楠屽娉�";
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_fngDesc;
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 126);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem28.Size = new System.Drawing.Size(707, 64);
+ this.layoutControlItem28.Text = "寮傚父澶囨敞";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem28.TextVisible = false;
+ //
// Frm_ShouJianDetect01
//
- 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(1680, 978);
+ this.ClientSize = new System.Drawing.Size(1437, 800);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_ShouJianDetect01";
- this.Text = "ipqc棣栨";
+ this.Text = "鏉ユ枡妫�楠岀敵璇�";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
@@ -2038,7 +1917,6 @@
this.split1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptButtonUrl)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -2048,50 +1926,41 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iqcRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2125,12 +1994,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
this.ResumeLayout(false);
}
@@ -2145,6 +2019,7 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
private DevExpress.XtraGrid.Columns.GridColumn gv_releaseNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
@@ -2152,33 +2027,41 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
+ private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
- private DevExpress.XtraEditors.TextEdit txt_remarks;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.TextEdit txt_lotNo1;
+ private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
- private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
+ private DevExpress.XtraEditors.TextEdit txt_fcheckByName;
private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
- private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
+ private DevExpress.XtraEditors.TextEdit txt_itemId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.TextEdit txt_fsubmitDate;
+ private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2209,10 +2092,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraEditors.PanelControl panMsg;
+ private DevExpress.XtraEditors.SimpleButton btnLoad;
private DevExpress.XtraEditors.TextEdit txtJianYan;
- private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraEditors.TextEdit txt_slOrg;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.SimpleButton btnIpt;
@@ -2237,43 +2121,27 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
- private DevExpress.XtraEditors.TextEdit txt_lotNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraEditors.TextEdit txt_checkStates;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_itemName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
- private UserControl.UCUpFileList ucUpFileList1;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.TextEdit txt_lineName;
- private DevExpress.XtraEditors.TextEdit txt_itemId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraEditors.TextEdit txt_fngDesc;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private UserControl.UCUpFileList ucUpFileList1;
+ private DevExpress.XtraEditors.TextEdit txt_checkStates;
+ private DevExpress.XtraEditors.TextEdit txt_freceQty;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptButtonUrl;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private UserControl.UcDictionary txt_fngDesc;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraEditors.TextEdit txt_iqcRemark;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
index 08607ab..6498c6c 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01.cs
@@ -1,4 +1,4 @@
-锘縰sing Gs.DevApp.DevFrm.User;
+锘縰sing Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -8,7 +8,6 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data;
-using System.Linq;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -17,38 +16,46 @@
{
public partial class Frm_ShouJianDetect01 : DevExpress.XtraEditors.XtraForm
{
+ string _strTag = "N:涓嶅悎鏍�";
string _webServiceName = "IpqcShouManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+
public Frm_ShouJianDetect01()
{
InitializeComponent();
+ this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
- //Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
- //{
- // getModel(value, "0");
- //}, (value) =>
- //{
- // getPageList(this.pageBar1.CurrentPage);
- //}, lbGuid);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value, "0");
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ txtJianYan.KeyDown += TxtJianYan_KeyDown;
+ this.btnLoad.Click += BtnLoad_Click;
xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
}
-
-
+
/// <summary>
/// 鎵归噺褰曞叆
/// </summary>
@@ -57,8 +64,8 @@
/// <exception cref="NotImplementedException"></exception>
private void BtnIpt_Click(object sender, EventArgs e)
{
- bool bl = false;
- Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input frm = new Gs.DevApp.DevFrm.QC.Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
+ bool bl = btnLoad.Enabled;
+ Frm_MesQaItemsDetect01Input frm = new Frm_MesQaItemsDetect01Input(this.lbGuid.Text.Trim(), bl);
frm.ShowDialog();
}
@@ -68,6 +75,11 @@
Task.Delay(100);
getPageList(1);
}
+ /// <summary>
+ /// 5琛ㄧ劍鐐规椂锛岄噸鏂拌鍙�12琛�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
if (e.FocusedRowHandle >= 0)
@@ -77,6 +89,106 @@
if (string.IsNullOrEmpty(rowGuid))
return;
getList12(rowGuid);
+ }
+ }
+ /// <summary>
+ /// 閲嶆柊鍔犺浇妫�楠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void BtnLoad_Click(object sender, EventArgs e)
+ {
+ if (!MsgHelper.AskQuestion("璇ユ搷浣滃皢浼氭竻绌烘楠岃褰曪紙鍖呮嫭鏍峰搧妫�楠岃褰曪級锛岀‘瀹氶噸鏂板姞杞芥楠岄」鐩悧锛�"))
+ return;
+ string strGuid = lbGuid.Text.Trim();
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text.Trim(), "0");
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 杈撳叆妫�楠屼簨浠�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void TxtJianYan_KeyDown(object sender, KeyEventArgs e)
+ {
+ int intHandle = this.gvMx1.FocusedRowHandle;
+ if (intHandle < 0)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氳閫夋嫨妫�楠岄」鐩紒");
+ return;
+ }
+ if (e.KeyCode == Keys.Enter)
+ {
+ string guid5 = this.gvMx1.GetDataRow(intHandle)["guid"].ToString();
+ string _strCmd = txtJianYan.Text.Trim().ToUpper();
+ string _strOK = "OK";
+ string _strNG = "NG";
+ if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ if (!_strCmd.Contains("-"))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ string[] _ary = _strCmd.Split('-');
+ if (_ary.Length != 2)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝ｇ‘浣跨敤OK 鎴� NG 鍛戒护!");
+ return;
+ }
+ var _obj = new
+ {
+ inOrderGuid1 = UtilityHelper.ToGuid(lbGuid.Text.Trim()), ////杩欐槸妫�楠屽崟guid
+ inOrderGuid5 = guid5,//杩欐槸鎶芥牱鐨刧uid
+ inP1 = _strCmd,//鎴栬��0k-19,鎴栬�卬g-19
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EdtModel12",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text.Trim(), guid5);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg);
+ }
+ txtJianYan.Text = "";
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
}
@@ -127,6 +239,34 @@
toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ _toolCk("EditModelSubmit");
+ }
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk("EditModelSubmitZhiLiang");
+ }
+
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+ }
+ /// <summary>
/// 瀵煎嚭
/// </summary>
/// <param name="sender"></param>
@@ -157,7 +297,7 @@
};
try
{
- string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutShouJian", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutIqc", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -183,6 +323,7 @@
}
}
}
+
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -206,6 +347,80 @@
}
}
/// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.currentAction = "edit";
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid, "0");
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ this.setEable(true);
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ if (txt_fcheckResu.Text.Trim() == _strTag && string.IsNullOrEmpty(txt_fngDesc.TextTxt.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏紓甯告弿杩帮紒");
+ txt_fngDesc.Focus();
+ return;
+ }
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ fngDesc = txt_fngDesc.TextTxt.Trim(),
+ iqcRemark = txt_iqcRemark.Text.Trim(),
+ iqcXblb = "",
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+ this.setEable(false);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
@@ -214,7 +429,7 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and daa.erp_sczz in");
+ _sbSqlWhere.Append(" and a.ReceiveOrgId in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
@@ -248,10 +463,10 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
- }
+ }
/// <summary>
/// 璇诲彇瀹炰綋
/// </summary>
@@ -264,7 +479,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -297,6 +512,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
ucUpFileList1.pGuid = lbGuid.Text.Trim();
if (guid5.Length > 10)
{
@@ -306,6 +522,7 @@
rowHandle = 0;
gvMx1.FocusedRowHandle = rowHandle + 1;
}
+ // MessageBox.Show(rowHandle.ToString() + "**" + guid5);
}
else
{
@@ -313,11 +530,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -333,6 +550,7 @@
ucUpFileList1.getFileList();
}
}
+
/// <summary>
/// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋�
/// </summary>
@@ -371,35 +589,63 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 绂佺敤妫�楠屾+閲嶆柊鍔犺浇鎸夐挳
+ /// </summary>
+ /// <param name="bl"></param>
private void setEable(bool bl)
{
txtJianYan.ReadOnly = !bl;
+ btnLoad.Enabled = bl;
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
}
-
/// <summary>
- /// 鍘绘楠�
+ /// 妫�楠屽拰鍙嶆楠�
/// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void rptButtonUrl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(string _meth)
{
- if (e.Button.Index == 0)
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
+ if (string.IsNullOrEmpty(rowGuid))
{
- var userGuid =
- string.IsNullOrEmpty(LoginInfoModel.CurrentUser.LoginUserGuid)
- ? Guid.NewGuid().ToString()
- : LoginInfoModel.CurrentUser.LoginUserGuid;
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + _meth,
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- var rowhandle = gridView1.FocusedRowHandle;
- var dr = gridView1.GetDataRow(rowhandle);
- var qcGuid = dr["guid"].ToString()+"&mth="+DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff")+"&userGuid="+ userGuid;
- Frm_ShouJianDetect01H5 frm = new Frm_ShouJianDetect01H5(qcGuid);
- frm.ShowDialog();
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim(), "0");
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
+ UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.Designer.cs
deleted file mode 100644
index d09d6de..0000000
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.Designer.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.IPQC
-{
- partial class Frm_ShouJianDetect01H5
- {
- /// <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.pane1 = new DevExpress.XtraEditors.PanelControl();
- this.txtUrl = new DevExpress.XtraEditors.TextEdit();
- ((System.ComponentModel.ISupportInitialize)(this.pane1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).BeginInit();
- this.SuspendLayout();
- //
- // pane1
- //
- this.pane1.AllowTouchScroll = true;
- this.pane1.AlwaysScrollActiveControlIntoView = false;
- this.pane1.Appearance.BorderColor = System.Drawing.Color.Red;
- this.pane1.Appearance.Options.UseBorderColor = true;
- this.pane1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- this.pane1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pane1.Location = new System.Drawing.Point(0, 24);
- this.pane1.Name = "pane1";
- this.pane1.Size = new System.Drawing.Size(905, 469);
- this.pane1.TabIndex = 1;
- //
- // txtUrl
- //
- this.txtUrl.Dock = System.Windows.Forms.DockStyle.Top;
- this.txtUrl.Location = new System.Drawing.Point(0, 0);
- this.txtUrl.Name = "txtUrl";
- this.txtUrl.Size = new System.Drawing.Size(905, 24);
- this.txtUrl.TabIndex = 0;
- this.txtUrl.Visible = false;
- //
- // Frm_ShouJianDetect01H5
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(905, 493);
- this.Controls.Add(this.pane1);
- this.Controls.Add(this.txtUrl);
- this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Name = "Frm_ShouJianDetect01H5";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "棣栨妫�楠岃褰曟彁浜�";
- this.TopMost = true;
- this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- ((System.ComponentModel.ISupportInitialize)(this.pane1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private DevExpress.XtraEditors.TextEdit txtUrl;
- private DevExpress.XtraEditors.PanelControl pane1;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
deleted file mode 100644
index 9d1ce60..0000000
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-锘縰sing CefSharp.WinForms;
-using DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Configuration;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.IPQC
-{
- public partial class Frm_ShouJianDetect01H5 : DevExpress.XtraEditors.XtraForm
- {
- private string guid = "";
- private string WebApiUrl = "http://192.168.1.145:86/AutoUpdater/h5/shoujian.html";
- private ChromiumWebBrowser chromeBrowser;
- public Frm_ShouJianDetect01H5(string _guid)
- {
- this.guid = _guid;
- this.WebApiUrl = (WebApiUrl + "?guid=" + guid);
- InitializeComponent();
- this.Load += ShowFile_Load;
- this.FormClosed += ShowFile_FormClosed;
- }
-
- private void ShowFile_FormClosed(object sender, FormClosedEventArgs e)
- {
- chromeBrowser.Dispose();
- }
-
- private void ShowFile_Load(object sender, EventArgs e)
- {
- chromeBrowser = new ChromiumWebBrowser(WebApiUrl);
- this.pane1.Controls.Add(chromeBrowser);
- chromeBrowser.Dock = DockStyle.Fill;
- txtUrl.Text = WebApiUrl;
- txtUrl.ReadOnly = true;
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.resx b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJianDetect01H5.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</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 887488c..5a76361 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -379,10 +379,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1796, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1437, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -390,11 +390,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1796, 880);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1437, 720);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -403,9 +402,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1794, 842);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1435, 688);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -414,7 +412,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -427,19 +424,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1794, 842);
+ this.split1.Size = new System.Drawing.Size(1435, 688);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1794, 781);
+ this.gcMain1.Size = new System.Drawing.Size(1435, 638);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -480,9 +475,8 @@
this.gridColumn30,
this.gridColumn5,
this.gridColumn6});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -492,348 +486,349 @@
//
this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
this.gridColumn13.FieldName = "urgentFlagTxt";
- this.gridColumn13.MinWidth = 37;
+ this.gridColumn13.MinWidth = 30;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Tag = "query_a.fsubmit";
this.gridColumn13.UnboundDataType = typeof(bool);
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 62;
+ this.gridColumn13.Width = 50;
//
// gv_fsubmit
//
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmitTxt";
- this.gv_fsubmit.MinWidth = 37;
+ this.gv_fsubmit.MinWidth = 30;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 1;
- this.gv_fsubmit.Width = 62;
+ this.gv_fsubmit.Width = 50;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "閫佹鎵规";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 37;
+ this.gv_lotNo.MinWidth = 30;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
this.gv_lotNo.VisibleIndex = 3;
- this.gv_lotNo.Width = 150;
+ this.gv_lotNo.Width = 120;
//
// gv_lifnr
//
this.gv_lifnr.AppearanceCell.Options.UseFont = true;
this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 37;
+ this.gv_lifnr.MinWidth = 30;
this.gv_lifnr.Name = "gv_lifnr";
this.gv_lifnr.OptionsColumn.AllowEdit = false;
this.gv_lifnr.Tag = "query_a.lifnr";
this.gv_lifnr.Visible = true;
this.gv_lifnr.VisibleIndex = 7;
- this.gv_lifnr.Width = 250;
+ this.gv_lifnr.Width = 200;
//
// gv_releaseNo
//
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 37;
+ this.gv_releaseNo.MinWidth = 30;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.VisibleIndex = 2;
- this.gv_releaseNo.Width = 125;
+ this.gv_releaseNo.Width = 100;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 37;
+ this.gv_itemId.MinWidth = 30;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Width = 37;
+ this.gv_itemId.Width = 30;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 37;
+ this.gv_itemNo.MinWidth = 30;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 8;
- this.gv_itemNo.Width = 170;
+ this.gv_itemNo.Width = 136;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 37;
+ this.gv_boardStyle.MinWidth = 30;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.VisibleIndex = 9;
- this.gv_boardStyle.Width = 205;
+ this.gv_boardStyle.Width = 164;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 37;
+ this.gridColumn14.MinWidth = 30;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 10;
- this.gridColumn14.Width = 250;
+ this.gridColumn14.Width = 200;
//
// gv_fbatchQty
//
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
this.gv_fbatchQty.Caption = "鏀惰揣鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 37;
+ this.gv_fbatchQty.MinWidth = 30;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
this.gv_fbatchQty.VisibleIndex = 11;
- this.gv_fbatchQty.Width = 100;
+ this.gv_fbatchQty.Width = 80;
//
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 37;
+ this.gv_fcheckResu.MinWidth = 30;
this.gv_fcheckResu.Name = "gv_fcheckResu";
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.VisibleIndex = 5;
- this.gv_fcheckResu.Width = 62;
+ this.gv_fcheckResu.Width = 50;
//
// gv_fcovertQty
//
this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
this.gv_fcovertQty.FieldName = "fcovertQty";
- this.gv_fcovertQty.MinWidth = 37;
+ this.gv_fcovertQty.MinWidth = 30;
this.gv_fcovertQty.Name = "gv_fcovertQty";
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
+ this.gv_fcovertQty.Width = 60;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞璇存槑";
this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 37;
+ this.gv_remarks.MinWidth = 30;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
this.gv_remarks.VisibleIndex = 12;
- this.gv_remarks.Width = 125;
+ this.gv_remarks.Width = 100;
//
// gv_fcheckBy
//
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
this.gv_fcheckBy.FieldName = "fcheckByName";
- this.gv_fcheckBy.MinWidth = 37;
+ this.gv_fcheckBy.MinWidth = 30;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
this.gv_fcheckBy.VisibleIndex = 13;
- this.gv_fcheckBy.Width = 147;
+ this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
//
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 37;
+ this.gv_fcheckDate.MinWidth = 30;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
this.gv_fcheckDate.VisibleIndex = 15;
- this.gv_fcheckDate.Width = 227;
+ this.gv_fcheckDate.Width = 182;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createByName";
- this.gv_createBy.MinWidth = 37;
+ this.gv_createBy.MinWidth = 30;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 14;
- this.gv_createBy.Width = 84;
+ this.gv_createBy.Width = 67;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 16;
- this.gridColumn15.Width = 117;
+ this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
this.gv_lastupdateBy.FieldName = "lastupdateByName";
- this.gv_lastupdateBy.MinWidth = 37;
+ this.gv_lastupdateBy.MinWidth = 30;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
this.gv_lastupdateBy.VisibleIndex = 17;
+ this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 37;
+ this.gv_lastupdateDate.MinWidth = 30;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
this.gv_lastupdateDate.VisibleIndex = 18;
- this.gv_lastupdateDate.Width = 150;
+ this.gv_lastupdateDate.Width = 120;
//
// gv_fngHandle
//
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
this.gv_fngHandle.Caption = "澶勭悊鎰忚";
this.gv_fngHandle.FieldName = "fngHandle";
- this.gv_fngHandle.MinWidth = 37;
+ this.gv_fngHandle.MinWidth = 30;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
this.gv_fngHandle.VisibleIndex = 6;
- this.gv_fngHandle.Width = 125;
+ this.gv_fngHandle.Width = 100;
//
// bandedGridColumn1
//
this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
this.bandedGridColumn1.FieldName = "receivingOrg";
- this.bandedGridColumn1.MinWidth = 62;
+ this.bandedGridColumn1.MinWidth = 50;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
this.bandedGridColumn1.VisibleIndex = 19;
- this.bandedGridColumn1.Width = 312;
+ this.bandedGridColumn1.Width = 250;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
this.gridColumn18.FieldName = "fsubmitByName";
- this.gridColumn18.MinWidth = 31;
+ this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 20;
- this.gridColumn18.Width = 117;
+ this.gridColumn18.Width = 94;
//
// gridColumn19
//
this.gridColumn19.Caption = "瀹℃牳鏃ユ湡";
this.gridColumn19.FieldName = "fsubmitDate";
- this.gridColumn19.MinWidth = 31;
+ this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 21;
- this.gridColumn19.Width = 117;
+ this.gridColumn19.Width = 94;
//
// gridColumn17
//
this.gridColumn17.Caption = "涓婚敭Guid";
this.gridColumn17.FieldName = "guid";
- this.gridColumn17.MinWidth = 31;
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 117;
+ this.gridColumn17.Width = 94;
//
// gridColumn23
//
this.gridColumn23.Caption = "閲囪喘鍗曞彿";
this.gridColumn23.FieldName = "cgdNo";
- this.gridColumn23.MinWidth = 31;
+ this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 22;
- this.gridColumn23.Width = 117;
+ this.gridColumn23.Width = 94;
//
// gridColumn30
//
this.gridColumn30.Caption = "绫诲瀷";
this.gridColumn30.FieldName = "orderType";
- this.gridColumn30.MinWidth = 31;
+ this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Width = 117;
+ this.gridColumn30.Width = 94;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠岀姸鎬�";
this.gridColumn5.FieldName = "txtColor";
- this.gridColumn5.MinWidth = 31;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 117;
+ this.gridColumn5.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
this.gridColumn6.FieldName = "freceQty";
- this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Width = 117;
+ this.gridColumn6.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 781);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 638);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1794, 46);
+ this.pageBar1.Size = new System.Drawing.Size(1435, 38);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1794, 842);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1435, 688);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -841,7 +836,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -854,8 +848,8 @@
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1794, 842);
- this.splitMx1.SplitterPosition = 330;
+ this.splitMx1.Size = new System.Drawing.Size(1435, 688);
+ this.splitMx1.SplitterPosition = 270;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -895,21 +889,20 @@
this.layoutControlItem21,
this.layoutControlItem23});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(381, 412, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1794, 330);
+ this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_xblb
//
this.txt_xblb.BtnTxt = "閫夊埆绫诲埆";
- this.txt_xblb.Location = new System.Drawing.Point(1341, 244);
- this.txt_xblb.Margin = new System.Windows.Forms.Padding(5);
+ this.txt_xblb.Location = new System.Drawing.Point(1073, 198);
+ this.txt_xblb.Margin = new System.Windows.Forms.Padding(4);
this.txt_xblb.Name = "txt_xblb";
- this.txt_xblb.Size = new System.Drawing.Size(441, 74);
+ this.txt_xblb.Size = new System.Drawing.Size(350, 60);
this.txt_xblb.TabIndex = 820;
this.txt_xblb.TextTxt = "";
this.txt_xblb.WhereTxt = " a.s_type=\'OA閫夊埆绫诲埆\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -925,54 +918,50 @@
this.layWeight.Controls.Add(this.txtWCurrent);
this.layWeight.Controls.Add(this.txt_weight5);
this.layWeight.Controls.Add(this.btnClean);
- this.layWeight.Location = new System.Drawing.Point(10, 281);
+ this.layWeight.Location = new System.Drawing.Point(10, 227);
this.layWeight.Margin = new System.Windows.Forms.Padding(0);
this.layWeight.Name = "layWeight";
this.layWeight.Root = this.layoutControlGroup2;
- this.layWeight.Size = new System.Drawing.Size(1329, 39);
+ this.layWeight.Size = new System.Drawing.Size(1061, 33);
this.layWeight.TabIndex = 818;
this.layWeight.Text = "layoutControl1";
//
// txt_weight1
//
- this.txt_weight1.Location = new System.Drawing.Point(60, 2);
- this.txt_weight1.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_weight1.Location = new System.Drawing.Point(52, 2);
this.txt_weight1.Name = "txt_weight1";
this.txt_weight1.Properties.ReadOnly = true;
- this.txt_weight1.Size = new System.Drawing.Size(104, 28);
+ 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
//
- this.txt_weight2.Location = new System.Drawing.Point(226, 2);
- this.txt_weight2.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_weight2.Location = new System.Drawing.Point(182, 2);
this.txt_weight2.Name = "txt_weight2";
this.txt_weight2.Properties.ReadOnly = true;
- this.txt_weight2.Size = new System.Drawing.Size(104, 28);
+ 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
//
- this.txt_weight3.Location = new System.Drawing.Point(392, 2);
- this.txt_weight3.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_weight3.Location = new System.Drawing.Point(315, 2);
this.txt_weight3.Name = "txt_weight3";
this.txt_weight3.Properties.ReadOnly = true;
- this.txt_weight3.Size = new System.Drawing.Size(104, 28);
+ 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
//
- this.txt_weight4.Location = new System.Drawing.Point(558, 2);
- this.txt_weight4.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_weight4.Location = new System.Drawing.Point(448, 2);
this.txt_weight4.Name = "txt_weight4";
this.txt_weight4.Properties.ReadOnly = true;
- this.txt_weight4.Size = new System.Drawing.Size(104, 28);
+ 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";
@@ -983,35 +972,32 @@
this.btnW.Appearance.ForeColor = System.Drawing.Color.White;
this.btnW.Appearance.Options.UseBackColor = true;
this.btnW.Appearance.Options.UseForeColor = true;
- this.btnW.Location = new System.Drawing.Point(998, 2);
- this.btnW.Margin = new System.Windows.Forms.Padding(4);
+ this.btnW.Location = new System.Drawing.Point(797, 2);
this.btnW.Name = "btnW";
- this.btnW.Size = new System.Drawing.Size(162, 32);
+ this.btnW.Size = new System.Drawing.Size(129, 27);
this.btnW.StyleController = this.layWeight;
this.btnW.TabIndex = 9;
this.btnW.Text = "鑾峰彇";
//
// txtWCurrent
//
- this.txtWCurrent.Location = new System.Drawing.Point(832, 2);
- this.txtWCurrent.Margin = new System.Windows.Forms.Padding(4);
+ this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
this.txtWCurrent.Name = "txtWCurrent";
this.txtWCurrent.Properties.Appearance.BackColor = System.Drawing.Color.DeepSkyBlue;
this.txtWCurrent.Properties.Appearance.ForeColor = System.Drawing.Color.Black;
this.txtWCurrent.Properties.Appearance.Options.UseBackColor = true;
this.txtWCurrent.Properties.Appearance.Options.UseForeColor = true;
this.txtWCurrent.Properties.ReadOnly = true;
- this.txtWCurrent.Size = new System.Drawing.Size(162, 28);
+ this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
this.txtWCurrent.StyleController = this.layWeight;
this.txtWCurrent.TabIndex = 10;
//
// txt_weight5
//
- this.txt_weight5.Location = new System.Drawing.Point(724, 2);
- this.txt_weight5.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_weight5.Location = new System.Drawing.Point(581, 2);
this.txt_weight5.Name = "txt_weight5";
this.txt_weight5.Properties.ReadOnly = true;
- this.txt_weight5.Size = new System.Drawing.Size(104, 28);
+ 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";
@@ -1020,10 +1006,9 @@
//
this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnClean.Appearance.Options.UseBackColor = true;
- this.btnClean.Location = new System.Drawing.Point(1164, 2);
- this.btnClean.Margin = new System.Windows.Forms.Padding(4);
+ this.btnClean.Location = new System.Drawing.Point(930, 2);
this.btnClean.Name = "btnClean";
- this.btnClean.Size = new System.Drawing.Size(163, 32);
+ this.btnClean.Size = new System.Drawing.Size(129, 27);
this.btnClean.StyleController = this.layWeight;
this.btnClean.TabIndex = 12;
this.btnClean.Text = "娓呯┖";
@@ -1073,7 +1058,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(1329, 39);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1061, 33);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem31
@@ -1081,47 +1066,47 @@
this.layoutControlItem31.Control = this.txt_weight1;
this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.Size = new System.Drawing.Size(166, 39);
+ this.layoutControlItem31.Size = new System.Drawing.Size(130, 33);
this.layoutControlItem31.Text = "閲嶉噺1";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(46, 22);
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_weight2;
- this.layoutControlItem32.Location = new System.Drawing.Point(166, 0);
+ this.layoutControlItem32.Location = new System.Drawing.Point(130, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(166, 39);
+ this.layoutControlItem32.Size = new System.Drawing.Size(133, 33);
this.layoutControlItem32.Text = "閲嶉噺2";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(46, 22);
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_weight3;
- this.layoutControlItem33.Location = new System.Drawing.Point(332, 0);
+ this.layoutControlItem33.Location = new System.Drawing.Point(263, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem33.Size = new System.Drawing.Size(166, 39);
+ this.layoutControlItem33.Size = new System.Drawing.Size(133, 33);
this.layoutControlItem33.Text = "閲嶉噺3";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(46, 22);
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_weight4;
- this.layoutControlItem34.Location = new System.Drawing.Point(498, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem34.Size = new System.Drawing.Size(166, 39);
+ this.layoutControlItem34.Size = new System.Drawing.Size(133, 33);
this.layoutControlItem34.Text = "閲嶉噺4";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(46, 22);
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem36
//
this.layoutControlItem36.Control = this.btnW;
- this.layoutControlItem36.Location = new System.Drawing.Point(996, 0);
+ this.layoutControlItem36.Location = new System.Drawing.Point(795, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
- this.layoutControlItem36.Size = new System.Drawing.Size(166, 39);
+ this.layoutControlItem36.Size = new System.Drawing.Size(133, 33);
this.layoutControlItem36.Text = "鑾峰彇";
this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem36.TextVisible = false;
@@ -1129,10 +1114,10 @@
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txtWCurrent;
- this.layoutControlItem37.Location = new System.Drawing.Point(830, 0);
+ this.layoutControlItem37.Location = new System.Drawing.Point(662, 0);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem37.Size = new System.Drawing.Size(166, 39);
+ this.layoutControlItem37.Size = new System.Drawing.Size(133, 33);
this.layoutControlItem37.Text = "瀹炴椂閲嶉噺";
this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem37.TextVisible = false;
@@ -1140,20 +1125,20 @@
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_weight5;
- this.layoutControlItem35.Location = new System.Drawing.Point(664, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem35.Size = new System.Drawing.Size(166, 39);
+ this.layoutControlItem35.Size = new System.Drawing.Size(133, 33);
this.layoutControlItem35.Text = "绉伴噸5";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(46, 22);
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.btnClean;
- this.layoutControlItem38.Location = new System.Drawing.Point(1162, 0);
+ this.layoutControlItem38.Location = new System.Drawing.Point(928, 0);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
- this.layoutControlItem38.Size = new System.Drawing.Size(167, 39);
+ this.layoutControlItem38.Size = new System.Drawing.Size(133, 33);
this.layoutControlItem38.Text = "娓呯┖";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -1161,10 +1146,10 @@
// txt_fngDesc
//
this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
- this.txt_fngDesc.Location = new System.Drawing.Point(12, 205);
- this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(5);
+ this.txt_fngDesc.Location = new System.Drawing.Point(12, 167);
+ this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(4);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(882, 74);
+ this.txt_fngDesc.Size = new System.Drawing.Size(703, 58);
this.txt_fngDesc.TabIndex = 815;
this.txt_fngDesc.TextTxt = "";
this.txt_fngDesc.WhereTxt = " a.s_type=\'QC寮傚父鎻忚堪\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -1172,10 +1157,9 @@
// btnYcReport
//
this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
- this.btnYcReport.Location = new System.Drawing.Point(898, 244);
- this.btnYcReport.Margin = new System.Windows.Forms.Padding(4);
+ this.btnYcReport.Location = new System.Drawing.Point(719, 198);
this.btnYcReport.Name = "btnYcReport";
- this.btnYcReport.Size = new System.Drawing.Size(146, 34);
+ this.btnYcReport.Size = new System.Drawing.Size(116, 27);
this.btnYcReport.StyleController = this.layoutMx1;
this.btnYcReport.TabIndex = 814;
this.btnYcReport.Tag = "gvBtnAlawys";
@@ -1183,257 +1167,233 @@
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1234, 132);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(987, 108);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(402, 34);
+ this.lbGuid.Size = new System.Drawing.Size(322, 28);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(539, 127);
- this.txt_suppName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_suppName.Location = new System.Drawing.Point(437, 105);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(355, 28);
+ this.txt_suppName.Size = new System.Drawing.Size(278, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 801;
this.txt_suppName.Tag = "readonly";
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(982, 205);
- this.txt_remarks.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_remarks.Location = new System.Drawing.Point(791, 167);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(800, 28);
+ this.txt_remarks.Size = new System.Drawing.Size(632, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
this.txt_remarks.Tag = "readonly";
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(982, 127);
- this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(791, 105);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(355, 28);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(96, 50);
- this.txt_itemName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 43);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(355, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(277, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 800;
this.txt_itemName.Tag = "readonly";
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(96, 12);
- this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(355, 28);
+ this.txt_releaseNo.Size = new System.Drawing.Size(277, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(982, 12);
- this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(791, 12);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(355, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(539, 12);
- this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_lotNo.Location = new System.Drawing.Point(437, 12);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(355, 28);
+ this.txt_lotNo.Size = new System.Drawing.Size(278, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(96, 88);
- this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 74);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(355, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(277, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(96, 127);
- this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 105);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(355, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(105, 171);
- this.txt_itemId.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemId.Location = new System.Drawing.Point(84, 140);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(311, 28);
+ this.txt_itemId.Size = new System.Drawing.Size(249, 24);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 802;
this.txt_itemId.Tag = "readonly";
//
// txt_fcheckByName
//
- this.txt_fcheckByName.Location = new System.Drawing.Point(982, 50);
- this.txt_fcheckByName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fcheckByName.Location = new System.Drawing.Point(791, 43);
this.txt_fcheckByName.Name = "txt_fcheckByName";
this.txt_fcheckByName.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckByName.Size = new System.Drawing.Size(355, 28);
+ this.txt_fcheckByName.Size = new System.Drawing.Size(278, 24);
this.txt_fcheckByName.StyleController = this.layoutMx1;
this.txt_fcheckByName.TabIndex = 217;
this.txt_fcheckByName.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(539, 88);
- this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(437, 74);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(355, 28);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(278, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1425, 50);
- this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 43);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(357, 28);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 804;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1425, 88);
- this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 74);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(357, 28);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 805;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1341, 12);
- this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1073, 12);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(441, 27);
+ this.txt_fsubmit.Size = new System.Drawing.Size(350, 24);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(982, 166);
- this.txt_slOrg.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_slOrg.Location = new System.Drawing.Point(791, 136);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(355, 28);
+ this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 807;
this.txt_slOrg.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1331, 132);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_guid.Location = new System.Drawing.Point(1065, 108);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(305, 28);
+ this.txt_guid.Size = new System.Drawing.Size(244, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 808;
this.txt_guid.Tag = "readonly";
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(982, 88);
- this.txt_checkStates.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkStates.Location = new System.Drawing.Point(791, 74);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(355, 28);
+ this.txt_checkStates.Size = new System.Drawing.Size(278, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(1342, 125);
- this.txt_freceQty.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 102);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
- this.txt_freceQty.Size = new System.Drawing.Size(320, 28);
+ this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 810;
this.txt_freceQty.Tag = "readonly";
//
// txt_cgdNo
//
- this.txt_cgdNo.Location = new System.Drawing.Point(539, 50);
- this.txt_cgdNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_cgdNo.Location = new System.Drawing.Point(437, 43);
this.txt_cgdNo.Name = "txt_cgdNo";
- this.txt_cgdNo.Size = new System.Drawing.Size(355, 28);
+ this.txt_cgdNo.Size = new System.Drawing.Size(278, 24);
this.txt_cgdNo.StyleController = this.layoutMx1;
this.txt_cgdNo.TabIndex = 811;
this.txt_cgdNo.Tag = "readonly";
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(1425, 127);
- this.txt_fngHandle.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fngHandle.Location = new System.Drawing.Point(1145, 105);
this.txt_fngHandle.Name = "txt_fngHandle";
this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fngHandle.Size = new System.Drawing.Size(357, 28);
+ this.txt_fngHandle.Size = new System.Drawing.Size(278, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 812;
this.txt_fngHandle.Tag = "readonly";
//
// txt_xbsl
//
- this.txt_xbsl.Location = new System.Drawing.Point(1425, 166);
- this.txt_xbsl.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_xbsl.Location = new System.Drawing.Point(1145, 136);
this.txt_xbsl.Name = "txt_xbsl";
- this.txt_xbsl.Size = new System.Drawing.Size(357, 28);
+ this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
this.txt_xbsl.StyleController = this.layoutMx1;
this.txt_xbsl.TabIndex = 817;
this.txt_xbsl.Tag = "readonly";
//
// txt_iqcRemark
//
- this.txt_iqcRemark.Location = new System.Drawing.Point(96, 166);
- this.txt_iqcRemark.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_iqcRemark.Location = new System.Drawing.Point(84, 136);
this.txt_iqcRemark.Name = "txt_iqcRemark";
- this.txt_iqcRemark.Size = new System.Drawing.Size(355, 28);
+ this.txt_iqcRemark.Size = new System.Drawing.Size(277, 24);
this.txt_iqcRemark.StyleController = this.layoutMx1;
this.txt_iqcRemark.TabIndex = 819;
//
@@ -1457,7 +1417,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem7.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem7.Text = "鐗╂枡ID";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 22);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem21
//
@@ -1468,7 +1428,7 @@
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem21.Text = "涓婚敭GUID";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(62, 24);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
//
// layoutControlItem23
//
@@ -1479,7 +1439,7 @@
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem23.Size = new System.Drawing.Size(332, 30);
this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 22);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// Root
//
@@ -1550,7 +1510,7 @@
rowDefinition7,
rowDefinition8,
rowDefinition9});
- this.Root.Size = new System.Drawing.Size(1794, 330);
+ this.Root.Size = new System.Drawing.Size(1435, 270);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1558,69 +1518,69 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(443, 38);
+ this.layoutControlItem1.Size = new System.Drawing.Size(353, 31);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemName;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(443, 38);
+ this.layoutControlItem4.Size = new System.Drawing.Size(353, 31);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 76);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem5.Size = new System.Drawing.Size(353, 31);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 115);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem6.Size = new System.Drawing.Size(353, 31);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(1329, 38);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1061, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(445, 38);
+ this.layoutControlItem15.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitBy;
- this.layoutControlItem16.Location = new System.Drawing.Point(1329, 76);
+ this.layoutControlItem16.Location = new System.Drawing.Point(1061, 62);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(445, 39);
+ this.layoutControlItem16.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(1329, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(1061, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(445, 38);
+ this.layoutControlItem14.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1628,109 +1588,109 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(886, 115);
+ this.layoutControlItem10.Location = new System.Drawing.Point(707, 93);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem10.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(443, 115);
+ this.layoutControlItem13.Location = new System.Drawing.Point(353, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem13.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem13.Text = "渚涘簲鍟�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(886, 76);
+ this.layoutControlItem22.Location = new System.Drawing.Point(707, 62);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem22.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(443, 76);
+ this.layoutControlItem9.Location = new System.Drawing.Point(353, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem9.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckByName;
- this.layoutControlItem8.Location = new System.Drawing.Point(886, 38);
+ this.layoutControlItem8.Location = new System.Drawing.Point(707, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(443, 38);
+ this.layoutControlItem8.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(886, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(707, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(443, 38);
+ this.layoutControlItem2.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(443, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(353, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(443, 38);
+ this.layoutControlItem3.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_cgdNo;
- this.layoutControlItem24.Location = new System.Drawing.Point(443, 38);
+ this.layoutControlItem24.Location = new System.Drawing.Point(353, 31);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(443, 38);
+ this.layoutControlItem24.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(886, 154);
+ this.layoutControlItem18.Location = new System.Drawing.Point(707, 124);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem18.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_fngDesc;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 193);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 155);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(886, 78);
+ this.layoutControlItem28.Size = new System.Drawing.Size(707, 62);
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1738,34 +1698,34 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_fngHandle;
- this.layoutControlItem25.Location = new System.Drawing.Point(1329, 115);
+ this.layoutControlItem25.Location = new System.Drawing.Point(1061, 93);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(445, 39);
+ this.layoutControlItem25.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem25.Text = "澶勭悊鎰忚";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_xbsl;
- this.layoutControlItem29.Location = new System.Drawing.Point(1329, 154);
+ this.layoutControlItem29.Location = new System.Drawing.Point(1061, 124);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem29.Size = new System.Drawing.Size(445, 39);
+ this.layoutControlItem29.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.layWeight;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 271);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 217);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 3;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem30.Size = new System.Drawing.Size(1329, 39);
+ this.layoutControlItem30.Size = new System.Drawing.Size(1061, 33);
this.layoutControlItem30.Text = "绉伴噸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem30.TextVisible = false;
@@ -1773,35 +1733,35 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(886, 193);
+ this.layoutControlItem12.Location = new System.Drawing.Point(707, 155);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(888, 39);
+ this.layoutControlItem12.Size = new System.Drawing.Size(708, 31);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_iqcRemark;
- this.layoutControlItem39.Location = new System.Drawing.Point(0, 154);
+ this.layoutControlItem39.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem39.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem39.Size = new System.Drawing.Size(353, 31);
this.layoutControlItem39.Text = "妫�楠屽娉�";
- this.layoutControlItem39.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.btnYcReport;
- this.layoutControlItem27.Location = new System.Drawing.Point(886, 232);
- this.layoutControlItem27.MaxSize = new System.Drawing.Size(150, 38);
- this.layoutControlItem27.MinSize = new System.Drawing.Size(150, 38);
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 186);
+ this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem27.Size = new System.Drawing.Size(443, 39);
+ this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
@@ -1810,12 +1770,12 @@
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_xblb;
- this.layoutControlItem26.Location = new System.Drawing.Point(1329, 232);
+ this.layoutControlItem26.Location = new System.Drawing.Point(1061, 186);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
this.layoutControlItem26.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem26.Size = new System.Drawing.Size(445, 78);
+ this.layoutControlItem26.Size = new System.Drawing.Size(354, 64);
this.layoutControlItem26.Text = "閫夊埆绫诲埆";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -1824,10 +1784,9 @@
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1794, 497);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1435, 406);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1837,17 +1796,15 @@
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1792, 459);
+ this.tabMxPage1.Size = new System.Drawing.Size(1433, 374);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
//
this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx2.Horizontal = false;
- this.splitMx2.Location = new System.Drawing.Point(0, 57);
- this.splitMx2.Margin = new System.Windows.Forms.Padding(4);
+ this.splitMx2.Location = new System.Drawing.Point(0, 47);
this.splitMx2.Name = "splitMx2";
//
// splitMx2.Panel1
@@ -1859,19 +1816,17 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1792, 402);
- this.splitMx2.SplitterPosition = 387;
+ this.splitMx2.Size = new System.Drawing.Size(1433, 327);
+ this.splitMx2.SplitterPosition = 317;
this.splitMx2.TabIndex = 3;
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1792, 387);
+ this.gcMx1.Size = new System.Drawing.Size(1433, 315);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1880,7 +1835,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 61;
+ this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1fcheckItem,
@@ -1900,7 +1855,6 @@
this.gvMx1fcheckLevel,
this.gvMx1facLevel,
this.gridColumn7});
- this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1912,127 +1866,129 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 62;
+ this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 117;
+ this.gvMx1guid.Width = 94;
//
// gvMx1fcheckItem
//
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 62;
+ this.gvMx1fcheckItem.MinWidth = 50;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 0;
- this.gvMx1fcheckItem.Width = 150;
+ this.gvMx1fcheckItem.Width = 120;
//
// gvMx1fcheckTool
//
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 62;
+ this.gvMx1fcheckTool.MinWidth = 50;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 1;
- this.gvMx1fcheckTool.Width = 125;
+ this.gvMx1fcheckTool.Width = 100;
//
// gvMx1fcheckItemDesc
//
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 62;
+ this.gvMx1fcheckItemDesc.MinWidth = 50;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
this.gvMx1fcheckItemDesc.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Width = 150;
+ this.gvMx1fcheckItemDesc.Width = 120;
//
// gvMx1fspecRequ
//
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 62;
+ this.gvMx1fspecRequ.MinWidth = 50;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
this.gvMx1fspecRequ.VisibleIndex = 2;
- this.gvMx1fspecRequ.Width = 150;
+ this.gvMx1fspecRequ.Width = 120;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 62;
+ this.gvMx1fupAllow.MinWidth = 50;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 3;
- this.gvMx1fupAllow.Width = 62;
+ this.gvMx1fupAllow.Width = 50;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 62;
+ this.gvMx1fstand.MinWidth = 50;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 4;
- this.gvMx1fstand.Width = 87;
+ this.gvMx1fstand.Width = 70;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 62;
+ this.gvMx1fdownAllow.MinWidth = 50;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 5;
- this.gvMx1fdownAllow.Width = 62;
+ this.gvMx1fdownAllow.Width = 50;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
- this.gvMx1freQty.MinWidth = 62;
+ this.gvMx1freQty.MinWidth = 50;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
this.gvMx1freQty.VisibleIndex = 6;
- this.gvMx1freQty.Width = 62;
+ this.gvMx1freQty.Width = 50;
//
// gvMx1checkQyt
//
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 62;
+ this.gvMx1checkQyt.MinWidth = 50;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
this.gvMx1checkQyt.VisibleIndex = 7;
+ this.gvMx1checkQyt.Width = 60;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 75;
+ this.gvMx1fenterQty.MinWidth = 60;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
this.gvMx1fenterQty.VisibleIndex = 8;
+ this.gvMx1fenterQty.Width = 60;
//
// gvMx1fcheckResu
//
@@ -2043,86 +1999,85 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 62;
+ this.gvMx1fcheckResu.MinWidth = 50;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
this.gvMx1fcheckResu.VisibleIndex = 9;
- this.gvMx1fcheckResu.Width = 117;
+ this.gvMx1fcheckResu.Width = 94;
//
// gvMx1fngRate
//
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 62;
+ this.gvMx1fngRate.MinWidth = 50;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
this.gvMx1fngRate.VisibleIndex = 10;
- this.gvMx1fngRate.Width = 117;
+ this.gvMx1fngRate.Width = 94;
//
// gvMx1fngQty
//
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 62;
+ this.gvMx1fngQty.MinWidth = 50;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 11;
- this.gvMx1fngQty.Width = 62;
+ this.gvMx1fngQty.Width = 50;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣蹇楃紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 62;
+ this.gvMx1sampleSizeNo.MinWidth = 50;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 12;
- this.gvMx1sampleSizeNo.Width = 250;
+ this.gvMx1sampleSizeNo.Width = 200;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 62;
+ this.gvMx1fcheckLevel.MinWidth = 50;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 13;
- this.gvMx1fcheckLevel.Width = 250;
+ this.gvMx1fcheckLevel.Width = 200;
//
// gvMx1facLevel
//
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 62;
+ this.gvMx1facLevel.MinWidth = 50;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 14;
- this.gvMx1facLevel.Width = 250;
+ this.gvMx1facLevel.Width = 200;
//
// gridColumn7
//
this.gridColumn7.Caption = "鏍锋湰鏁�";
this.gridColumn7.FieldName = "ybsl";
- this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 117;
+ this.gridColumn7.Width = 94;
//
// splitYangLi
//
this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitYangLi.Location = new System.Drawing.Point(0, 0);
- this.splitYangLi.Margin = new System.Windows.Forms.Padding(4);
this.splitYangLi.Name = "splitYangLi";
//
// splitYangLi.Panel1
@@ -2135,7 +2090,7 @@
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
this.splitYangLi.Size = new System.Drawing.Size(0, 0);
- this.splitYangLi.SplitterPosition = 845;
+ this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
// groupControl1
@@ -2143,7 +2098,6 @@
this.groupControl1.Controls.Add(this.gcMx2);
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
- this.groupControl1.Margin = new System.Windows.Forms.Padding(4);
this.groupControl1.Name = "groupControl1";
this.groupControl1.Size = new System.Drawing.Size(0, 0);
this.groupControl1.TabIndex = 3;
@@ -2152,10 +2106,8 @@
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
- this.gcMx2.Location = new System.Drawing.Point(0, 33);
+ this.gcMx2.Location = new System.Drawing.Point(0, 27);
this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(4);
this.gcMx2.Name = "gcMx2";
this.gcMx2.Size = new System.Drawing.Size(0, 0);
this.gcMx2.TabIndex = 0;
@@ -2172,7 +2124,6 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn25});
- this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
@@ -2180,72 +2131,71 @@
//
this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Width = 117;
+ this.gridColumn4.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
- this.gridColumn3.MaxWidth = 240;
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MaxWidth = 192;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 240;
+ this.gridColumn3.Width = 192;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
- this.gridColumn2.MaxWidth = 100;
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MaxWidth = 80;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Width = 100;
+ this.gridColumn2.Width = 80;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn20.FieldName = "fstand";
- this.gridColumn20.MinWidth = 31;
+ this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 117;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "鎿嶄綔浜�";
this.gridColumn21.FieldName = "createByName";
- this.gridColumn21.MinWidth = 31;
+ this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 117;
+ this.gridColumn21.Width = 94;
//
// gridColumn25
//
this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn25.FieldName = "createDate";
- this.gridColumn25.MinWidth = 31;
+ this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
- this.gridColumn25.Width = 117;
+ this.gridColumn25.Width = 94;
//
// groupControl2
//
this.groupControl2.Controls.Add(this.gcMx3);
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
- this.groupControl2.Margin = new System.Windows.Forms.Padding(4);
this.groupControl2.Name = "groupControl2";
this.groupControl2.Size = new System.Drawing.Size(0, 0);
this.groupControl2.TabIndex = 4;
@@ -2254,10 +2204,8 @@
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
- this.gcMx3.Location = new System.Drawing.Point(0, 33);
+ this.gcMx3.Location = new System.Drawing.Point(0, 27);
this.gcMx3.MainView = this.gvMx3;
- this.gcMx3.Margin = new System.Windows.Forms.Padding(4);
this.gcMx3.Name = "gcMx3";
this.gcMx3.Size = new System.Drawing.Size(0, 0);
this.gcMx3.TabIndex = 0;
@@ -2275,7 +2223,6 @@
this.gridColumn24,
this.gridColumn26,
this.gridColumn27});
- this.gvMx3.DetailHeight = 428;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
//
@@ -2283,86 +2230,85 @@
//
this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn1.FieldName = "guid";
- this.gridColumn1.MinWidth = 31;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 117;
+ this.gridColumn1.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "椤圭洰";
this.gridColumn22.FieldName = "fcheckItemd5";
- this.gridColumn22.MaxWidth = 240;
- this.gridColumn22.MinWidth = 31;
+ this.gridColumn22.MaxWidth = 192;
+ this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 0;
- this.gridColumn22.Width = 240;
+ this.gridColumn22.Width = 192;
//
// gridColumn28
//
this.gridColumn28.Caption = "鏍锋湰搴�";
this.gridColumn28.FieldName = "fcheckItem";
- this.gridColumn28.MinWidth = 31;
+ this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 1;
- this.gridColumn28.Width = 117;
+ this.gridColumn28.Width = 94;
//
// gridColumn29
//
this.gridColumn29.Caption = "鏍锋湰鍊�";
this.gridColumn29.FieldName = "fcheckResu";
- this.gridColumn29.MinWidth = 31;
+ this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 2;
- this.gridColumn29.Width = 117;
+ this.gridColumn29.Width = 94;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn24.FieldName = "fstand";
- this.gridColumn24.MinWidth = 31;
+ this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
- this.gridColumn24.Width = 117;
+ this.gridColumn24.Width = 94;
//
// gridColumn26
//
this.gridColumn26.Caption = "鎿嶄綔浜�";
this.gridColumn26.FieldName = "createBy";
- this.gridColumn26.MinWidth = 31;
+ this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
- this.gridColumn26.Width = 117;
+ this.gridColumn26.Width = 94;
//
// gridColumn27
//
this.gridColumn27.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn27.FieldName = "createDate";
- this.gridColumn27.MinWidth = 31;
+ this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
- this.gridColumn27.Width = 117;
+ this.gridColumn27.Width = 94;
//
// panMsg
//
this.panMsg.Controls.Add(this.layoutMxMsg);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
- this.panMsg.Margin = new System.Windows.Forms.Padding(4);
this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1792, 57);
+ this.panMsg.Size = new System.Drawing.Size(1433, 47);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
@@ -2372,21 +2318,19 @@
this.layoutMxMsg.Controls.Add(this.txtJianYan);
this.layoutMxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMxMsg.Location = new System.Drawing.Point(2, 2);
- this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(4);
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
- this.layoutMxMsg.Size = new System.Drawing.Size(1788, 53);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1429, 43);
this.layoutMxMsg.TabIndex = 0;
this.layoutMxMsg.Text = "layoutControl1";
//
// btnIpt
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
- this.btnIpt.Location = new System.Drawing.Point(1653, 2);
- this.btnIpt.Margin = new System.Windows.Forms.Padding(4);
+ this.btnIpt.Location = new System.Drawing.Point(1321, 2);
this.btnIpt.Name = "btnIpt";
- this.btnIpt.Size = new System.Drawing.Size(133, 45);
+ this.btnIpt.Size = new System.Drawing.Size(106, 36);
this.btnIpt.StyleController = this.layoutMxMsg;
this.btnIpt.TabIndex = 4;
this.btnIpt.Text = "鏍锋湰绠＄悊";
@@ -2394,22 +2338,20 @@
// btnLoad
//
this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
- this.btnLoad.Location = new System.Drawing.Point(1446, 2);
- this.btnLoad.Margin = new System.Windows.Forms.Padding(4);
+ this.btnLoad.Location = new System.Drawing.Point(1155, 2);
this.btnLoad.Name = "btnLoad";
- this.btnLoad.Size = new System.Drawing.Size(203, 45);
+ this.btnLoad.Size = new System.Drawing.Size(162, 36);
this.btnLoad.StyleController = this.layoutMxMsg;
this.btnLoad.TabIndex = 3;
this.btnLoad.Text = "閲嶆柊鍔犺浇妫�楠岄」鐩�";
//
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(265, 2);
- this.txtJianYan.Margin = new System.Windows.Forms.Padding(4);
+ this.txtJianYan.Location = new System.Drawing.Point(221, 2);
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
- this.txtJianYan.Size = new System.Drawing.Size(833, 42);
+ this.txtJianYan.Size = new System.Drawing.Size(656, 36);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -2430,7 +2372,7 @@
columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition15.Width = 100D;
columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition16.Width = 137D;
+ columnDefinition16.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition13,
columnDefinition14,
@@ -2441,7 +2383,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition10});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1788, 53);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 43);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -2451,20 +2393,20 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(1100, 53);
+ this.layoutControlItem11.Size = new System.Drawing.Size(879, 43);
this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(251, 22);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem20.Control = this.btnIpt;
- this.layoutControlItem20.Location = new System.Drawing.Point(1651, 0);
- this.layoutControlItem20.MaxSize = new System.Drawing.Size(137, 49);
- this.layoutControlItem20.MinSize = new System.Drawing.Size(137, 49);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1319, 0);
+ this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
+ this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(137, 53);
+ this.layoutControlItem20.Size = new System.Drawing.Size(110, 43);
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem20.Text = "鏍锋湰绠＄悊";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
@@ -2474,12 +2416,12 @@
//
this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem19.Control = this.btnLoad;
- this.layoutControlItem19.Location = new System.Drawing.Point(1100, 0);
- this.layoutControlItem19.MaxSize = new System.Drawing.Size(207, 49);
- this.layoutControlItem19.MinSize = new System.Drawing.Size(207, 49);
+ this.layoutControlItem19.Location = new System.Drawing.Point(879, 0);
+ this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
+ this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(551, 53);
+ this.layoutControlItem19.Size = new System.Drawing.Size(440, 43);
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
@@ -2488,20 +2430,19 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1792, 459);
+ this.tabMxPage2.Size = new System.Drawing.Size(1433, 374);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
//
this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
- this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5);
+ this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(4);
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1792, 459);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1433, 374);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
@@ -2517,10 +2458,9 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1151, 51);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+ this.picCheckBox.Location = new System.Drawing.Point(921, 42);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
@@ -2540,13 +2480,12 @@
//
// Frm_MesQaItemsDetect01
//
- 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(1796, 978);
+ this.ClientSize = new System.Drawing.Size(1437, 800);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesQaItemsDetect01";
this.Text = "鏉ユ枡妫�楠岀敵璇�";
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs
index f4407e1..f8e49d3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs
@@ -1,16 +1,10 @@
-锘縰sing DevExpress.Utils.DirectXPaint;
-using DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
--
Gitblit v1.9.3