From b5c94ca50cb2497096111c3abaaa874691d3b0bb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 26 十一月 2024 18:16:44 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 16 -
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 162 +++++++++++++++++++++-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 197 ++++++++++++++++-----------
3 files changed, 272 insertions(+), 103 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 6d8d475..0c83d23 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -342,25 +342,19 @@
{
var dataTable = new DataTable();
dataTable.Columns.Add("docCode", typeof(string));
- dataTable.Rows.Add("DH(閲囪喘鍒拌揣鍗�)");
- dataTable.Rows.Add("JY(妫�楠岀敵璇峰崟)");
+ dataTable.Rows.Add("DH(鍒拌揣鍗�)");
+ dataTable.Rows.Add("JY(妫�楠屽崟)");
dataTable.Rows.Add("TL(閲囪喘閫�鏂欏崟)");
dataTable.Rows.Add("IN(鍏ュ簱鍗�)");
- //dataTable.Rows.Add("PO(閲囪喘璁㈠崟)");
+ dataTable.Rows.Add("PB(鎵归噺鎺掍骇)");
+ dataTable.Rows.Add("SC(鐢熶骇宸ュ崟)");
//dataTable.Rows.Add("IA(搴撳瓨璋冩暣)");
//dataTable.Rows.Add("IO(鍑哄簱鍗�)");
//dataTable.Rows.Add("AR(搴旀敹娆�)");
- //dataTable.Rows.Add("SO(閿�鍞鍗�)");
- //dataTable.Rows.Add("AP(搴斾粯娆�)");
- //dataTable.Rows.Add("IV(閿�鍞彂绁�)");
- //dataTable.Rows.Add("IV(閿�鍞彂绁�)");
- //dataTable.Rows.Add("IN(鍏ュ簱)");
- //dataTable.Rows.Add("PN(鐢熶骇搴�)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
- txt_docCode.Properties.TextEditStyle =
- TextEditStyles.DisableTextEditor;
+ txt_docCode.Properties.TextEditStyle =TextEditStyles.DisableTextEditor;
}
private void Txt_flagIncludeDocCode_CheckedChanged(object sender,
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index fef9cd2..901e554 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,6 +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();
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -69,6 +74,8 @@
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.aboutGuid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.lb_checkUser = new DevExpress.XtraEditors.LabelControl();
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -89,7 +96,6 @@
this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_pba001 = new DevExpress.XtraEditors.LabelControl();
this.txt_pba016 = new DevExpress.XtraEditors.TextEdit();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -100,12 +106,13 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
+ 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();
@@ -113,6 +120,7 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba013.Properties)).BeginInit();
@@ -128,8 +136,8 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1machineNo
@@ -147,7 +155,7 @@
this.gvMx1machineNo.Name = "gvMx1machineNo";
this.gvMx1machineNo.Tag = "query_a.machine_no";
this.gvMx1machineNo.Visible = true;
- this.gvMx1machineNo.VisibleIndex = 34;
+ this.gvMx1machineNo.VisibleIndex = 35;
this.gvMx1machineNo.Width = 250;
//
// repositoryItemDateEdit1
@@ -173,7 +181,7 @@
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "query_a.reporttime";
this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 33;
+ this.gvMx1reporttime.VisibleIndex = 34;
this.gvMx1reporttime.Width = 94;
//
// gvMx1isReportcheck
@@ -191,7 +199,7 @@
this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
this.gvMx1isReportcheck.Visible = true;
- this.gvMx1isReportcheck.VisibleIndex = 32;
+ this.gvMx1isReportcheck.VisibleIndex = 33;
this.gvMx1isReportcheck.Width = 94;
//
// gvMx1daa026
@@ -208,7 +216,7 @@
this.gvMx1daa026.Name = "gvMx1daa026";
this.gvMx1daa026.Tag = "query_a.daa026";
this.gvMx1daa026.Visible = true;
- this.gvMx1daa026.VisibleIndex = 31;
+ this.gvMx1daa026.VisibleIndex = 32;
this.gvMx1daa026.Width = 94;
//
// gvMx1daa025
@@ -222,7 +230,7 @@
this.gvMx1daa025.OptionsColumn.ReadOnly = true;
this.gvMx1daa025.Tag = "query_a.daa025";
this.gvMx1daa025.Visible = true;
- this.gvMx1daa025.VisibleIndex = 30;
+ this.gvMx1daa025.VisibleIndex = 31;
this.gvMx1daa025.Width = 94;
//
// gvMx1daa024
@@ -236,7 +244,7 @@
this.gvMx1daa024.OptionsColumn.ReadOnly = true;
this.gvMx1daa024.Tag = "query_a.daa024";
this.gvMx1daa024.Visible = true;
- this.gvMx1daa024.VisibleIndex = 29;
+ this.gvMx1daa024.VisibleIndex = 30;
this.gvMx1daa024.Width = 94;
//
// gvMx1daa023
@@ -250,7 +258,7 @@
this.gvMx1daa023.OptionsColumn.ReadOnly = true;
this.gvMx1daa023.Tag = "query_a.daa023";
this.gvMx1daa023.Visible = true;
- this.gvMx1daa023.VisibleIndex = 28;
+ this.gvMx1daa023.VisibleIndex = 29;
this.gvMx1daa023.Width = 94;
//
// gvMx1daa022
@@ -264,7 +272,7 @@
this.gvMx1daa022.OptionsColumn.ReadOnly = true;
this.gvMx1daa022.Tag = "query_a.daa022";
this.gvMx1daa022.Visible = true;
- this.gvMx1daa022.VisibleIndex = 27;
+ this.gvMx1daa022.VisibleIndex = 28;
this.gvMx1daa022.Width = 94;
//
// gvMx1daa021
@@ -278,7 +286,7 @@
this.gvMx1daa021.OptionsColumn.ReadOnly = true;
this.gvMx1daa021.Tag = "query_a.daa021";
this.gvMx1daa021.Visible = true;
- this.gvMx1daa021.VisibleIndex = 26;
+ this.gvMx1daa021.VisibleIndex = 27;
this.gvMx1daa021.Width = 94;
//
// gvMx1daa020
@@ -292,7 +300,7 @@
this.gvMx1daa020.OptionsColumn.ReadOnly = true;
this.gvMx1daa020.Tag = "query_a.daa020";
this.gvMx1daa020.Visible = true;
- this.gvMx1daa020.VisibleIndex = 25;
+ this.gvMx1daa020.VisibleIndex = 26;
this.gvMx1daa020.Width = 94;
//
// gvMx1checkUser
@@ -306,7 +314,7 @@
this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
this.gvMx1checkUser.Tag = "query_a.check_user";
this.gvMx1checkUser.Visible = true;
- this.gvMx1checkUser.VisibleIndex = 24;
+ this.gvMx1checkUser.VisibleIndex = 25;
this.gvMx1checkUser.Width = 94;
//
// gvMx1checkDate
@@ -320,7 +328,7 @@
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 23;
+ this.gvMx1checkDate.VisibleIndex = 24;
this.gvMx1checkDate.Width = 94;
//
// gvMx1fstatus
@@ -334,7 +342,7 @@
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
- this.gvMx1fstatus.VisibleIndex = 22;
+ this.gvMx1fstatus.VisibleIndex = 23;
this.gvMx1fstatus.Width = 94;
//
// gvMx1daa019
@@ -348,7 +356,7 @@
this.gvMx1daa019.OptionsColumn.ReadOnly = true;
this.gvMx1daa019.Tag = "query_a.daa019";
this.gvMx1daa019.Visible = true;
- this.gvMx1daa019.VisibleIndex = 21;
+ this.gvMx1daa019.VisibleIndex = 22;
this.gvMx1daa019.Width = 94;
//
// gvMx1daa018
@@ -361,7 +369,7 @@
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "query_a.daa018";
this.gvMx1daa018.Visible = true;
- this.gvMx1daa018.VisibleIndex = 20;
+ this.gvMx1daa018.VisibleIndex = 21;
this.gvMx1daa018.Width = 94;
//
// gvMx1daa017
@@ -378,7 +386,7 @@
this.gvMx1daa017.Name = "gvMx1daa017";
this.gvMx1daa017.Tag = "query_a.daa017";
this.gvMx1daa017.Visible = true;
- this.gvMx1daa017.VisibleIndex = 19;
+ this.gvMx1daa017.VisibleIndex = 20;
this.gvMx1daa017.Width = 94;
//
// gvMx1daa016
@@ -396,7 +404,7 @@
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "query_a.daa016";
this.gvMx1daa016.Visible = true;
- this.gvMx1daa016.VisibleIndex = 18;
+ this.gvMx1daa016.VisibleIndex = 19;
this.gvMx1daa016.Width = 200;
//
// repositoryItemDateEdit2
@@ -419,7 +427,7 @@
this.gvMx1daa014.OptionsColumn.ReadOnly = true;
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
- this.gvMx1daa014.VisibleIndex = 17;
+ this.gvMx1daa014.VisibleIndex = 18;
this.gvMx1daa014.Width = 94;
//
// gvMx1daa013
@@ -433,7 +441,7 @@
this.gvMx1daa013.OptionsColumn.ReadOnly = true;
this.gvMx1daa013.Tag = "query_a.daa013";
this.gvMx1daa013.Visible = true;
- this.gvMx1daa013.VisibleIndex = 16;
+ this.gvMx1daa013.VisibleIndex = 17;
this.gvMx1daa013.Width = 94;
//
// gvMx1daa012
@@ -450,7 +458,7 @@
this.gvMx1daa012.Name = "gvMx1daa012";
this.gvMx1daa012.Tag = "query_a.daa012";
this.gvMx1daa012.Visible = true;
- this.gvMx1daa012.VisibleIndex = 15;
+ this.gvMx1daa012.VisibleIndex = 16;
this.gvMx1daa012.Width = 94;
//
// gvMx1daa011
@@ -467,7 +475,7 @@
this.gvMx1daa011.Name = "gvMx1daa011";
this.gvMx1daa011.Tag = "query_a.daa011";
this.gvMx1daa011.Visible = true;
- this.gvMx1daa011.VisibleIndex = 14;
+ this.gvMx1daa011.VisibleIndex = 15;
this.gvMx1daa011.Width = 94;
//
// gvMx1daa010
@@ -481,7 +489,7 @@
this.gvMx1daa010.OptionsColumn.ReadOnly = true;
this.gvMx1daa010.Tag = "query_a.daa010";
this.gvMx1daa010.Visible = true;
- this.gvMx1daa010.VisibleIndex = 6;
+ this.gvMx1daa010.VisibleIndex = 7;
this.gvMx1daa010.Width = 100;
//
// gvMx1daa009
@@ -495,7 +503,7 @@
this.gvMx1daa009.OptionsColumn.ReadOnly = true;
this.gvMx1daa009.Tag = "query_a.daa009";
this.gvMx1daa009.Visible = true;
- this.gvMx1daa009.VisibleIndex = 13;
+ this.gvMx1daa009.VisibleIndex = 14;
this.gvMx1daa009.Width = 94;
//
// gvMx1daa008
@@ -509,7 +517,7 @@
this.gvMx1daa008.OptionsColumn.ReadOnly = true;
this.gvMx1daa008.Tag = "query_a.daa008";
this.gvMx1daa008.Visible = true;
- this.gvMx1daa008.VisibleIndex = 10;
+ this.gvMx1daa008.VisibleIndex = 11;
this.gvMx1daa008.Width = 94;
//
// gvMx1daa007
@@ -523,7 +531,7 @@
this.gvMx1daa007.OptionsColumn.ReadOnly = true;
this.gvMx1daa007.Tag = "query_a.daa007";
this.gvMx1daa007.Visible = true;
- this.gvMx1daa007.VisibleIndex = 12;
+ this.gvMx1daa007.VisibleIndex = 13;
this.gvMx1daa007.Width = 94;
//
// gvMx1daa006
@@ -537,7 +545,7 @@
this.gvMx1daa006.OptionsColumn.ReadOnly = true;
this.gvMx1daa006.Tag = "query_a.daa006";
this.gvMx1daa006.Visible = true;
- this.gvMx1daa006.VisibleIndex = 11;
+ this.gvMx1daa006.VisibleIndex = 12;
this.gvMx1daa006.Width = 94;
//
// gvMx1daa005
@@ -551,7 +559,7 @@
this.gvMx1daa005.OptionsColumn.ReadOnly = true;
this.gvMx1daa005.Tag = "query_a.daa005";
this.gvMx1daa005.Visible = true;
- this.gvMx1daa005.VisibleIndex = 9;
+ this.gvMx1daa005.VisibleIndex = 10;
this.gvMx1daa005.Width = 94;
//
// gvMx1daa004
@@ -565,7 +573,7 @@
this.gvMx1daa004.OptionsColumn.ReadOnly = true;
this.gvMx1daa004.Tag = "query_a.daa004";
this.gvMx1daa004.Visible = true;
- this.gvMx1daa004.VisibleIndex = 8;
+ this.gvMx1daa004.VisibleIndex = 9;
this.gvMx1daa004.Width = 150;
//
// gvMx1daa003
@@ -579,7 +587,7 @@
this.gvMx1daa003.OptionsColumn.ReadOnly = true;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
- this.gvMx1daa003.VisibleIndex = 7;
+ this.gvMx1daa003.VisibleIndex = 8;
this.gvMx1daa003.Width = 150;
//
// gvMx1daa002
@@ -593,7 +601,7 @@
this.gvMx1daa002.OptionsColumn.ReadOnly = true;
this.gvMx1daa002.Tag = "query_a.daa002";
this.gvMx1daa002.Visible = true;
- this.gvMx1daa002.VisibleIndex = 5;
+ this.gvMx1daa002.VisibleIndex = 6;
this.gvMx1daa002.Width = 100;
//
// gvMx1daa001
@@ -607,7 +615,7 @@
this.gvMx1daa001.OptionsColumn.ReadOnly = true;
this.gvMx1daa001.Tag = "query_a.daa001";
this.gvMx1daa001.Visible = true;
- this.gvMx1daa001.VisibleIndex = 4;
+ this.gvMx1daa001.VisibleIndex = 5;
this.gvMx1daa001.Width = 94;
//
// gvMx1pid
@@ -621,7 +629,7 @@
this.gvMx1pid.OptionsColumn.ReadOnly = true;
this.gvMx1pid.Tag = "query_a.pid";
this.gvMx1pid.Visible = true;
- this.gvMx1pid.VisibleIndex = 3;
+ this.gvMx1pid.VisibleIndex = 4;
this.gvMx1pid.Width = 94;
//
// gvMx1id
@@ -635,7 +643,7 @@
this.gvMx1id.OptionsColumn.ReadOnly = true;
this.gvMx1id.Tag = "query_a.id";
this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 2;
+ this.gvMx1id.VisibleIndex = 3;
this.gvMx1id.Width = 94;
//
// gvMx1guid
@@ -649,7 +657,7 @@
this.gvMx1guid.OptionsColumn.ReadOnly = true;
this.gvMx1guid.Tag = "query_a.guid";
this.gvMx1guid.Visible = true;
- this.gvMx1guid.VisibleIndex = 0;
+ this.gvMx1guid.VisibleIndex = 1;
this.gvMx1guid.Width = 94;
//
// tabMxPage1
@@ -667,7 +675,8 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit1,
- this.repositoryItemDateEdit2});
+ this.repositoryItemDateEdit2,
+ this.repositoryItemButtonEdit1});
this.gcMx1.Size = new System.Drawing.Size(1124, 381);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -681,6 +690,7 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.aboutGuid,
+ this.gvMxDel,
this.gvMx1id,
this.gvMx1pid,
this.gvMx1daa001,
@@ -728,8 +738,29 @@
this.aboutGuid.Name = "aboutGuid";
this.aboutGuid.OptionsColumn.ReadOnly = true;
this.aboutGuid.Visible = true;
- this.aboutGuid.VisibleIndex = 1;
+ this.aboutGuid.VisibleIndex = 2;
this.aboutGuid.Width = 94;
+ //
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 80;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 0;
+ this.gvMxDel.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.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)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// lb_checkUser
//
@@ -762,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 = 0;
+ this.gv_checkUser.VisibleIndex = 1;
this.gv_checkUser.Width = 94;
//
// lb_checkDate
@@ -796,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 = 4;
+ this.gv_checkDate.VisibleIndex = 5;
this.gv_checkDate.Width = 94;
//
// lb_fstatus
@@ -820,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 = 1;
+ this.gv_fstatus.VisibleIndex = 2;
this.gv_fstatus.Width = 94;
//
// lb_pba013
@@ -853,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 = 7;
+ this.gv_pba013.VisibleIndex = 8;
this.gv_pba013.Width = 94;
//
// lb_pba010
@@ -905,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 = 6;
+ this.gv_pba009.VisibleIndex = 7;
this.gv_pba009.Width = 94;
//
// gv_pba006
@@ -919,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 = 3;
+ this.gv_pba006.VisibleIndex = 4;
this.gv_pba006.Width = 94;
//
// gv_pba005
@@ -933,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 = 5;
+ this.gv_pba005.VisibleIndex = 6;
this.gv_pba005.Width = 94;
//
// lb_pba001
@@ -954,20 +985,6 @@
this.txt_pba016.Properties.Appearance.Options.UseFont = true;
this.txt_pba016.Size = new System.Drawing.Size(180, 28);
this.txt_pba016.TabIndex = 216;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "鎵归噺鎺掍骇ID";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 2;
- this.gv_id.Width = 94;
//
// toolBarMenu1
//
@@ -1000,9 +1017,9 @@
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.gridColumn2,
this.gv_fstatus,
this.gv_checkUser,
- this.gv_id,
this.gv_pba006,
this.gv_checkDate,
this.gv_pba005,
@@ -1022,7 +1039,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 8;
+ this.gridColumn1.VisibleIndex = 9;
this.gridColumn1.Width = 94;
//
// xtraTabControl1
@@ -1107,6 +1124,26 @@
this.panel1.Size = new System.Drawing.Size(1126, 157);
this.panel1.TabIndex = 1;
//
+ // txt_hNo
+ //
+ this.txt_hNo.Enabled = false;
+ this.txt_hNo.Location = new System.Drawing.Point(360, 18);
+ this.txt_hNo.Name = "txt_hNo";
+ this.txt_hNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_hNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_hNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_hNo.TabIndex = 458;
+ //
+ // labelControl1
+ //
+ this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl1.Appearance.Options.UseFont = true;
+ this.labelControl1.Location = new System.Drawing.Point(286, 22);
+ this.labelControl1.Name = "labelControl1";
+ this.labelControl1.Size = new System.Drawing.Size(68, 21);
+ this.labelControl1.TabIndex = 457;
+ this.labelControl1.Text = "鎺掍骇缂栧彿";
+ //
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
@@ -1142,25 +1179,16 @@
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
//
- // labelControl1
+ // gridColumn2
//
- this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(286, 22);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(68, 21);
- this.labelControl1.TabIndex = 457;
- this.labelControl1.Text = "鎺掍骇缂栧彿";
- //
- // txt_hNo
- //
- this.txt_hNo.Enabled = false;
- this.txt_hNo.Location = new System.Drawing.Point(360, 18);
- this.txt_hNo.Name = "txt_hNo";
- this.txt_hNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_hNo.Properties.Appearance.Options.UseFont = true;
- this.txt_hNo.Size = new System.Drawing.Size(150, 28);
- this.txt_hNo.TabIndex = 458;
+ 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
//
@@ -1177,6 +1205,7 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba013.Properties)).EndInit();
@@ -1193,8 +1222,8 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1274,7 +1303,6 @@
private DevExpress.XtraEditors.LabelControl lb_pba001;
private DevExpress.XtraEditors.TextEdit txt_pba016;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1283,5 +1311,8 @@
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2;
private DevExpress.XtraEditors.TextEdit txt_hNo;
private DevExpress.XtraEditors.LabelControl labelControl1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index a9a64ef..90b13f5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -27,6 +27,8 @@
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -126,6 +128,102 @@
_filterList = e.FilterList;
getPageList(1, pageBar1.RowsCount);
}
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private async void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_hNo, gridView1);
+ //toolBarMenu1.guidKey = rowGuid;
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ //MsgHelper.Warning(rowGuid);
+ UcLoading _loading = new UcLoading();
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = await UtilityHelper.HttpPostAsync("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ 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)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ _loading.Stop();
+ }
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private async void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_hNo, gridView1);
+ // toolBarMenu1.guidKey = rowGuid;
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ //MsgHelper.Warning(rowGuid);
+ UcLoading _loading = new UcLoading();
+ var _obj = new
+ {
+ guid = rowGuid,
+ };
+ try
+ {
+ var strJson = await UtilityHelper.HttpPostAsync("",
+ _webServiceName + "DeApprove",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ 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)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ _loading.Stop();
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -145,31 +243,37 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_hNo, gridView1,"hNo");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
+ var _obj = new
+ {
+ guid = rowGuid,
+ mxGuid = Guid.Empty.ToString(),
+ };
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
UtilityHelper.JumpToTab(xtraTabControl1, 0);
getPageList(1, UtilityHelper.GetPageSize());
}
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
@@ -380,5 +484,45 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var _obj = new
+ {
+ guid = lbGuid.Text.Trim(),
+ mxGuid = mxGuid,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelOrMx",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3