From 0ffdbecef5e35c6b77972f8a207b94a5b509613a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 27 十一月 2024 14:16:12 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 100 +++-----------------------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 10 +--
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 60 ++++++++++----------
3 files changed, 45 insertions(+), 125 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 36f679a..2f41e36 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -119,21 +119,15 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_caa021 = new Gs.DevApp.UserControl.UcLookWorkshop();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -1187,13 +1181,7 @@
this.gv_caa018,
this.gridColumn6,
this.gridColumn5,
- this.gridColumn4,
- this.gridColumn9,
- this.gridColumn8,
- this.gridColumn7,
- this.gridColumn10,
- this.gridColumn12,
- this.gridColumn11});
+ this.gridColumn4});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -1274,66 +1262,6 @@
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 33;
this.gridColumn4.Width = 94;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "妯″叿缂栫爜";
- this.gridColumn9.MinWidth = 80;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.OptionsColumn.AllowEdit = false;
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 34;
- this.gridColumn9.Width = 94;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "妯″叿鍚嶇О";
- this.gridColumn8.MinWidth = 100;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.OptionsColumn.AllowEdit = false;
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 35;
- this.gridColumn8.Width = 100;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "妯″叿瑙勬牸";
- this.gridColumn7.MinWidth = 100;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.OptionsColumn.AllowEdit = false;
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 36;
- this.gridColumn7.Width = 100;
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "妯″叿鐘舵��";
- this.gridColumn10.MinWidth = 50;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.OptionsColumn.AllowEdit = false;
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 37;
- this.gridColumn10.Width = 94;
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "妯″叿搴撲綅鍚嶇О";
- this.gridColumn12.MinWidth = 100;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.OptionsColumn.AllowEdit = false;
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 38;
- this.gridColumn12.Width = 100;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "妯″叿搴撲綅";
- this.gridColumn11.MinWidth = 80;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.OptionsColumn.AllowEdit = false;
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 39;
- this.gridColumn11.Width = 94;
//
// xtraTabControl1
//
@@ -1430,6 +1358,15 @@
this.panel1.Size = new System.Drawing.Size(1126, 200);
this.panel1.TabIndex = 1;
//
+ // txt_caa021
+ //
+ this.txt_caa021.IsReadly = false;
+ this.txt_caa021.KeyFile = "";
+ this.txt_caa021.Location = new System.Drawing.Point(85, 81);
+ this.txt_caa021.Name = "txt_caa021";
+ this.txt_caa021.Size = new System.Drawing.Size(160, 29);
+ this.txt_caa021.TabIndex = 451;
+ //
// labelControl11
//
this.labelControl11.Location = new System.Drawing.Point(905, 150);
@@ -1446,15 +1383,6 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
- //
- // txt_caa021
- //
- this.txt_caa021.IsReadly = false;
- this.txt_caa021.KeyFile = "";
- this.txt_caa021.Location = new System.Drawing.Point(85, 81);
- this.txt_caa021.Name = "txt_caa021";
- this.txt_caa021.Size = new System.Drawing.Size(160, 29);
- this.txt_caa021.TabIndex = 451;
//
// Frm_Womcaa
//
@@ -1603,12 +1531,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 901e554..eff897b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ 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();
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -99,6 +99,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -112,7 +113,6 @@
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
@@ -211,7 +211,7 @@
this.gvMx1daa026.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1daa026.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa026.Caption = "鎹㈢嚎鏃堕棿";
- this.gvMx1daa026.FieldName = "changeLinetime";
+ this.gvMx1daa026.FieldName = "changeLineTime";
this.gvMx1daa026.MinWidth = 50;
this.gvMx1daa026.Name = "gvMx1daa026";
this.gvMx1daa026.Tag = "query_a.daa026";
@@ -754,10 +754,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -793,7 +793,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 1;
+ this.gv_checkUser.VisibleIndex = 2;
this.gv_checkUser.Width = 94;
//
// lb_checkDate
@@ -827,7 +827,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 5;
+ this.gv_checkDate.VisibleIndex = 3;
this.gv_checkDate.Width = 94;
//
// lb_fstatus
@@ -851,7 +851,7 @@
this.gv_fstatus.OptionsColumn.AllowEdit = false;
this.gv_fstatus.Tag = "query_a.fstatus";
this.gv_fstatus.Visible = true;
- this.gv_fstatus.VisibleIndex = 2;
+ this.gv_fstatus.VisibleIndex = 1;
this.gv_fstatus.Width = 94;
//
// lb_pba013
@@ -884,7 +884,7 @@
this.gv_pba013.OptionsColumn.AllowEdit = false;
this.gv_pba013.Tag = "query_a.pba013";
this.gv_pba013.Visible = true;
- this.gv_pba013.VisibleIndex = 8;
+ this.gv_pba013.VisibleIndex = 7;
this.gv_pba013.Width = 94;
//
// lb_pba010
@@ -936,7 +936,7 @@
this.gv_pba009.OptionsColumn.AllowEdit = false;
this.gv_pba009.Tag = "query_a.pba009";
this.gv_pba009.Visible = true;
- this.gv_pba009.VisibleIndex = 7;
+ this.gv_pba009.VisibleIndex = 6;
this.gv_pba009.Width = 94;
//
// gv_pba006
@@ -950,7 +950,7 @@
this.gv_pba006.OptionsColumn.AllowEdit = false;
this.gv_pba006.Tag = "query_a.pba006";
this.gv_pba006.Visible = true;
- this.gv_pba006.VisibleIndex = 4;
+ this.gv_pba006.VisibleIndex = 5;
this.gv_pba006.Width = 94;
//
// gv_pba005
@@ -964,7 +964,7 @@
this.gv_pba005.OptionsColumn.AllowEdit = false;
this.gv_pba005.Tag = "query_a.pba005";
this.gv_pba005.Visible = true;
- this.gv_pba005.VisibleIndex = 6;
+ this.gv_pba005.VisibleIndex = 4;
this.gv_pba005.Width = 94;
//
// lb_pba001
@@ -1020,9 +1020,9 @@
this.gridColumn2,
this.gv_fstatus,
this.gv_checkUser,
- this.gv_pba006,
this.gv_checkDate,
this.gv_pba005,
+ this.gv_pba006,
this.gv_pba009,
this.gv_pba013,
this.gridColumn1});
@@ -1033,13 +1033,24 @@
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鎺掍骇鍗曞彿";
+ this.gridColumn2.FieldName = "hNo";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.AllowEdit = false;
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 0;
+ this.gridColumn2.Width = 94;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "杞﹂棿鍚嶇О";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 9;
+ this.gridColumn1.VisibleIndex = 8;
this.gridColumn1.Width = 94;
//
// xtraTabControl1
@@ -1178,17 +1189,6 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "鎺掍骇鍗曞彿";
- this.gridColumn2.FieldName = "hNo";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.OptionsColumn.AllowEdit = false;
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 94;
//
// Frm_Wompba
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 90b13f5..b853d73 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -138,14 +138,15 @@
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_hNo, gridView1);
+ lbGuid, txt_hNo, gridView1, "hNo");
//toolBarMenu1.guidKey = rowGuid;
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- //MsgHelper.Warning(rowGuid);
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾瀹℃牳鍚楋紵"))
+ return;
UcLoading _loading = new UcLoading();
var _obj = new
{
@@ -157,16 +158,13 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
getModel(lbGuid.Text.Trim(), false, 999);
else
getPageList(1, UtilityHelper.GetPageSize());
- }
- else
- {
- MsgHelper.Warning(_rtn.rtnMsg);
}
}
catch (Exception ex)
--
Gitblit v1.9.3