From 80fca75dc87026fc0ef2a634e1f08927339cde8a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 14 四月 2025 08:10:34 +0800
Subject: [PATCH] 打印计算
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 4
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 15 +-
DevApp/Gs.DevApp/Gs.DevApp.csproj | 6
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 103 +++++++-------
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.Designer.cs | 111 ++++-----------
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs | 38 +++--
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 98 +++++++-------
DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.resx | 0
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 2
10 files changed, 167 insertions(+), 212 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index 5faee6b..66a1e9c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -577,7 +577,6 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1746, 570);
- this.splitMx1.SplitterPosition = 148;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -604,7 +603,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(898, 472, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1746, 148);
+ this.layoutMx1.Size = new System.Drawing.Size(1746, 100);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -621,112 +620,112 @@
this.txt_sampleSizeNo.Location = new System.Drawing.Point(84, 12);
this.txt_sampleSizeNo.Name = "txt_sampleSizeNo";
this.txt_sampleSizeNo.Properties.Appearance.Options.UseFont = true;
- this.txt_sampleSizeNo.Size = new System.Drawing.Size(355, 24);
+ this.txt_sampleSizeNo.Size = new System.Drawing.Size(350, 24);
this.txt_sampleSizeNo.StyleController = this.layoutMx1;
this.txt_sampleSizeNo.TabIndex = 226;
//
// txt_sampleSizeName
//
- this.txt_sampleSizeName.Location = new System.Drawing.Point(84, 54);
+ this.txt_sampleSizeName.Location = new System.Drawing.Point(84, 40);
this.txt_sampleSizeName.Name = "txt_sampleSizeName";
this.txt_sampleSizeName.Properties.Appearance.Options.UseFont = true;
- this.txt_sampleSizeName.Size = new System.Drawing.Size(355, 24);
+ this.txt_sampleSizeName.Size = new System.Drawing.Size(350, 24);
this.txt_sampleSizeName.StyleController = this.layoutMx1;
this.txt_sampleSizeName.TabIndex = 228;
//
// txt_fversion
//
- this.txt_fversion.Location = new System.Drawing.Point(515, 97);
+ this.txt_fversion.Location = new System.Drawing.Point(510, 68);
this.txt_fversion.Name = "txt_fversion";
this.txt_fversion.Properties.Appearance.Options.UseFont = true;
- this.txt_fversion.Size = new System.Drawing.Size(355, 24);
+ this.txt_fversion.Size = new System.Drawing.Size(350, 24);
this.txt_fversion.StyleController = this.layoutMx1;
this.txt_fversion.TabIndex = 273;
//
// txt_ftwoCheckdate
//
- this.txt_ftwoCheckdate.Location = new System.Drawing.Point(946, 54);
+ this.txt_ftwoCheckdate.Location = new System.Drawing.Point(936, 40);
this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckdate.Size = new System.Drawing.Size(355, 24);
+ this.txt_ftwoCheckdate.Size = new System.Drawing.Size(350, 24);
this.txt_ftwoCheckdate.StyleController = this.layoutMx1;
this.txt_ftwoCheckdate.TabIndex = 262;
this.txt_ftwoCheckdate.Tag = "readOnly";
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(84, 97);
+ this.txt_memo.Location = new System.Drawing.Point(84, 68);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(355, 24);
+ this.txt_memo.Size = new System.Drawing.Size(350, 24);
this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 231;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(515, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(510, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(355, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(350, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 213;
this.txt_createBy.Tag = "readOnly";
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(1377, 54);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(1362, 40);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(357, 24);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(351, 24);
this.txt_foneCheckdate.StyleController = this.layoutMx1;
this.txt_foneCheckdate.TabIndex = 247;
this.txt_foneCheckdate.Tag = "readOnly";
//
// txt_ftwoCheckor
//
- this.txt_ftwoCheckor.Location = new System.Drawing.Point(946, 12);
+ this.txt_ftwoCheckor.Location = new System.Drawing.Point(936, 12);
this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_ftwoCheckor.Size = new System.Drawing.Size(355, 24);
+ this.txt_ftwoCheckor.Size = new System.Drawing.Size(350, 24);
this.txt_ftwoCheckor.StyleController = this.layoutMx1;
this.txt_ftwoCheckor.TabIndex = 258;
this.txt_ftwoCheckor.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(515, 54);
+ this.txt_createDate.Location = new System.Drawing.Point(510, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(355, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(350, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 216;
this.txt_createDate.Tag = "readOnly";
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(1377, 12);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(1362, 12);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckor.Size = new System.Drawing.Size(357, 24);
+ this.txt_foneCheckor.Size = new System.Drawing.Size(351, 24);
this.txt_foneCheckor.StyleController = this.layoutMx1;
this.txt_foneCheckor.TabIndex = 243;
this.txt_foneCheckor.Tag = "readOnly";
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(1305, 97);
+ this.txt_foneChecked.Location = new System.Drawing.Point(1290, 68);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "瀹℃牳鏃堕棿";
- this.txt_foneChecked.Size = new System.Drawing.Size(429, 24);
+ this.txt_foneChecked.Size = new System.Drawing.Size(423, 24);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 274;
//
// txt_ftwoChecked
//
- this.txt_ftwoChecked.Location = new System.Drawing.Point(874, 97);
+ this.txt_ftwoChecked.Location = new System.Drawing.Point(864, 68);
this.txt_ftwoChecked.Name = "txt_ftwoChecked";
this.txt_ftwoChecked.Properties.Caption = "鎵瑰噯鏍囪";
- this.txt_ftwoChecked.Size = new System.Drawing.Size(427, 24);
+ this.txt_ftwoChecked.Size = new System.Drawing.Size(422, 24);
this.txt_ftwoChecked.StyleController = this.layoutMx1;
this.txt_ftwoChecked.TabIndex = 275;
//
@@ -805,7 +804,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1746, 148);
+ this.Root.Size = new System.Drawing.Size(1725, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -813,112 +812,112 @@
this.layoutControlItem1.Control = this.txt_sampleSizeNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(431, 42);
+ this.layoutControlItem1.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem1.Text = "鏍囧噯缂栫爜";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_sampleSizeName;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 42);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(431, 43);
+ this.layoutControlItem2.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem2.Text = "鏍囧噯鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_memo;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 85);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(431, 43);
+ this.layoutControlItem3.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem3.Text = "澶囨敞淇℃伅";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_createBy;
- this.layoutControlItem4.Location = new System.Drawing.Point(431, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(426, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(431, 42);
+ this.layoutControlItem4.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem4.Text = "鍒朵綔浜�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createDate;
- this.layoutControlItem5.Location = new System.Drawing.Point(431, 42);
+ this.layoutControlItem5.Location = new System.Drawing.Point(426, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(431, 43);
+ this.layoutControlItem5.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem5.Text = "鍒朵綔鏃堕棿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fversion;
- this.layoutControlItem6.Location = new System.Drawing.Point(431, 85);
+ this.layoutControlItem6.Location = new System.Drawing.Point(426, 56);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(431, 43);
+ this.layoutControlItem6.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem6.Text = "鐗堟湰鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_ftwoCheckor;
- this.layoutControlItem7.Location = new System.Drawing.Point(862, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(852, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(431, 42);
+ this.layoutControlItem7.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem7.Text = "鎵瑰噯浜�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_ftwoCheckdate;
- this.layoutControlItem8.Location = new System.Drawing.Point(862, 42);
+ this.layoutControlItem8.Location = new System.Drawing.Point(852, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(431, 43);
+ this.layoutControlItem8.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem8.Text = "鎵瑰噯鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_foneCheckor;
- this.layoutControlItem9.Location = new System.Drawing.Point(1293, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(1278, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(433, 42);
+ this.layoutControlItem9.Size = new System.Drawing.Size(427, 28);
this.layoutControlItem9.Text = "瀹℃牳浜�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_foneCheckdate;
- this.layoutControlItem10.Location = new System.Drawing.Point(1293, 42);
+ this.layoutControlItem10.Location = new System.Drawing.Point(1278, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(433, 43);
+ this.layoutControlItem10.Size = new System.Drawing.Size(427, 28);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_foneChecked;
- this.layoutControlItem11.Location = new System.Drawing.Point(1293, 85);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1278, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(433, 43);
+ this.layoutControlItem11.Size = new System.Drawing.Size(427, 28);
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -926,11 +925,11 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_ftwoChecked;
- this.layoutControlItem12.Location = new System.Drawing.Point(862, 85);
+ this.layoutControlItem12.Location = new System.Drawing.Point(852, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(431, 43);
+ this.layoutControlItem12.Size = new System.Drawing.Size(426, 28);
this.layoutControlItem12.Text = "鎵瑰噯鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -941,7 +940,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1746, 410);
+ this.tabMx.Size = new System.Drawing.Size(1746, 458);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -951,7 +950,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1744, 378);
+ this.tabMxPage1.Size = new System.Drawing.Size(1744, 426);
this.tabMxPage1.Text = "鏍锋湰閲忓瓧鐮�";
//
// gcMx1
@@ -969,7 +968,7 @@
this.repositoryItemComboBox6,
this.repositoryItemComboBox7,
this.repositoryItemComboBox8});
- this.gcMx1.Size = new System.Drawing.Size(1744, 378);
+ this.gcMx1.Size = new System.Drawing.Size(1744, 426);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index a60c2d7..de25f00 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -492,7 +492,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
- gvMx1.BestFitColumns();
+ //gvMx1.BestFitColumns();
}
else
{
@@ -508,7 +508,7 @@
gcMx2.BindingContext = new BindingContext();
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
- gvMx2.BestFitColumns();
+ // gvMx2.BestFitColumns();
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 72c82d7..2d8979e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -19,7 +19,8 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
- public string strType = "";
+ public string strType = "";//iqc type
+ public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
public Jyxm(string _strType)
{
InitializeComponent();
@@ -38,12 +39,10 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
- //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒�1
- decimal _dfValue = 1;
if (strType == "iqc")
- _dfValue = 5;
+ dfValue = 5;
this.gvMx1.InitNewRow += (s, e) => {
- this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", _dfValue);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
int newIndex = gvMx1.DataRowCount + 1;
this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
};
@@ -117,7 +116,6 @@
parentForm = this.Parent as Form;
else
parentForm = this.Parent.Parent as Form;
-
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
@@ -315,7 +313,6 @@
//鍋囧涓変釜閮戒负绌洪�氳繃
if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
{
-
}
else
{
@@ -807,7 +804,9 @@
var _obj = new
{
sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- itemGuids = _sbGuids.ToString()
+ itemGuids = _sbGuids.ToString(),
+ iqcType=this.strType,
+ ypsl=this.dfValue
};
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.Designer.cs
similarity index 75%
rename from DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.Designer.cs
index beb6faf..ba7e919 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.Designer.cs
@@ -31,23 +31,17 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
this.SuspendLayout();
@@ -55,12 +49,11 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-
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(1112, 609);
- this.gcMain.TabIndex = 1;
+ this.gcMain.Size = new System.Drawing.Size(1114, 641);
+ this.gcMain.TabIndex = 4;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
@@ -68,12 +61,10 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_guid,
- this.gv_chk,
this.gridColumn1,
this.gv2,
this.gv_salesOrderId,
@@ -84,33 +75,21 @@
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.MultiSelect = true;
+ this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// gv_guid
//
-
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "guid";
this.gv_guid.MinWidth = 50;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
- this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Tag = "a.guid";
this.gv_guid.Width = 94;
- //
- // gv_chk
- //
- this.gv_chk.Caption = "閫夋嫨";
- this.gv_chk.FieldName = "gvChk";
- this.gv_chk.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_chk.MaxWidth = 40;
- this.gv_chk.MinWidth = 40;
- this.gv_chk.Name = "gv_chk";
- this.gv_chk.Tag = "edit";
- this.gv_chk.Visible = true;
- this.gv_chk.VisibleIndex = 0;
- this.gv_chk.Width = 40;
//
// gridColumn1
//
@@ -120,59 +99,55 @@
this.gridColumn1.Tag = "org.FNumber";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 250;
+ this.gridColumn1.Width = 50;
//
// gv2
//
-
this.gv2.AppearanceCell.Options.UseFont = true;
this.gv2.Caption = "鐗╂枡ID";
this.gv2.FieldName = "id";
this.gv2.Name = "gv2";
this.gv2.OptionsColumn.AllowEdit = false;
- this.gv2.Tag = "query_a.id";
+ this.gv2.Tag = "a.id";
this.gv2.Visible = true;
this.gv2.VisibleIndex = 2;
- this.gv2.Width = 100;
+ this.gv2.Width = 50;
//
// gv_salesOrderId
//
-
this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
- this.gv_salesOrderId.Caption = "鐗╂枡缂栧彿";
+ this.gv_salesOrderId.Caption = "鐗╂枡缂栫爜";
this.gv_salesOrderId.FieldName = "itemNo";
this.gv_salesOrderId.Name = "gv_salesOrderId";
this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
- this.gv_salesOrderId.Tag = "query_a.item_no";
+ this.gv_salesOrderId.Tag = "a.item_no";
this.gv_salesOrderId.Visible = true;
this.gv_salesOrderId.VisibleIndex = 3;
- this.gv_salesOrderId.Width = 100;
+ this.gv_salesOrderId.Width = 50;
//
// gv_orderLineId
//
-
this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
this.gv_orderLineId.Caption = "鐗╂枡鍚嶇О";
this.gv_orderLineId.FieldName = "itemName";
this.gv_orderLineId.Name = "gv_orderLineId";
this.gv_orderLineId.OptionsColumn.AllowEdit = false;
- this.gv_orderLineId.Tag = "query_a.item_name";
+ this.gv_orderLineId.Tag = "a.item_name";
this.gv_orderLineId.Visible = true;
this.gv_orderLineId.VisibleIndex = 4;
- this.gv_orderLineId.Width = 200;
+ this.gv_orderLineId.Width = 50;
//
// gv_itemId
//
-
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡瑙勬牸";
this.gv_itemId.FieldName = "itemModel";
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
- this.gv_itemId.Tag = "query_a.item_model";
+ this.gv_itemId.Tag = "a.item_model";
this.gv_itemId.Visible = true;
this.gv_itemId.VisibleIndex = 5;
- this.gv_itemId.Width = 200;
+ this.gv_itemId.Width = 50;
//
// gridColumn2
//
@@ -180,43 +155,25 @@
this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn2.Caption = "閰嶇疆鎯呭喌";
- this.gridColumn2.FieldName = "yjxm";
+ this.gridColumn2.Caption = "閰嶇疆娆℃暟";
+ this.gridColumn2.FieldName = "jyxm";
this.gridColumn2.MaxWidth = 50;
this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 6;
this.gridColumn2.Width = 50;
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1114, 682);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.panelControl1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1112, 650);
- this.xtraTabPage1.Text = "璇烽�夋嫨闇�瑕佸鍏ョ殑鏁版嵁";
//
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Controls.Add(this.pageBar1);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 609);
+ this.panelControl1.Location = new System.Drawing.Point(0, 641);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1112, 41);
- this.panelControl1.TabIndex = 4;
+ this.panelControl1.Size = new System.Drawing.Size(1114, 41);
+ this.panelControl1.TabIndex = 5;
//
// btnIn
//
@@ -232,7 +189,7 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
- this.pageBar1.Location = new System.Drawing.Point(126, 2);
+ this.pageBar1.Location = new System.Drawing.Point(128, 2);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -245,7 +202,8 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1114, 682);
- this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.gcMain);
+ this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
@@ -255,29 +213,24 @@
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
+
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
- private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
- private DevExpress.XtraGrid.Columns.GridColumn gv2;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
- private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
- private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn gv2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private UserControls.Data.UcPageBar pageBar1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
similarity index 76%
rename from DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
rename to DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
index ad6e8ca..ce23021 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.cs
@@ -3,6 +3,7 @@
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
+using DevExpress.Charts.Native;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -14,32 +15,35 @@
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesQmCheckitemManager/";
- private string _inP2Type = "";
- public SelectCheckDt(string inP2Type)
+ private string _jyxm = "";
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="inJyxm">褰撲负锛歫yxm鏃讹紝缁熻妫�楠岄」鐩殑閰嶇疆娆℃暟</param>
+ public SelectCheckDt(string inJyxm)
{
InitializeComponent();
- _inP2Type = inP2Type;
+ _jyxm = inJyxm;
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
btnIn.Click += (s, e) =>
{
var list = new List<dynamic>();
- for (var i = 0; i < gridView1.DataRowCount; i++)
+ int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
+ DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
+ foreach (int idx in rows)
{
- var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
- if (checkBox == "Checked")
+ list.Add(new
{
- list.Add(new
- {
- guid = gridView1.GetRowCellValue(i, "guid").ToString(),
- fSubsidiary = gridView1.GetRowCellValue(i, "fSubsidiary").ToString(),
- id = gridView1.GetRowCellValue(i, "id").ToString(),
- itemNo = gridView1.GetRowCellValue(i, "itemNo").ToString(),
- itemName = gridView1.GetRowCellValue(i, "itemName").ToString(),
- itemModel = gridView1.GetRowCellValue(i, "itemModel").ToString(),
- });
- }
+ guid = dt.Rows[idx]["guid"].ToString(),
+ fSubsidiary = dt.Rows[idx]["fSubsidiary"].ToString(),
+ id = dt.Rows[idx]["id"].ToString(),
+ itemNo = dt.Rows[idx]["itemNo"].ToString(),
+ itemName = dt.Rows[idx]["itemName"].ToString(),
+ itemModel = dt.Rows[idx]["itemModel"].ToString(),
+ });
}
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
Close();
@@ -74,7 +78,7 @@
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), _inP2Type);
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), _jyxm);
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCheckDt.resx b/DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.resx
similarity index 100%
rename from DevApp/Gs.DevApp/UserControl/SelectCheckDt.resx
rename to DevApp/Gs.DevApp/DevFrm/QC/SelectCheckDt.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 55e67cc..6e2735c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -30,24 +30,24 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = 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.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.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -750,32 +750,32 @@
this.layoutControlItem12});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ 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[] {
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1105, 144);
this.Root.TextVisible = false;
//
@@ -1138,10 +1138,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
@@ -1303,7 +1303,7 @@
this.labelControl10.Name = "labelControl10";
this.labelControl10.Size = new System.Drawing.Size(105, 18);
this.labelControl10.TabIndex = 219;
- this.labelControl10.Text = "鏈鏀惰揣鎬婚噺锛�";
+ this.labelControl10.Text = "鏈鐢宠鎬婚噺锛�";
//
// txtWlgg
//
@@ -1506,10 +1506,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index 664aa6a..7af0861 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -681,7 +681,7 @@
txtWlid.Text = row["tld002"].ToString();
txtWlgg.Text = row["tld004"].ToString();
txtWlmc.Text = row["tld003"].ToString();
- txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
+ txtQuantity.Text = row["tld005"].ToString();//鐢宠鎬婚噺
txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
}
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 7e7d743..58725f4 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -889,10 +889,10 @@
<Compile Include="UserControl\SelectCgMx.Designer.cs">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\SelectCheckDt.cs">
+ <Compile Include="DevFrm\QC\SelectCheckDt.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="UserControl\SelectCheckDt.Designer.cs">
+ <Compile Include="DevFrm\QC\SelectCheckDt.Designer.cs">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\SelectCk.cs">
@@ -1485,7 +1485,7 @@
<EmbeddedResource Include="UserControl\SelectCgMx.resx">
<DependentUpon>SelectCgMx.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\SelectCheckDt.resx">
+ <EmbeddedResource Include="DevFrm\QC\SelectCheckDt.resx">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCk.resx">
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 44b6ce0..fa37f22 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1746,7 +1746,7 @@
column.OptionsColumn.ReadOnly = false;
else
//column.OptionsColumn.ReadOnly = true;
- column.OptionsColumn.ReadOnly = !isPostSearch;
+ column.OptionsColumn.ReadOnly = isPostSearch;
if (isPostSearch == true)
{
--
Gitblit v1.9.3