From 6b8f07429a524f4df9887f9364a1b286f198bcb5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 12 三月 2025 08:45:11 +0800
Subject: [PATCH] 版面
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | 1
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 766 ++++++++++++++--------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 14
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs | 60 +-
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs | 273 +++++----
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs | 471 +++++++++++------
7 files changed, 863 insertions(+), 726 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
index 595ccd8..7381d15 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -45,8 +45,6 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemOutNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardItem = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_outDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -57,17 +55,20 @@
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_workNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
- this.txt_outPart = new DevExpress.XtraEditors.TextEdit();
+ this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_sccj = new DevExpress.XtraEditors.TextEdit();
this.txt_outType = new DevExpress.XtraEditors.TextEdit();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
@@ -78,6 +79,8 @@
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_dldh = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -91,6 +94,9 @@
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.sp_fSubsidiary = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -119,12 +125,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txt_dldh = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
- this.sp_fSubsidiary = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -144,8 +145,8 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sccj.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
@@ -156,6 +157,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -169,6 +172,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -178,11 +184,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -274,7 +275,8 @@
this.gridColumn8,
this.gridColumn11,
this.gridColumn9,
- this.gridColumn10});
+ this.gridColumn10,
+ this.gridColumn12});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -309,34 +311,6 @@
this.gv_itemOutNo.Visible = true;
this.gv_itemOutNo.VisibleIndex = 1;
this.gv_itemOutNo.Width = 150;
- //
- // gv_workNo
- //
- this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workNo.AppearanceCell.Options.UseFont = true;
- this.gv_workNo.Caption = "鎶曟枡鍗曞彿";
- this.gv_workNo.FieldName = "dldh";
- this.gv_workNo.MinWidth = 25;
- this.gv_workNo.Name = "gv_workNo";
- this.gv_workNo.OptionsColumn.AllowEdit = false;
- this.gv_workNo.Tag = "query_a.work_no";
- this.gv_workNo.Visible = true;
- this.gv_workNo.VisibleIndex = 12;
- this.gv_workNo.Width = 100;
- //
- // gv_pbillNo
- //
- this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
- this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
- this.gv_pbillNo.FieldName = "pbillNo";
- this.gv_pbillNo.MinWidth = 25;
- this.gv_pbillNo.Name = "gv_pbillNo";
- this.gv_pbillNo.OptionsColumn.AllowEdit = false;
- this.gv_pbillNo.Tag = "query_a.pbill_no";
- this.gv_pbillNo.Visible = true;
- this.gv_pbillNo.VisibleIndex = 13;
- this.gv_pbillNo.Width = 94;
//
// gv_boardItem
//
@@ -474,6 +448,34 @@
this.gv_remark.VisibleIndex = 11;
this.gv_remark.Width = 94;
//
+ // gv_workNo
+ //
+ this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_workNo.AppearanceCell.Options.UseFont = true;
+ this.gv_workNo.Caption = "鎶曟枡鍗曞彿";
+ this.gv_workNo.FieldName = "dldh";
+ this.gv_workNo.MinWidth = 25;
+ this.gv_workNo.Name = "gv_workNo";
+ this.gv_workNo.OptionsColumn.AllowEdit = false;
+ this.gv_workNo.Tag = "query_a.work_no";
+ this.gv_workNo.Visible = true;
+ this.gv_workNo.VisibleIndex = 12;
+ this.gv_workNo.Width = 100;
+ //
+ // gv_pbillNo
+ //
+ this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
+ this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
+ this.gv_pbillNo.FieldName = "pbillNo";
+ this.gv_pbillNo.MinWidth = 25;
+ this.gv_pbillNo.Name = "gv_pbillNo";
+ this.gv_pbillNo.OptionsColumn.AllowEdit = false;
+ this.gv_pbillNo.Tag = "query_a.pbill_no";
+ this.gv_pbillNo.Visible = true;
+ this.gv_pbillNo.VisibleIndex = 13;
+ this.gv_pbillNo.Width = 94;
+ //
// gridColumn7
//
this.gridColumn7.Caption = "浠诲姟鍗曞彿";
@@ -513,6 +515,14 @@
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 17;
this.gridColumn9.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "涓婚敭GUID";
+ this.gridColumn10.FieldName = "guid";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Width = 94;
//
// pageBar1
//
@@ -556,8 +566,8 @@
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_depotId);
- this.layoutMx1.Controls.Add(this.txt_outPart);
+ this.layoutMx1.Controls.Add(this.txt_ckName);
+ this.layoutMx1.Controls.Add(this.txt_sccj);
this.layoutMx1.Controls.Add(this.txt_outType);
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_itemOutNo);
@@ -590,25 +600,25 @@
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // txt_depotId
+ // txt_ckName
//
- this.txt_depotId.Location = new System.Drawing.Point(355, 44);
- this.txt_depotId.Name = "txt_depotId";
- this.txt_depotId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depotId.Properties.Appearance.Options.UseFont = true;
- this.txt_depotId.Size = new System.Drawing.Size(195, 28);
- this.txt_depotId.StyleController = this.layoutMx1;
- this.txt_depotId.TabIndex = 575;
+ this.txt_ckName.Location = new System.Drawing.Point(355, 44);
+ this.txt_ckName.Name = "txt_ckName";
+ this.txt_ckName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_ckName.Properties.Appearance.Options.UseFont = true;
+ this.txt_ckName.Size = new System.Drawing.Size(195, 28);
+ this.txt_ckName.StyleController = this.layoutMx1;
+ this.txt_ckName.TabIndex = 575;
//
- // txt_outPart
+ // txt_sccj
//
- this.txt_outPart.Location = new System.Drawing.Point(355, 12);
- this.txt_outPart.Name = "txt_outPart";
- this.txt_outPart.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_outPart.Properties.Appearance.Options.UseFont = true;
- this.txt_outPart.Size = new System.Drawing.Size(195, 28);
- this.txt_outPart.StyleController = this.layoutMx1;
- this.txt_outPart.TabIndex = 574;
+ this.txt_sccj.Location = new System.Drawing.Point(355, 12);
+ this.txt_sccj.Name = "txt_sccj";
+ this.txt_sccj.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_sccj.Properties.Appearance.Options.UseFont = true;
+ this.txt_sccj.Size = new System.Drawing.Size(195, 28);
+ this.txt_sccj.StyleController = this.layoutMx1;
+ this.txt_sccj.TabIndex = 574;
//
// txt_outType
//
@@ -709,6 +719,22 @@
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 576;
//
+ // txt_dldh
+ //
+ this.txt_dldh.Location = new System.Drawing.Point(84, 44);
+ this.txt_dldh.Name = "txt_dldh";
+ this.txt_dldh.Size = new System.Drawing.Size(195, 24);
+ this.txt_dldh.StyleController = this.layoutMx1;
+ this.txt_dldh.TabIndex = 577;
+ //
+ // txt_fSubsidiary
+ //
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(626, 108);
+ this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(195, 24);
+ this.txt_fSubsidiary.StyleController = this.layoutMx1;
+ this.txt_fSubsidiary.TabIndex = 578;
+ //
// layoutControlItem13
//
this.layoutControlItem13.Control = this.lbGuid;
@@ -782,12 +808,12 @@
//
// layoutControlItem2
//
- this.layoutControlItem2.Control = this.txt_outPart;
+ this.layoutControlItem2.Control = this.txt_sccj;
this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem2.Text = "棰嗘枡閮ㄩ棬";
+ this.layoutControlItem2.Text = "鐢熶骇杞﹂棿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
@@ -812,7 +838,7 @@
//
// layoutControlItem6
//
- this.layoutControlItem6.Control = this.txt_depotId;
+ this.layoutControlItem6.Control = this.txt_ckName;
this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -886,6 +912,38 @@
this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_workNo;
+ this.layoutControlItem5.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_dldh;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // sp_fSubsidiary
+ //
+ this.sp_fSubsidiary.Control = this.txt_fSubsidiary;
+ this.sp_fSubsidiary.Location = new System.Drawing.Point(542, 96);
+ this.sp_fSubsidiary.Name = "sp_fSubsidiary";
+ this.sp_fSubsidiary.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.sp_fSubsidiary.OptionsTableLayoutItem.RowIndex = 3;
+ this.sp_fSubsidiary.Size = new System.Drawing.Size(271, 32);
+ this.sp_fSubsidiary.Text = "鐢熶骇缁勭粐";
+ this.sp_fSubsidiary.TextSize = new System.Drawing.Size(60, 18);
//
// tabMx
//
@@ -1227,61 +1285,15 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn10
+ // gridColumn12
//
- this.gridColumn10.Caption = "涓婚敭GUID";
- this.gridColumn10.FieldName = "guid";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Width = 94;
- //
- // txt_dldh
- //
- this.txt_dldh.Location = new System.Drawing.Point(84, 44);
- this.txt_dldh.Name = "txt_dldh";
- this.txt_dldh.Size = new System.Drawing.Size(195, 24);
- this.txt_dldh.StyleController = this.layoutMx1;
- this.txt_dldh.TabIndex = 577;
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_workNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_dldh;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem14.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_fSubsidiary
- //
- this.txt_fSubsidiary.Location = new System.Drawing.Point(626, 108);
- this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(195, 24);
- this.txt_fSubsidiary.StyleController = this.layoutMx1;
- this.txt_fSubsidiary.TabIndex = 578;
- //
- // sp_fSubsidiary
- //
- this.sp_fSubsidiary.Control = this.txt_fSubsidiary;
- this.sp_fSubsidiary.Location = new System.Drawing.Point(542, 96);
- this.sp_fSubsidiary.Name = "sp_fSubsidiary";
- this.sp_fSubsidiary.OptionsTableLayoutItem.ColumnIndex = 2;
- this.sp_fSubsidiary.OptionsTableLayoutItem.RowIndex = 3;
- this.sp_fSubsidiary.Size = new System.Drawing.Size(271, 32);
- this.sp_fSubsidiary.Text = "鐢熶骇缁勭粐";
- this.sp_fSubsidiary.TextSize = new System.Drawing.Size(60, 18);
+ this.gridColumn12.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn12.FieldName = "tldh";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 18;
+ this.gridColumn12.Width = 94;
//
// Frm_MesInvItemOut_SCLL
//
@@ -1312,8 +1324,8 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_outPart.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sccj.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
@@ -1324,6 +1336,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1337,6 +1351,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1346,11 +1363,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).EndInit();
this.ResumeLayout(false);
}
@@ -1381,8 +1393,8 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.TextEdit txt_depotId;
- private DevExpress.XtraEditors.TextEdit txt_outPart;
+ private DevExpress.XtraEditors.TextEdit txt_ckName;
+ private DevExpress.XtraEditors.TextEdit txt_sccj;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_outType;
private DevExpress.XtraEditors.TextEdit txt_workNo;
@@ -1443,5 +1455,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem sp_fSubsidiary;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
index 080d5ef..604170c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -83,11 +83,12 @@
this.txt_bl012 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl006 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl015 = new DevExpress.XtraEditors.TextEdit();
- this.txt_bl011 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.txt_bl016 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl002 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl014 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl018 = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -104,7 +105,6 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -163,11 +163,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl012.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl006.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl015.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bl011.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl016.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl002.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -184,7 +185,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -654,7 +654,7 @@
this.layoutMx1.Controls.Add(this.txt_bl012);
this.layoutMx1.Controls.Add(this.txt_bl006);
this.layoutMx1.Controls.Add(this.txt_bl015);
- this.layoutMx1.Controls.Add(this.txt_bl011);
+ this.layoutMx1.Controls.Add(this.txt_dptName);
this.layoutMx1.Controls.Add(this.txt_bl016);
this.layoutMx1.Controls.Add(this.txt_bl002);
this.layoutMx1.Controls.Add(this.txt_bl014);
@@ -781,16 +781,16 @@
this.txt_bl015.TabIndex = 262;
this.txt_bl015.Tag = "readonly";
//
- // txt_bl011
+ // txt_dptName
//
- this.txt_bl011.Location = new System.Drawing.Point(360, 76);
- this.txt_bl011.Name = "txt_bl011";
- this.txt_bl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_bl011.Properties.Appearance.Options.UseFont = true;
- this.txt_bl011.Size = new System.Drawing.Size(190, 28);
- this.txt_bl011.StyleController = this.layoutMx1;
- this.txt_bl011.TabIndex = 243;
- this.txt_bl011.Tag = "readonly";
+ this.txt_dptName.Location = new System.Drawing.Point(360, 76);
+ this.txt_dptName.Name = "txt_dptName";
+ this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dptName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dptName.Size = new System.Drawing.Size(190, 28);
+ this.txt_dptName.StyleController = this.layoutMx1;
+ this.txt_dptName.TabIndex = 243;
+ this.txt_dptName.Tag = "readonly";
//
// txt_bl016
//
@@ -833,6 +833,18 @@
this.txt_bl018.Size = new System.Drawing.Size(268, 24);
this.txt_bl018.StyleController = this.layoutMx1;
this.txt_bl018.TabIndex = 290;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.lbGuid;
+ this.layoutControlItem16.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem16.Text = "lbGuid";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
//
// Root
//
@@ -979,7 +991,7 @@
//
// layoutControlItem10
//
- this.layoutControlItem10.Control = this.txt_bl011;
+ this.layoutControlItem10.Control = this.txt_dptName;
this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1042,18 +1054,6 @@
this.layoutControlItem15.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.lbGuid;
- this.layoutControlItem16.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem16.Text = "lbGuid";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
//
// tabMx
//
@@ -1468,11 +1468,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl012.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl006.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl015.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_bl011.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl016.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl002.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bl018.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1489,7 +1490,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1544,7 +1544,7 @@
private DevExpress.XtraEditors.TextEdit txt_bl014;
private DevExpress.XtraEditors.TextEdit txt_bl013;
private DevExpress.XtraEditors.TextEdit txt_bl012;
- private DevExpress.XtraEditors.TextEdit txt_bl011;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
private DevExpress.XtraEditors.TextEdit txt_bl007;
private DevExpress.XtraEditors.TextEdit txt_bl006;
private DevExpress.XtraEditors.TextEdit txt_bl002;
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 00105b8..2b1d6c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -26,7 +26,6 @@
txt_bl017.Text = _strType;
txt_bl017.Tag = "moren." + _strType;
}
-
protected override void OnCreateControl()
{
base.OnCreateControl();
@@ -78,7 +77,7 @@
txt_bl002.Text = txt_aboutGuid.GetPrdNo();
txt_bl014.Text = txt_aboutGuid.GetPrdName();
txt_bl015.Text = txt_aboutGuid.GetPrdModel();
- txt_bl011.Text = txt_aboutGuid.GetWorkName();
+ txt_dptName.Text = txt_aboutGuid.GetWorkName();
txt_bl012.Text = txt_aboutGuid.GetWorkXb();
txt_bl013.Text = txt_aboutGuid.GetRwd();
var _obj = new
@@ -97,6 +96,7 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ this.repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index 25b436a..b1d71fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -27,14 +27,14 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
@@ -57,14 +57,11 @@
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_reason = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.depot_id = new Gs.DevApp.UserControl.UcLookCk();
- this.txt_outPart = new Gs.DevApp.UserControl.UcLookDepartment();
this.txt_outType = new DevExpress.XtraEditors.TextEdit();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
@@ -75,19 +72,16 @@
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -116,7 +110,22 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_cjName = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage3.SuspendLayout();
@@ -146,19 +155,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -168,7 +174,18 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -261,7 +278,10 @@
this.gv_createBy,
this.gv_createDate,
this.gv_remark,
- this.gv_reason});
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn9,
+ this.gridColumn10});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -436,8 +456,8 @@
//
this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_outPart.AppearanceCell.Options.UseFont = true;
- this.gv_outPart.Caption = "棰嗘枡閮ㄩ棬 ";
- this.gv_outPart.FieldName = "outPart";
+ this.gv_outPart.Caption = "杞﹂棿";
+ this.gv_outPart.FieldName = "cjName";
this.gv_outPart.MinWidth = 25;
this.gv_outPart.Name = "gv_outPart";
this.gv_outPart.OptionsColumn.AllowEdit = false;
@@ -488,20 +508,6 @@
this.gv_remark.VisibleIndex = 15;
this.gv_remark.Width = 94;
//
- // gv_reason
- //
- this.gv_reason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_reason.AppearanceCell.Options.UseFont = true;
- this.gv_reason.Caption = "鍑哄簱鍘熷洜 ";
- this.gv_reason.FieldName = "reason";
- this.gv_reason.MinWidth = 25;
- this.gv_reason.Name = "gv_reason";
- this.gv_reason.OptionsColumn.AllowEdit = false;
- this.gv_reason.Tag = "query_a.reason";
- this.gv_reason.Visible = true;
- this.gv_reason.VisibleIndex = 16;
- this.gv_reason.Width = 94;
- //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -544,8 +550,6 @@
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.depot_id);
- this.layoutMx1.Controls.Add(this.txt_outPart);
this.layoutMx1.Controls.Add(this.txt_outType);
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_itemOutNo);
@@ -556,6 +560,11 @@
this.layoutMx1.Controls.Add(this.txt_workNo);
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_status);
+ this.layoutMx1.Controls.Add(this.txt_cjName);
+ this.layoutMx1.Controls.Add(this.txt_ckName);
+ this.layoutMx1.Controls.Add(this.txt_pbillNo);
+ this.layoutMx1.Controls.Add(this.txt_daa014);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem13});
@@ -576,26 +585,9 @@
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // depot_id
- //
- this.depot_id.IsReadly = false;
- this.depot_id.Location = new System.Drawing.Point(360, 37);
- this.depot_id.Margin = new System.Windows.Forms.Padding(0);
- this.depot_id.Name = "depot_id";
- this.depot_id.Size = new System.Drawing.Size(190, 28);
- this.depot_id.TabIndex = 573;
- //
- // txt_outPart
- //
- this.txt_outPart.IsReadly = false;
- this.txt_outPart.Location = new System.Drawing.Point(360, 5);
- this.txt_outPart.Name = "txt_outPart";
- this.txt_outPart.Size = new System.Drawing.Size(190, 28);
- this.txt_outPart.TabIndex = 574;
- //
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(360, 69);
+ this.txt_outType.Location = new System.Drawing.Point(360, 61);
this.txt_outType.Name = "txt_outType";
this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_outType.Properties.Appearance.Options.UseFont = true;
@@ -605,7 +597,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(89, 101);
+ this.txt_remark.Location = new System.Drawing.Point(89, 93);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -615,7 +607,7 @@
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(89, 5);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(89, -3);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
@@ -625,7 +617,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(631, 5);
+ this.txt_createBy.Location = new System.Drawing.Point(631, -3);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -635,7 +627,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(902, 37);
+ this.txt_checkDate.Location = new System.Drawing.Point(902, 29);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -645,7 +637,7 @@
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(89, 69);
+ this.txt_taskNo.Location = new System.Drawing.Point(89, 29);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
@@ -655,7 +647,7 @@
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(902, 5);
+ this.txt_checkUser.Location = new System.Drawing.Point(902, -3);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
@@ -665,17 +657,17 @@
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(89, 37);
+ this.txt_workNo.Location = new System.Drawing.Point(902, 93);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(190, 28);
+ this.txt_workNo.Size = new System.Drawing.Size(191, 28);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 387;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(631, 37);
+ this.txt_createDate.Location = new System.Drawing.Point(631, 29);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -685,12 +677,24 @@
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 69);
+ this.txt_status.Location = new System.Drawing.Point(825, 61);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 575;
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.lbGuid;
+ this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem13.Text = "lbGuid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// Root
//
@@ -698,45 +702,48 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
- this.layoutControlItem5,
- this.layoutControlItem6,
this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem12,
- this.layoutControlItem11});
+ this.layoutControlItem11,
+ this.layoutControlItem2,
+ this.layoutControlItem6,
+ this.layoutControlItem14,
+ this.layoutControlItem15,
+ this.layoutControlItem5,
+ this.layoutControlItem9,
+ this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
this.Root.Size = new System.Drawing.Size(1105, 148);
this.Root.TextVisible = false;
//
@@ -748,16 +755,6 @@
this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_outPart;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem2.Text = "棰嗘枡閮ㄩ棬";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem3
//
@@ -778,27 +775,6 @@
this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem4.Text = "瀹℃牳浜�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_workNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.depot_id;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem6.Text = "鍙戞枡浠撳簱";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem7
//
@@ -821,16 +797,6 @@
this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡 ";
this.layoutControlItem8.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_taskNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem9.Text = "鐢宠鍗曞彿";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
//
// layoutControlItem10
//
@@ -855,17 +821,16 @@
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
//
- // layoutControlItem13
+ // layoutControlItem11
//
- this.layoutControlItem13.Control = this.lbGuid;
- this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem13.Text = "lbGuid";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
+ this.layoutControlItem11.Control = this.txt_remark;
+ this.layoutControlItem11.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem11.Text = "澶囨敞淇℃伅";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
//
// tabMx
//
@@ -1056,7 +1021,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 385);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 393);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
@@ -1065,7 +1030,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 385);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 393);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1210,16 +1175,157 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem11
+ // gridColumn7
//
- this.layoutControlItem11.Control = this.txt_remark;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(542, 32);
- this.layoutControlItem11.Text = "澶囨敞淇℃伅";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
+ this.gridColumn7.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn7.FieldName = "daa014";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 16;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐢宠鍗曞彿";
+ this.gridColumn8.FieldName = "taskNo";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 17;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn9.FieldName = "ckName";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 18;
+ this.gridColumn9.Width = 94;
+ //
+ // txt_cjName
+ //
+ this.txt_cjName.Location = new System.Drawing.Point(360, -3);
+ this.txt_cjName.Name = "txt_cjName";
+ this.txt_cjName.Size = new System.Drawing.Size(190, 24);
+ this.txt_cjName.StyleController = this.layoutMx1;
+ this.txt_cjName.TabIndex = 576;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_cjName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Text = "杞﹂棿鍚嶇О";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // txt_ckName
+ //
+ this.txt_ckName.Location = new System.Drawing.Point(360, 29);
+ this.txt_ckName.Name = "txt_ckName";
+ this.txt_ckName.Size = new System.Drawing.Size(190, 24);
+ this.txt_ckName.StyleController = this.layoutMx1;
+ this.txt_ckName.TabIndex = 577;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_ckName;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Text = "浠撳簱鍚嶇О";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // txt_pbillNo
+ //
+ this.txt_pbillNo.Location = new System.Drawing.Point(631, 61);
+ this.txt_pbillNo.Name = "txt_pbillNo";
+ this.txt_pbillNo.Size = new System.Drawing.Size(190, 24);
+ this.txt_pbillNo.StyleController = this.layoutMx1;
+ this.txt_pbillNo.TabIndex = 578;
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_pbillNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Text = "宸ュ崟鍗曞彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // txt_daa014
+ //
+ this.txt_daa014.Location = new System.Drawing.Point(631, 93);
+ this.txt_daa014.Name = "txt_daa014";
+ this.txt_daa014.Size = new System.Drawing.Size(190, 24);
+ this.txt_daa014.StyleController = this.layoutMx1;
+ this.txt_daa014.TabIndex = 579;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_daa014;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_workNo;
+ this.layoutControlItem5.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_taskNo;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "鐢宠鍗曞彿";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(89, 61);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Size = new System.Drawing.Size(190, 24);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 580;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_itemName;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem16.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "涓婚敭GUID";
+ this.gridColumn10.FieldName = "guid";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Width = 94;
//
// UcBlclDj
//
@@ -1259,19 +1365,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1281,7 +1384,18 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
}
@@ -1310,11 +1424,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_reason;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
- private UserControl.UcLookDepartment txt_outPart;
- private UserControl.UcLookCk depot_id;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_outType;
private DevExpress.XtraEditors.TextEdit txt_workNo;
@@ -1328,15 +1439,11 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
@@ -1368,5 +1475,21 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gvMx2remark;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.TextEdit txt_cjName;
+ private DevExpress.XtraEditors.TextEdit txt_ckName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraEditors.TextEdit txt_pbillNo;
+ private DevExpress.XtraEditors.TextEdit txt_daa014;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
index 845fa9d..08d5e12 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -50,7 +50,6 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- depot_id.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 50aac70..c2443d9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -29,31 +29,30 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = 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();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_tbl013 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl020 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -62,7 +61,6 @@
this.gv_tbl003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl021 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl004 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -71,23 +69,28 @@
this.gv_tbl010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl012 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_tbl023 = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_tbl005 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_tbl006 = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl002 = new Gs.DevApp.UserControl.UcLookDaa();
- this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
- this.lbGuid = new System.Windows.Forms.Label();
this.txt_workName = new DevExpress.XtraEditors.TextEdit();
this.txt_tbl012 = new DevExpress.XtraEditors.TextEdit();
- this.txt_tbl011 = new DevExpress.XtraEditors.TextEdit();
- this.txt_tbl006 = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.txt_rwd = new DevExpress.XtraEditors.TextEdit();
- this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_rwd = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tbl011 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -95,22 +98,16 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -163,16 +160,18 @@
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.txt_id = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
this.split1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
@@ -181,17 +180,21 @@
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
this.splitMx1.Panel2.SuspendLayout();
this.splitMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -199,22 +202,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
@@ -236,6 +233,9 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -265,17 +265,6 @@
this.xtraTabPage1,
this.xtraTabPage2});
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 5;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
@@ -290,29 +279,29 @@
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
//
- // split1.split1_Panel1
+ // split1.Panel1
//
- this.split1.Panel1.Controls.Add(this.gcMain);
+ this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
- // split1.split1_Panel2
+ // split1.Panel2
//
this.split1.Panel2.Text = "Panel2";
this.split1.Size = new System.Drawing.Size(1126, 592);
this.split1.SplitterPosition = 580;
this.split1.TabIndex = 0;
//
- // gcMain
+ // gcMain1
//
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 541);
- this.gcMain.TabIndex = 2;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1126, 541);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
@@ -330,7 +319,6 @@
this.gv_tbl003,
this.gv_tbl002,
this.gv_tbl021,
- this.gv_tbl001,
this.gridColumn6,
this.gridColumn10,
this.gv_tbl004,
@@ -338,8 +326,9 @@
this.gv_tbl009,
this.gv_tbl010,
this.gv_tbl011,
- this.gv_tbl012});
- this.gridView1.GridControl = this.gcMain;
+ this.gv_tbl012,
+ this.gridColumn11});
+ this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -443,20 +432,6 @@
this.gv_tbl021.VisibleIndex = 6;
this.gv_tbl021.Width = 94;
//
- // gv_tbl001
- //
- this.gv_tbl001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl001.AppearanceCell.Options.UseFont = true;
- this.gv_tbl001.Caption = "浜х嚎鍚嶇О ";
- this.gv_tbl001.FieldName = "tbl001";
- this.gv_tbl001.MinWidth = 50;
- this.gv_tbl001.Name = "gv_tbl001";
- this.gv_tbl001.OptionsColumn.AllowEdit = false;
- this.gv_tbl001.Tag = "query_a.tbl001";
- this.gv_tbl001.Visible = true;
- this.gv_tbl001.VisibleIndex = 7;
- this.gv_tbl001.Width = 94;
- //
// gridColumn6
//
this.gridColumn6.Caption = "浜у搧缂栫爜";
@@ -464,7 +439,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 8;
+ this.gridColumn6.VisibleIndex = 7;
this.gridColumn6.Width = 94;
//
// gridColumn10
@@ -474,7 +449,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.VisibleIndex = 8;
this.gridColumn10.Width = 94;
//
// gv_tbl004
@@ -488,7 +463,7 @@
this.gv_tbl004.OptionsColumn.AllowEdit = false;
this.gv_tbl004.Tag = "query_a.tbl004";
this.gv_tbl004.Visible = true;
- this.gv_tbl004.VisibleIndex = 10;
+ this.gv_tbl004.VisibleIndex = 9;
this.gv_tbl004.Width = 94;
//
// gv_tbl005
@@ -502,7 +477,7 @@
this.gv_tbl005.OptionsColumn.AllowEdit = false;
this.gv_tbl005.Tag = "query_a.tbl005";
this.gv_tbl005.Visible = true;
- this.gv_tbl005.VisibleIndex = 11;
+ this.gv_tbl005.VisibleIndex = 10;
this.gv_tbl005.Width = 94;
//
// gv_tbl009
@@ -516,7 +491,7 @@
this.gv_tbl009.OptionsColumn.AllowEdit = false;
this.gv_tbl009.Tag = "query_a.tbl009";
this.gv_tbl009.Visible = true;
- this.gv_tbl009.VisibleIndex = 12;
+ this.gv_tbl009.VisibleIndex = 11;
this.gv_tbl009.Width = 94;
//
// gv_tbl010
@@ -530,7 +505,7 @@
this.gv_tbl010.OptionsColumn.AllowEdit = false;
this.gv_tbl010.Tag = "query_a.tbl010";
this.gv_tbl010.Visible = true;
- this.gv_tbl010.VisibleIndex = 13;
+ this.gv_tbl010.VisibleIndex = 12;
this.gv_tbl010.Width = 94;
//
// gv_tbl011
@@ -544,7 +519,7 @@
this.gv_tbl011.OptionsColumn.AllowEdit = false;
this.gv_tbl011.Tag = "query_a.tbl011";
this.gv_tbl011.Visible = true;
- this.gv_tbl011.VisibleIndex = 14;
+ this.gv_tbl011.VisibleIndex = 13;
this.gv_tbl011.Width = 94;
//
// gv_tbl012
@@ -558,8 +533,18 @@
this.gv_tbl012.OptionsColumn.AllowEdit = false;
this.gv_tbl012.Tag = "query_a.tbl012";
this.gv_tbl012.Visible = true;
- this.gv_tbl012.VisibleIndex = 15;
+ this.gv_tbl012.VisibleIndex = 14;
this.gv_tbl012.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "涓婚敭GUID";
+ this.gridColumn11.FieldName = "guid";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 15;
+ this.gridColumn11.Width = 94;
//
// pageBar1
//
@@ -587,155 +572,18 @@
this.splitMx1.Location = new System.Drawing.Point(0, 0);
this.splitMx1.Name = "splitMx1";
//
- // splitMx1.splitMx1_Panel1
+ // splitMx1.Panel1
//
this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
this.splitMx1.Panel1.Text = "Panel1";
//
- // splitMx1.splitMx1_Panel2
+ // splitMx1.Panel2
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 592);
this.splitMx1.SplitterPosition = 170;
this.splitMx1.TabIndex = 0;
- //
- // txt_tbl023
- //
- this.txt_tbl023.IsReadly = false;
- this.txt_tbl023.Location = new System.Drawing.Point(84, 44);
- this.txt_tbl023.Name = "txt_tbl023";
- this.txt_tbl023.Size = new System.Drawing.Size(195, 28);
- this.txt_tbl023.TabIndex = 462;
- //
- // txt_tbl005
- //
- this.txt_tbl005.Location = new System.Drawing.Point(84, 108);
- this.txt_tbl005.Name = "txt_tbl005";
- this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_tbl005.Properties.Items.AddRange(new object[] {
- "鑹搧閫�鏂�",
- "鏉ユ枡涓嶈壇閫�鏂�",
- "浣滀笟涓嶈壇閫�鏂�"});
- this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(195, 24);
- this.txt_tbl005.StyleController = this.layoutMx1;
- this.txt_tbl005.TabIndex = 459;
- //
- // txt_tbl002
- //
- this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 76);
- this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(195, 28);
- this.txt_tbl002.TabIndex = 458;
- //
- // btnSelect
- //
- this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 140);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(96, 27);
- this.btnSelect.StyleController = this.layoutMx1;
- this.btnSelect.TabIndex = 457;
- this.btnSelect.Text = "閫夊彇鐗╂枡";
- //
- // lbGuid
- //
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Text = "lbGuid";
- this.lbGuid.Visible = false;
- //
- // txt_workName
- //
- this.txt_workName.Location = new System.Drawing.Point(355, 44);
- this.txt_workName.Name = "txt_workName";
- this.txt_workName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_workName.Properties.Appearance.Options.UseFont = true;
- this.txt_workName.Size = new System.Drawing.Size(195, 28);
- this.txt_workName.StyleController = this.layoutMx1;
- this.txt_workName.TabIndex = 298;
- this.txt_workName.Tag = "readonly";
- //
- // txt_tbl012
- //
- this.txt_tbl012.Location = new System.Drawing.Point(897, 44);
- this.txt_tbl012.Name = "txt_tbl012";
- this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(196, 28);
- this.txt_tbl012.StyleController = this.layoutMx1;
- this.txt_tbl012.TabIndex = 247;
- this.txt_tbl012.Tag = "readonly";
- //
- // txt_tbl011
- //
- this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
- this.txt_tbl011.Name = "txt_tbl011";
- this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(196, 28);
- this.txt_tbl011.StyleController = this.layoutMx1;
- this.txt_tbl011.TabIndex = 243;
- this.txt_tbl011.Tag = "readonly";
- //
- // txt_tbl006
- //
- this.txt_tbl006.Location = new System.Drawing.Point(355, 140);
- this.txt_tbl006.Name = "txt_tbl006";
- this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(466, 28);
- this.txt_tbl006.StyleController = this.layoutMx1;
- this.txt_tbl006.TabIndex = 226;
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(355, 108);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(195, 28);
- this.txt_itemName.StyleController = this.layoutMx1;
- this.txt_itemName.TabIndex = 219;
- this.txt_itemName.Tag = "readonly";
- //
- // txt_rwd
- //
- this.txt_rwd.Location = new System.Drawing.Point(355, 12);
- this.txt_rwd.Name = "txt_rwd";
- this.txt_rwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_rwd.Properties.Appearance.Options.UseFont = true;
- this.txt_rwd.Size = new System.Drawing.Size(195, 28);
- this.txt_rwd.StyleController = this.layoutMx1;
- this.txt_rwd.TabIndex = 217;
- this.txt_rwd.Tag = "readonly";
- //
- // txt_lineName
- //
- this.txt_lineName.Location = new System.Drawing.Point(355, 76);
- this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lineName.Properties.Appearance.Options.UseFont = true;
- this.txt_lineName.Size = new System.Drawing.Size(195, 28);
- this.txt_lineName.StyleController = this.layoutMx1;
- this.txt_lineName.TabIndex = 213;
- this.txt_lineName.Tag = "readonly";
- //
- // txt_billNo
- //
- this.txt_billNo.Location = new System.Drawing.Point(84, 12);
- this.txt_billNo.Name = "txt_billNo";
- this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(195, 28);
- this.txt_billNo.StyleController = this.layoutMx1;
- this.txt_billNo.TabIndex = 211;
- this.txt_billNo.Tag = "readonly";
//
// layoutMx1
//
@@ -750,13 +598,13 @@
this.layoutMx1.Controls.Add(this.txt_billNo);
this.layoutMx1.Controls.Add(this.txt_rwd);
this.layoutMx1.Controls.Add(this.txt_tbl011);
- this.layoutMx1.Controls.Add(this.txt_lineName);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_tbl013);
this.layoutMx1.Controls.Add(this.textEdit1);
this.layoutMx1.Controls.Add(this.textEdit2);
this.layoutMx1.Controls.Add(this.txt_tbl020);
this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_id);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
@@ -765,6 +613,179 @@
this.layoutMx1.Size = new System.Drawing.Size(1126, 170);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(12, 140);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(96, 27);
+ this.btnSelect.StyleController = this.layoutMx1;
+ this.btnSelect.TabIndex = 457;
+ this.btnSelect.Text = "閫夊彇鐗╂枡";
+ //
+ // txt_tbl023
+ //
+ this.txt_tbl023.IsReadly = false;
+ this.txt_tbl023.Location = new System.Drawing.Point(90, 44);
+ this.txt_tbl023.Name = "txt_tbl023";
+ this.txt_tbl023.Size = new System.Drawing.Size(189, 28);
+ this.txt_tbl023.TabIndex = 462;
+ //
+ // txt_tbl005
+ //
+ this.txt_tbl005.Location = new System.Drawing.Point(90, 108);
+ this.txt_tbl005.Name = "txt_tbl005";
+ this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_tbl005.Properties.Items.AddRange(new object[] {
+ "鑹搧閫�鏂�",
+ "鏉ユ枡涓嶈壇閫�鏂�",
+ "浣滀笟涓嶈壇閫�鏂�"});
+ this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_tbl005.Size = new System.Drawing.Size(189, 24);
+ this.txt_tbl005.StyleController = this.layoutMx1;
+ this.txt_tbl005.TabIndex = 459;
+ //
+ // txt_tbl006
+ //
+ this.txt_tbl006.Location = new System.Drawing.Point(361, 140);
+ this.txt_tbl006.Name = "txt_tbl006";
+ this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
+ this.txt_tbl006.Size = new System.Drawing.Size(460, 28);
+ this.txt_tbl006.StyleController = this.layoutMx1;
+ this.txt_tbl006.TabIndex = 226;
+ //
+ // txt_tbl002
+ //
+ this.txt_tbl002.IsReadly = false;
+ this.txt_tbl002.Location = new System.Drawing.Point(90, 76);
+ this.txt_tbl002.Name = "txt_tbl002";
+ this.txt_tbl002.Size = new System.Drawing.Size(189, 28);
+ this.txt_tbl002.TabIndex = 458;
+ //
+ // txt_workName
+ //
+ this.txt_workName.Location = new System.Drawing.Point(361, 44);
+ this.txt_workName.Name = "txt_workName";
+ this.txt_workName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_workName.Properties.Appearance.Options.UseFont = true;
+ this.txt_workName.Size = new System.Drawing.Size(189, 28);
+ this.txt_workName.StyleController = this.layoutMx1;
+ this.txt_workName.TabIndex = 298;
+ this.txt_workName.Tag = "readonly";
+ //
+ // txt_tbl012
+ //
+ this.txt_tbl012.Location = new System.Drawing.Point(903, 44);
+ this.txt_tbl012.Name = "txt_tbl012";
+ this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
+ this.txt_tbl012.Size = new System.Drawing.Size(190, 28);
+ this.txt_tbl012.StyleController = this.layoutMx1;
+ this.txt_tbl012.TabIndex = 247;
+ this.txt_tbl012.Tag = "readonly";
+ //
+ // txt_billNo
+ //
+ this.txt_billNo.Location = new System.Drawing.Point(90, 12);
+ this.txt_billNo.Name = "txt_billNo";
+ this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_billNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_billNo.Size = new System.Drawing.Size(189, 28);
+ this.txt_billNo.StyleController = this.layoutMx1;
+ this.txt_billNo.TabIndex = 211;
+ this.txt_billNo.Tag = "readonly";
+ //
+ // txt_rwd
+ //
+ this.txt_rwd.Location = new System.Drawing.Point(361, 12);
+ this.txt_rwd.Name = "txt_rwd";
+ this.txt_rwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_rwd.Properties.Appearance.Options.UseFont = true;
+ this.txt_rwd.Size = new System.Drawing.Size(189, 28);
+ this.txt_rwd.StyleController = this.layoutMx1;
+ this.txt_rwd.TabIndex = 217;
+ this.txt_rwd.Tag = "readonly";
+ //
+ // txt_tbl011
+ //
+ this.txt_tbl011.Location = new System.Drawing.Point(903, 12);
+ this.txt_tbl011.Name = "txt_tbl011";
+ this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
+ this.txt_tbl011.Size = new System.Drawing.Size(190, 28);
+ this.txt_tbl011.StyleController = this.layoutMx1;
+ this.txt_tbl011.TabIndex = 243;
+ this.txt_tbl011.Tag = "readonly";
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(361, 76);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(189, 28);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 219;
+ this.txt_itemName.Tag = "readonly";
+ //
+ // txt_tbl013
+ //
+ this.txt_tbl013.Location = new System.Drawing.Point(825, 76);
+ this.txt_tbl013.Name = "txt_tbl013";
+ this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
+ this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
+ this.txt_tbl013.StyleController = this.layoutMx1;
+ this.txt_tbl013.TabIndex = 463;
+ this.txt_tbl013.Tag = "readonly";
+ //
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(632, 12);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Size = new System.Drawing.Size(189, 24);
+ this.textEdit1.StyleController = this.layoutMx1;
+ this.textEdit1.TabIndex = 464;
+ this.textEdit1.Tag = "readonly";
+ //
+ // textEdit2
+ //
+ this.textEdit2.Location = new System.Drawing.Point(632, 44);
+ this.textEdit2.Name = "textEdit2";
+ this.textEdit2.Size = new System.Drawing.Size(189, 24);
+ this.textEdit2.StyleController = this.layoutMx1;
+ this.textEdit2.TabIndex = 465;
+ this.textEdit2.Tag = "readonly";
+ //
+ // txt_tbl020
+ //
+ this.txt_tbl020.Location = new System.Drawing.Point(554, 76);
+ this.txt_tbl020.Name = "txt_tbl020";
+ this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑";
+ this.txt_tbl020.Size = new System.Drawing.Size(267, 24);
+ this.txt_tbl020.StyleController = this.layoutMx1;
+ this.txt_tbl020.TabIndex = 466;
+ this.txt_tbl020.Tag = "readonly";
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(361, 108);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Size = new System.Drawing.Size(189, 24);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 467;
+ this.txt_itemNo.Tag = "readonly";
//
// Root
//
@@ -777,8 +798,6 @@
this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem6,
- this.layoutControlItem7,
- this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
@@ -788,38 +807,40 @@
this.layoutControlItem15,
this.layoutControlItem16,
this.layoutControlItem17,
- this.layoutControlItem18});
+ this.layoutControlItem8,
+ this.layoutControlItem18,
+ this.layoutControlItem7});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition9,
- columnDefinition10,
- columnDefinition11,
- columnDefinition12});
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1105, 180);
this.Root.TextVisible = false;
//
@@ -830,7 +851,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem2
//
@@ -840,7 +861,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem3
//
@@ -849,8 +870,8 @@
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem3.Text = "閫�鏂欑粍缁�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.Text = "鐢熶骇缁勭粐";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem4
//
@@ -860,7 +881,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem4.Text = "鐢熶骇宸ュ崟";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem5
//
@@ -870,7 +891,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem5.Text = "閫�鏂欑被鍨�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem6
//
@@ -881,29 +902,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_lineName;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem7.Text = "浜х嚎鍚嶇О";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_itemName;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem8.Text = "浜у搧鍚嶇О";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem9
//
@@ -913,7 +912,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem9.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem9.Text = "瀹℃牳浜�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem10
//
@@ -924,16 +923,7 @@
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_tbl013
- //
- this.txt_tbl013.Location = new System.Drawing.Point(825, 76);
- this.txt_tbl013.Name = "txt_tbl013";
- this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
- this.txt_tbl013.StyleController = this.layoutMx1;
- this.txt_tbl013.TabIndex = 463;
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem11
//
@@ -947,14 +937,6 @@
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
- // textEdit1
- //
- this.textEdit1.Location = new System.Drawing.Point(626, 12);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Size = new System.Drawing.Size(195, 24);
- this.textEdit1.StyleController = this.layoutMx1;
- this.textEdit1.TabIndex = 464;
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.textEdit1;
@@ -963,15 +945,7 @@
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem12.Text = "鐢宠浜�";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
- // textEdit2
- //
- this.textEdit2.Location = new System.Drawing.Point(626, 44);
- this.textEdit2.Name = "textEdit2";
- this.textEdit2.Size = new System.Drawing.Size(195, 24);
- this.textEdit2.StyleController = this.layoutMx1;
- this.textEdit2.TabIndex = 465;
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem13
//
@@ -982,16 +956,7 @@
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem13.Text = "鐢宠鏃堕棿";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
- //
- // txt_tbl020
- //
- this.txt_tbl020.Location = new System.Drawing.Point(554, 76);
- this.txt_tbl020.Name = "txt_tbl020";
- this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_tbl020.Size = new System.Drawing.Size(267, 24);
- this.txt_tbl020.StyleController = this.layoutMx1;
- this.txt_tbl020.TabIndex = 466;
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem14
//
@@ -1014,8 +979,8 @@
this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem15.Size = new System.Drawing.Size(542, 32);
- this.layoutControlItem15.Text = "澶囨敞";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.Text = "澶囨敞璇存槑";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem16
//
@@ -1043,24 +1008,27 @@
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
- // txt_itemNo
+ // layoutControlItem8
//
- this.txt_itemNo.Location = new System.Drawing.Point(626, 108);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
- this.txt_itemNo.StyleController = this.layoutMx1;
- this.txt_itemNo.TabIndex = 467;
+ this.layoutControlItem8.Control = this.txt_itemName;
+ this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem8.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_itemNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem18.Location = new System.Drawing.Point(271, 96);
this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem18.Text = "浜у搧缂栧彿";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(66, 18);
//
// tabMx
//
@@ -1275,12 +1243,13 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// panelMx1
//
@@ -1475,7 +1444,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1124, 560);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1124, 378);
this.xtraTabPage3.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
@@ -1486,7 +1455,7 @@
this.gcMx2.Name = "gcMx2";
this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit2});
- this.gcMx2.Size = new System.Drawing.Size(1124, 560);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 378);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1626,12 +1595,43 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 5;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // txt_id
+ //
+ this.txt_id.Location = new System.Drawing.Point(632, 108);
+ this.txt_id.Name = "txt_id";
+ this.txt_id.Size = new System.Drawing.Size(189, 24);
+ this.txt_id.StyleController = this.layoutMx1;
+ this.txt_id.TabIndex = 468;
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_id;
+ this.layoutControlItem7.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Text = "涓婚敭GUID";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
//
// Frm_MesItemTbl
//
@@ -1645,14 +1645,13 @@
this.Text = "鐢熶骇閫�鏂欑敵璇�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
this.split1.Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
@@ -1661,17 +1660,21 @@
this.splitMx1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
this.splitMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl005.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1679,22 +1682,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
@@ -1717,6 +1714,9 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
this.ResumeLayout(false);
}
@@ -1726,7 +1726,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl013;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl020;
@@ -1735,7 +1735,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl003;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl002;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl021;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl001;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl004;
@@ -1758,7 +1757,6 @@
private DevExpress.XtraEditors.TextEdit txt_tbl006;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_rwd;
- private DevExpress.XtraEditors.TextEdit txt_lineName;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
@@ -1768,8 +1766,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.CheckEdit txt_tbl013;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
@@ -1784,7 +1780,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
@@ -1836,5 +1831,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraEditors.TextEdit txt_id;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index d33edcd..2f9fac9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -15,6 +15,7 @@
{
string _webServiceName = "MesItemTblManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucGg = "";
public Frm_MesItemTbl()
{
InitializeComponent();
@@ -49,7 +50,7 @@
{
string orgdId = txt_tbl023.GetId();
if (string.IsNullOrEmpty(orgdId)) return;
- txt_tbl002.getSuppler(orgdId);
+ txt_tbl002.getSuppler(orgdId, _ucGg);
};
//璁剧疆宸ュ崟瀛�
txt_tbl002.EditChanged += (s, e) =>
@@ -58,7 +59,6 @@
if (string.IsNullOrEmpty(daaId)) return;
txt_rwd.Text = txt_tbl002.GetRwd();
txt_workName.Text = txt_tbl002.GetWorkName();
- txt_lineName.Text = txt_tbl002.GetPrdName();
txt_itemName.Text = txt_tbl002.GetPrdModel();
};
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
@@ -487,16 +487,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns();
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -533,11 +533,13 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _ucGg= dy.tbl002;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ _ucGg = "";
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
--
Gitblit v1.9.3