From a75a2d05afbd147ecb44fc1b520180424b99c910 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 23 八月 2025 10:21:11 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 7 +
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 235 ++++++++++++++++++++++++----------------------
2 files changed, 130 insertions(+), 112 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index 836835d..129fa5d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -78,6 +78,8 @@
this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
this.txt_msg = new DevExpress.XtraEditors.TextEdit();
this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fgCheckBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fgCheckDatet = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_daa00111111 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -94,6 +96,9 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -131,11 +136,7 @@
this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fgCheckBy = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_fgCheckDatet = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -169,6 +170,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).BeginInit();
@@ -185,6 +188,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -197,11 +203,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -293,7 +294,8 @@
this.gridColumn10,
this.gridColumn11,
this.gridColumn13,
- this.gridColumn18});
+ this.gridColumn18,
+ this.gridColumn19});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -540,11 +542,11 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(342, 109);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(347, 111);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(326, 29);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(332, 29);
this.ucBtnPrint98.TabIndex = 9;
//
// lbGuid
@@ -557,10 +559,10 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(99, 10);
+ this.txt_releaseNo.Location = new System.Drawing.Point(99, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(239, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(244, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
//
@@ -574,57 +576,57 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(759, 10);
+ this.txt_itemName.Location = new System.Drawing.Point(770, 12);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(239, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(245, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 231;
//
// txt_itemNo2
//
- this.txt_itemNo2.Location = new System.Drawing.Point(429, 10);
+ this.txt_itemNo2.Location = new System.Drawing.Point(434, 12);
this.txt_itemNo2.Name = "txt_itemNo2";
- this.txt_itemNo2.Size = new System.Drawing.Size(239, 24);
+ this.txt_itemNo2.Size = new System.Drawing.Size(245, 24);
this.txt_itemNo2.StyleController = this.layoutMx1;
this.txt_itemNo2.TabIndex = 232;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(759, 43);
+ this.txt_createBy.Location = new System.Drawing.Point(770, 45);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(245, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 233;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1089, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(1106, 45);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(241, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(245, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 234;
//
// txt_kbSl
//
- this.txt_kbSl.Location = new System.Drawing.Point(99, 43);
+ this.txt_kbSl.Location = new System.Drawing.Point(99, 45);
this.txt_kbSl.Name = "txt_kbSl";
- this.txt_kbSl.Size = new System.Drawing.Size(239, 24);
+ this.txt_kbSl.Size = new System.Drawing.Size(244, 24);
this.txt_kbSl.StyleController = this.layoutMx1;
this.txt_kbSl.TabIndex = 236;
//
// txt_fmrmode
//
- this.txt_fmrmode.Location = new System.Drawing.Point(99, 109);
+ this.txt_fmrmode.Location = new System.Drawing.Point(99, 111);
this.txt_fmrmode.Name = "txt_fmrmode";
- this.txt_fmrmode.Size = new System.Drawing.Size(239, 24);
+ this.txt_fmrmode.Size = new System.Drawing.Size(244, 24);
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 237;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(1089, 10);
+ this.txt_itemModel.Location = new System.Drawing.Point(1106, 12);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(241, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(245, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 238;
//
@@ -638,35 +640,51 @@
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(429, 43);
+ this.txt_lineName.Location = new System.Drawing.Point(434, 45);
this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(239, 24);
+ this.txt_lineName.Size = new System.Drawing.Size(245, 24);
this.txt_lineName.StyleController = this.layoutMx1;
this.txt_lineName.TabIndex = 244;
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(99, 76);
+ this.txt_daa001.Location = new System.Drawing.Point(99, 78);
this.txt_daa001.Name = "txt_daa001";
- this.txt_daa001.Size = new System.Drawing.Size(239, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(244, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 245;
//
// txt_msg
//
- this.txt_msg.Location = new System.Drawing.Point(759, 109);
+ this.txt_msg.Location = new System.Drawing.Point(770, 111);
this.txt_msg.Name = "txt_msg";
- this.txt_msg.Size = new System.Drawing.Size(571, 24);
+ this.txt_msg.Size = new System.Drawing.Size(581, 24);
this.txt_msg.StyleController = this.layoutMx1;
this.txt_msg.TabIndex = 246;
//
// txt_fngHandle
//
- this.txt_fngHandle.Location = new System.Drawing.Point(429, 76);
+ this.txt_fngHandle.Location = new System.Drawing.Point(434, 78);
this.txt_fngHandle.Name = "txt_fngHandle";
- this.txt_fngHandle.Size = new System.Drawing.Size(239, 24);
+ this.txt_fngHandle.Size = new System.Drawing.Size(245, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 247;
+ //
+ // txt_fgCheckBy
+ //
+ this.txt_fgCheckBy.Location = new System.Drawing.Point(770, 78);
+ this.txt_fgCheckBy.Name = "txt_fgCheckBy";
+ this.txt_fgCheckBy.Size = new System.Drawing.Size(245, 24);
+ this.txt_fgCheckBy.StyleController = this.layoutMx1;
+ this.txt_fgCheckBy.TabIndex = 248;
+ //
+ // txt_fgCheckDatet
+ //
+ this.txt_fgCheckDatet.Location = new System.Drawing.Point(1106, 78);
+ this.txt_fgCheckDatet.Name = "txt_fgCheckDatet";
+ this.txt_fgCheckDatet.Size = new System.Drawing.Size(245, 24);
+ this.txt_fgCheckDatet.StyleController = this.layoutMx1;
+ this.txt_fgCheckDatet.TabIndex = 249;
//
// layoutControlItem3
//
@@ -748,7 +766,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1342, 152);
+ this.Root.Size = new System.Drawing.Size(1363, 152);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -756,38 +774,38 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(335, 33);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo2;
- this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemName;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem2.Text = "浜у搧鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(660, 33);
+ this.layoutControlItem6.Location = new System.Drawing.Point(671, 33);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem6.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem6.Text = "寮�鍗曚汉鍛�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
@@ -797,50 +815,50 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 33);
this.layoutControlItem9.Text = "闇�杩斿伐鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(990, 33);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1007, 33);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem7.Text = "寮�鍗曟棩鏈�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem11.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_lineName;
- this.layoutControlItem12.Location = new System.Drawing.Point(330, 33);
+ this.layoutControlItem12.Location = new System.Drawing.Point(335, 33);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem12.Text = "浜х嚎";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_fngHandle;
- this.layoutControlItem17.Location = new System.Drawing.Point(330, 66);
+ this.layoutControlItem17.Location = new System.Drawing.Point(335, 66);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem17.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem17.Text = "澶勭疆缁撴灉";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
@@ -850,7 +868,7 @@
this.layoutControlItem15.Location = new System.Drawing.Point(0, 66);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem15.Size = new System.Drawing.Size(335, 33);
this.layoutControlItem15.Text = "宸ュ崟鍗曞彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
@@ -860,21 +878,55 @@
this.layoutControlItem10.Location = new System.Drawing.Point(0, 99);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem10.Size = new System.Drawing.Size(335, 33);
this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.ucBtnPrint98;
- this.layoutControlItem13.Location = new System.Drawing.Point(330, 99);
+ this.layoutControlItem13.Location = new System.Drawing.Point(335, 99);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
+ this.layoutControlItem13.Size = new System.Drawing.Size(336, 33);
this.layoutControlItem13.Text = "纭畾鎵撳嵃";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_msg;
+ this.layoutControlItem16.Location = new System.Drawing.Point(671, 99);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(672, 33);
+ this.layoutControlItem16.Text = "杩濊绫诲埆";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fgCheckBy;
+ this.layoutControlItem8.Location = new System.Drawing.Point(671, 66);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fgCheckDatet;
+ this.layoutControlItem14.Location = new System.Drawing.Point(1007, 66);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlItem14.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -1289,55 +1341,15 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem16
+ // gridColumn19
//
- this.layoutControlItem16.Control = this.txt_msg;
- this.layoutControlItem16.Location = new System.Drawing.Point(660, 99);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(662, 33);
- this.layoutControlItem16.Text = "杩濊绫诲埆";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
- //
- // txt_fgCheckBy
- //
- this.txt_fgCheckBy.Location = new System.Drawing.Point(759, 76);
- this.txt_fgCheckBy.Name = "txt_fgCheckBy";
- this.txt_fgCheckBy.Size = new System.Drawing.Size(239, 24);
- this.txt_fgCheckBy.StyleController = this.layoutMx1;
- this.txt_fgCheckBy.TabIndex = 248;
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fgCheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(660, 66);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
- this.layoutControlItem8.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
- //
- // txt_fgCheckDatet
- //
- this.txt_fgCheckDatet.Location = new System.Drawing.Point(1089, 76);
- this.txt_fgCheckDatet.Name = "txt_fgCheckDatet";
- this.txt_fgCheckDatet.Size = new System.Drawing.Size(241, 24);
- this.txt_fgCheckDatet.StyleController = this.layoutMx1;
- this.txt_fgCheckDatet.TabIndex = 249;
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fgCheckDatet;
- this.layoutControlItem14.Location = new System.Drawing.Point(990, 66);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem14.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ this.gridColumn19.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn19.FieldName = "fSubsidiary";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 12;
+ this.gridColumn19.Width = 94;
//
// Frm_WomFanGong
//
@@ -1382,6 +1394,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).EndInit();
@@ -1398,6 +1412,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1410,11 +1427,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fgCheckDatet.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
this.ResumeLayout(false);
}
@@ -1517,5 +1529,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
index b296300..0d06b0f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -13,6 +13,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -212,7 +213,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and daa.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
--
Gitblit v1.9.3