From c2d73fe7167e6006acd69ad09491e75463eb611a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 12 十一月 2024 13:53:20 +0800
Subject: [PATCH] 各种细节
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 7 +-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 87 ++++++++++++++++------------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 39 +++++++++---
3 files changed, 82 insertions(+), 51 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index da4fd25..514cc7b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -73,7 +73,6 @@
this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_foneChecked = new DevExpress.XtraEditors.LabelControl();
this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_name1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_memo = new DevExpress.XtraEditors.LabelControl();
@@ -82,6 +81,8 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -414,6 +415,7 @@
//
// txt_itemNo
//
+ this.txt_itemNo.Enabled = false;
this.txt_itemNo.Location = new System.Drawing.Point(85, 55);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -442,7 +444,7 @@
this.gv_isenabled.OptionsColumn.AllowEdit = false;
this.gv_isenabled.Tag = "query_a.ISENABLED";
this.gv_isenabled.Visible = true;
- this.gv_isenabled.VisibleIndex = 0;
+ this.gv_isenabled.VisibleIndex = 1;
this.gv_isenabled.Width = 94;
//
// lb_fversion
@@ -469,13 +471,13 @@
this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fversion.AppearanceCell.Options.UseFont = true;
this.gv_fversion.Caption = "鐗堟湰";
- this.gv_fversion.FieldName = "fVersion";
+ this.gv_fversion.FieldName = "fversion";
this.gv_fversion.MinWidth = 50;
this.gv_fversion.Name = "gv_fversion";
this.gv_fversion.OptionsColumn.AllowEdit = false;
this.gv_fversion.Tag = "query_a.FVERSION";
this.gv_fversion.Visible = true;
- this.gv_fversion.VisibleIndex = 8;
+ this.gv_fversion.VisibleIndex = 9;
this.gv_fversion.Width = 94;
//
// lb_ftwoCheckdate
@@ -523,13 +525,13 @@
this.gv_ftwoCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
this.gv_ftwoCheckor.Caption = "鎵瑰噯浜�";
- this.gv_ftwoCheckor.FieldName = "fTwoCheckor";
+ this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
this.gv_ftwoCheckor.MinWidth = 50;
this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
this.gv_ftwoCheckor.Visible = true;
- this.gv_ftwoCheckor.VisibleIndex = 11;
+ this.gv_ftwoCheckor.VisibleIndex = 12;
this.gv_ftwoCheckor.Width = 94;
//
// lb_ftwoChecked
@@ -553,7 +555,7 @@
this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
this.gv_ftwoChecked.Tag = "query_a.FTWO_CHECKED";
this.gv_ftwoChecked.Visible = true;
- this.gv_ftwoChecked.VisibleIndex = 2;
+ this.gv_ftwoChecked.VisibleIndex = 3;
this.gv_ftwoChecked.Width = 94;
//
// lb_foneCheckdate
@@ -581,13 +583,13 @@
this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿";
- this.gv_foneCheckdate.FieldName = "fOneCheckDate";
+ this.gv_foneCheckdate.FieldName = "foneCheckdate";
this.gv_foneCheckdate.MinWidth = 50;
this.gv_foneCheckdate.Name = "gv_foneCheckdate";
this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
this.gv_foneCheckdate.Visible = true;
- this.gv_foneCheckdate.VisibleIndex = 10;
+ this.gv_foneCheckdate.VisibleIndex = 11;
this.gv_foneCheckdate.Width = 94;
//
// lb_foneCheckor
@@ -615,13 +617,13 @@
this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
this.gv_foneCheckor.Caption = "瀹℃牳浜�";
- this.gv_foneCheckor.FieldName = "fOneCheckor";
+ this.gv_foneCheckor.FieldName = "foneCheckor";
this.gv_foneCheckor.MinWidth = 50;
this.gv_foneCheckor.Name = "gv_foneCheckor";
this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
this.gv_foneCheckor.Visible = true;
- this.gv_foneCheckor.VisibleIndex = 9;
+ this.gv_foneCheckor.VisibleIndex = 10;
this.gv_foneCheckor.Width = 94;
//
// lb_foneChecked
@@ -645,22 +647,8 @@
this.gv_foneChecked.OptionsColumn.AllowEdit = false;
this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
this.gv_foneChecked.Visible = true;
- this.gv_foneChecked.VisibleIndex = 1;
+ this.gv_foneChecked.VisibleIndex = 2;
this.gv_foneChecked.Width = 94;
- //
- // gv_name1
- //
- this.gv_name1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_name1.AppearanceCell.Options.UseFont = true;
- this.gv_name1.Caption = "瑙勬牸鍨嬪彿";
- this.gv_name1.FieldName = "name1";
- this.gv_name1.MinWidth = 50;
- this.gv_name1.Name = "gv_name1";
- this.gv_name1.OptionsColumn.AllowEdit = false;
- this.gv_name1.Tag = "query_a.NAME1";
- this.gv_name1.Visible = true;
- this.gv_name1.VisibleIndex = 6;
- this.gv_name1.Width = 94;
//
// lb_itemNo
//
@@ -683,7 +671,7 @@
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.ITEM_NO";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 3;
+ this.gv_itemNo.VisibleIndex = 5;
this.gv_itemNo.Width = 150;
//
// lb_memo
@@ -716,7 +704,7 @@
this.gv_memo.OptionsColumn.AllowEdit = false;
this.gv_memo.Tag = "query_a.MEMO";
this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 13;
+ this.gv_memo.VisibleIndex = 14;
this.gv_memo.Width = 94;
//
// toolBarMenu1
@@ -750,13 +738,14 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn8,
this.gv_isenabled,
this.gv_foneChecked,
this.gv_ftwoChecked,
+ this.gridColumn7,
this.gv_itemNo,
this.gridColumn3,
this.gridColumn2,
- this.gv_name1,
this.gv_fversion,
this.gv_foneCheckor,
this.gv_foneCheckdate,
@@ -771,37 +760,59 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "浣跨敤缁勭粐";
+ this.gridColumn8.FieldName = "fSubsidiary";
+ this.gridColumn8.MinWidth = 250;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.AllowEdit = false;
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 0;
+ this.gridColumn8.Width = 250;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鐗╂枡ID";
+ this.gridColumn7.FieldName = "itemId";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.AllowEdit = false;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 4;
+ this.gridColumn7.Width = 94;
+ //
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn3.FieldName = "itemName";
+ this.gridColumn3.FieldName = "mc";
this.gridColumn3.MinWidth = 250;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 4;
+ this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 250;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn2.FieldName = "itemModel";
+ this.gridColumn2.FieldName = "gg";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 94;
//
// gridColumn1
//
this.gridColumn1.Caption = "鍒朵綔浜�";
- this.gridColumn1.FieldName = "userName";
+ this.gridColumn1.FieldName = "createBy";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 12;
+ this.gridColumn1.VisibleIndex = 13;
this.gridColumn1.Width = 94;
//
// gridColumn4
@@ -812,7 +823,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.AllowEdit = false;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 7;
+ this.gridColumn4.VisibleIndex = 8;
this.gridColumn4.Width = 94;
//
// xtraTabControl1
@@ -919,6 +930,7 @@
//
// txt_itemModel
//
+ this.txt_itemModel.Enabled = false;
this.txt_itemModel.Location = new System.Drawing.Point(85, 95);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1120,7 +1132,6 @@
private DevExpress.XtraEditors.LabelControl lb_foneChecked;
private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
- private DevExpress.XtraGrid.Columns.GridColumn gv_name1;
private DevExpress.XtraEditors.LabelControl lb_itemNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
@@ -1150,5 +1161,7 @@
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 777eaf2..e81dc1c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -297,11 +297,12 @@
var _obj = new MesQmCheckitem
{
Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- ItemId= long.Parse( _ItemId),
+ ItemId = long.Parse(_ItemId),
Memo = txt_memo.Text.Trim(),
ItemNo = txt_itemNo.Text.Trim(),
Isenabled = txt_isenabled.Checked,
- Ftype= "1",
+ Ftype = "1",
+ Fversion =Gs.DevApp.ToolBox.UtilityHelper.ToLong( txt_fversion.Text.Trim()),
list = lst
};
try
@@ -341,7 +342,7 @@
itm.fileValue + "'");
var pgq = new PageQueryModel(curPage, pageSize,
- "create_date", "asc", "", _sbSqlWhere.ToString());
+ "a.create_date", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 0694dd6..428834f 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -283,8 +283,10 @@
{
isEdt = !isEdt;
if (gridViews != null)
- foreach (var gv in gridViews) {
- foreach (GridColumn colmn in gv.Columns) {
+ foreach (var gv in gridViews)
+ {
+ foreach (GridColumn colmn in gv.Columns)
+ {
if (colmn.Name.ToString().Contains("gvMxDel"))
{
colmn.Visible = !isEdt;
@@ -293,8 +295,9 @@
}
gv.OptionsBehavior.Editable = !isEdt;
}
- var _btnAry= controls.Find("btnSelect", false);
- if (_btnAry.Length > 0) {
+ var _btnAry = controls.Find("btnSelect", false);
+ if (_btnAry.Length > 0)
+ {
var _btnType = _btnAry[0];
_btnType.Enabled = !isEdt;
}
@@ -389,7 +392,7 @@
txt.ReadOnly = isEdt;
continue;
}
-
+
//鏁板瓧鍗�
if (colType is NumericUpDown)
{
@@ -457,9 +460,9 @@
var txt = colType as Label;
if (_dddddd == "txt_checkStatus")
{
- if (strVal == "True" || strVal=="1")
+ if (strVal == "True" || strVal == "1")
txt.Text = "宸插鏍�";
- if (strVal == "False" || strVal=="0" || strVal=="")
+ if (strVal == "False" || strVal == "0" || strVal == "")
txt.Text = "鏈鏍�";
}
else
@@ -471,7 +474,7 @@
if (colType is UcLookCk)
{
var txt = colType as UcLookCk;
- txt.SetIdOrCode( strVal);
+ txt.SetIdOrCode(strVal);
txt.Enabled = !isEdt;
continue;
}
@@ -695,7 +698,8 @@
}
//鍗曢��
- if (ctrl is CheckBox) {
+ if (ctrl is CheckBox)
+ {
ctrl.Enabled = !isEdt;
continue;
}
@@ -808,10 +812,23 @@
return Guid.Parse(str);
}
- public static int ToInt(string str) {
+ public static int ToInt(string str)
+ {
try
{
return int.Parse(str);
+ }
+ catch (Exception)
+ {
+
+ return 0;
+ }
+ }
+ public static long ToLong(string str)
+ {
+ try
+ {
+ return long.Parse(str);
}
catch (Exception)
{
@@ -852,7 +869,7 @@
else
{
_strGuid = dr["guid"].ToString();
- _strName = dr[1].ToString();
+ _strName = dr[1].ToString();
}
}
--
Gitblit v1.9.3