From d35bb711f8d3d267b44b4a80c20e31dabf309ae7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 14 一月 2025 08:17:18 +0800
Subject: [PATCH] 其它入库
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 198 +++++++++++++++++++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 288 +++++++---------------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 52 ++++-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs | 7
7 files changed, 318 insertions(+), 237 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 82a7c8f..35c27cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -34,6 +34,11 @@
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.gvMx1qd010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd008 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -125,6 +130,19 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panel1 = new System.Windows.Forms.Panel();
this.txt_qt009 = new Gs.DevApp.UserControl.UcLookDepartment();
this.txt_qt015 = new DevExpress.XtraEditors.CheckEdit();
@@ -167,6 +185,10 @@
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
+ this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt020.Properties)).BeginInit();
@@ -505,8 +527,10 @@
//
// ucBtnPrint1
//
+ this.ucBtnPrint1.guidKey = null;
this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
this.ucBtnPrint1.Name = "ucBtnPrint1";
+ this.ucBtnPrint1.rptParameter = null;
this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
this.ucBtnPrint1.TabIndex = 230;
//
@@ -1260,9 +1284,166 @@
//
// xtraTabPage3
//
+ this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
this.xtraTabPage3.Size = new System.Drawing.Size(1124, 372);
this.xtraTabPage3.Text = "鏉＄爜鏄庣粏";
+ //
+ // gcMx2
+ //
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Name = "gcMx2";
+ this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit2});
+ this.gcMx2.Size = new System.Drawing.Size(1124, 372);
+ this.gcMx2.TabIndex = 2;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
+ //
+ // gvMx2
+ //
+ this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn2,
+ this.gvMx1itemBarcode,
+ this.gridColumn4,
+ this.gridColumn3,
+ this.gridColumn5,
+ this.gvMx1quantity,
+ this.gridColumn6,
+ this.gvMx1createBy,
+ this.gvMx1lotDate,
+ this.gvBtnAlawys});
+ this.gvMx2.GridControl = this.gcMx2;
+ this.gvMx2.Name = "gvMx2";
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridColumn2.AppearanceCell.Options.UseFont = true;
+ this.gridColumn2.Caption = "guid";
+ this.gridColumn2.FieldName = "guid";
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "query_a.guid";
+ this.gridColumn2.Width = 94;
+ //
+ // gvMx1itemBarcode
+ //
+ this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
+ this.gvMx1itemBarcode.FieldName = "itemBarcode";
+ this.gvMx1itemBarcode.MinWidth = 300;
+ this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+ this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gvMx1itemBarcode.Visible = true;
+ this.gvMx1itemBarcode.VisibleIndex = 0;
+ this.gvMx1itemBarcode.Width = 300;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn4.FieldName = "itemNo";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn3.FieldName = "itemName";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.Width = 94;
+ //
+ // gvMx1quantity
+ //
+ this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx1quantity.Caption = "鏁伴噺";
+ this.gvMx1quantity.FieldName = "quantity";
+ this.gvMx1quantity.MinWidth = 50;
+ this.gvMx1quantity.Name = "gvMx1quantity";
+ this.gvMx1quantity.Tag = "query_a.QUANTITY";
+ this.gvMx1quantity.Visible = true;
+ this.gvMx1quantity.VisibleIndex = 4;
+ this.gvMx1quantity.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍗曚綅";
+ this.gridColumn6.FieldName = "dwName";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
+ //
+ // gvMx1createBy
+ //
+ this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
+ this.gvMx1createBy.Caption = "鍒涘缓浜�";
+ this.gvMx1createBy.FieldName = "createBy";
+ this.gvMx1createBy.MinWidth = 50;
+ this.gvMx1createBy.Name = "gvMx1createBy";
+ this.gvMx1createBy.Tag = "query_a.CREATE_BY";
+ this.gvMx1createBy.Visible = true;
+ this.gvMx1createBy.VisibleIndex = 6;
+ this.gvMx1createBy.Width = 94;
+ //
+ // gvMx1lotDate
+ //
+ this.gvMx1lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
+ this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
+ this.gvMx1lotDate.FieldName = "createDate";
+ this.gvMx1lotDate.MinWidth = 50;
+ this.gvMx1lotDate.Name = "gvMx1lotDate";
+ this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
+ this.gvMx1lotDate.Visible = true;
+ this.gvMx1lotDate.VisibleIndex = 7;
+ this.gvMx1lotDate.Width = 94;
+ //
+ // gvBtnAlawys
+ //
+ this.gvBtnAlawys.Caption = "绉诲嚭";
+ this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
+ this.gvBtnAlawys.MinWidth = 25;
+ this.gvBtnAlawys.Name = "gvBtnAlawys";
+ this.gvBtnAlawys.Visible = true;
+ this.gvBtnAlawys.VisibleIndex = 8;
+ this.gvBtnAlawys.Width = 94;
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ 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, 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);
//
// panel1
//
@@ -1448,6 +1629,10 @@
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
+ this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_qt015.Properties)).EndInit();
@@ -1571,5 +1756,18 @@
private DevExpress.XtraEditors.LabelControl labelControl7;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private UserControl.UcBtnPrint ucBtnPrint1;
+ private DevExpress.XtraGrid.GridControl gcMx2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 8ff7dae..8cd1442 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -30,8 +30,6 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- //toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
- //toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) =>
{
@@ -157,15 +155,6 @@
_filterList = e.FilterList;
getPageList(1);
}
- private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
- {
-
- }
- private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
- {
-
- }
-
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
@@ -591,5 +580,46 @@
kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
}
}
+ /// <summary>
+ /// 绉诲嚭鏉＄爜
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx2.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx2.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ mxGuid = mxGuid,
+ inType = "dhtm"
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteBarcode",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ }
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs
index 3b89fa6..964d5c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.Designer.cs
@@ -1681,8 +1681,8 @@
this.tabMx.Size = new System.Drawing.Size(1346, 426);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1,
- this.tabMxPage2});
+ this.tabMxPage2,
+ this.tabMxPage1});
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
index e3667ed..a438cc2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk_Rk.cs
@@ -17,7 +17,7 @@
{
public partial class Frm_MesItemQtrk_Rk : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "MesItemQtrkrkManager/";
+ string _webServiceName = "MesItemQtrkDjManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_MesItemQtrk_Rk()
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 1adc71e..9cb1121 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -75,19 +75,11 @@
this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.txtWlid = new DevExpress.XtraEditors.TextEdit();
this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
- this.gv_tbl022 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tbl021 = new DevExpress.XtraEditors.LabelControl();
this.txt_workName = new DevExpress.XtraEditors.TextEdit();
this.gv_tbl021 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tbl020 = new DevExpress.XtraEditors.LabelControl();
this.gv_tbl020 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl019 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl018 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl017 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl016 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl015 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tbl013 = new DevExpress.XtraEditors.LabelControl();
this.gv_tbl013 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tbl012 = new DevExpress.XtraEditors.LabelControl();
@@ -98,11 +90,8 @@
this.gv_tbl011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_tbl009 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl008 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_tbl007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tbl006 = new DevExpress.XtraEditors.LabelControl();
this.txt_tbl006 = new DevExpress.XtraEditors.TextEdit();
- this.gv_tbl006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tbl005 = new DevExpress.XtraEditors.LabelControl();
this.gv_tbl005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_tbl004 = new DevExpress.XtraEditors.LabelControl();
@@ -122,6 +111,9 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -588,34 +580,6 @@
this.labelControl7.TabIndex = 213;
this.labelControl7.Text = "鐗╂枡缂栧彿:";
//
- // gv_tbl022
- //
- this.gv_tbl022.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl022.AppearanceCell.Options.UseFont = true;
- this.gv_tbl022.Caption = "鏄惁琛ユ枡瀹屾垚 ";
- this.gv_tbl022.FieldName = "tbl022";
- this.gv_tbl022.MinWidth = 50;
- this.gv_tbl022.Name = "gv_tbl022";
- this.gv_tbl022.OptionsColumn.AllowEdit = false;
- this.gv_tbl022.Tag = "query_a.tbl022";
- this.gv_tbl022.Visible = true;
- this.gv_tbl022.VisibleIndex = 23;
- this.gv_tbl022.Width = 94;
- //
- // gv_itemId
- //
- this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemId.AppearanceCell.Options.UseFont = true;
- this.gv_itemId.Caption = "浜у搧id ";
- this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 50;
- this.gv_itemId.Name = "gv_itemId";
- this.gv_itemId.OptionsColumn.AllowEdit = false;
- this.gv_itemId.Tag = "query_a.item_id";
- this.gv_itemId.Visible = true;
- this.gv_itemId.VisibleIndex = 22;
- this.gv_itemId.Width = 94;
- //
// lb_tbl021
//
this.lb_tbl021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -641,13 +605,13 @@
this.gv_tbl021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_tbl021.AppearanceCell.Options.UseFont = true;
this.gv_tbl021.Caption = "鐢熶骇杞﹂棿 ";
- this.gv_tbl021.FieldName = "tbl021";
+ this.gv_tbl021.FieldName = "dptName";
this.gv_tbl021.MinWidth = 50;
this.gv_tbl021.Name = "gv_tbl021";
this.gv_tbl021.OptionsColumn.AllowEdit = false;
this.gv_tbl021.Tag = "query_a.tbl021";
this.gv_tbl021.Visible = true;
- this.gv_tbl021.VisibleIndex = 21;
+ this.gv_tbl021.VisibleIndex = 6;
this.gv_tbl021.Width = 94;
//
// lb_tbl020
@@ -665,98 +629,15 @@
this.gv_tbl020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_tbl020.AppearanceCell.Options.UseFont = true;
this.gv_tbl020.Caption = "瀹岀粨鏍囪瘑 ";
- this.gv_tbl020.FieldName = "tbl020";
+ this.gv_tbl020.FieldName = "isWj";
+ this.gv_tbl020.MaxWidth = 50;
this.gv_tbl020.MinWidth = 50;
this.gv_tbl020.Name = "gv_tbl020";
this.gv_tbl020.OptionsColumn.AllowEdit = false;
this.gv_tbl020.Tag = "query_a.tbl020";
this.gv_tbl020.Visible = true;
- this.gv_tbl020.VisibleIndex = 20;
- this.gv_tbl020.Width = 94;
- //
- // gv_tbl019
- //
- this.gv_tbl019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl019.AppearanceCell.Options.UseFont = true;
- this.gv_tbl019.Caption = "浜嬪姟绫诲瀷缂栫爜 ";
- this.gv_tbl019.FieldName = "tbl019";
- this.gv_tbl019.MinWidth = 50;
- this.gv_tbl019.Name = "gv_tbl019";
- this.gv_tbl019.OptionsColumn.AllowEdit = false;
- this.gv_tbl019.Tag = "query_a.tbl019";
- this.gv_tbl019.Visible = true;
- this.gv_tbl019.VisibleIndex = 19;
- this.gv_tbl019.Width = 94;
- //
- // gv_tbl018
- //
- this.gv_tbl018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl018.AppearanceCell.Options.UseFont = true;
- this.gv_tbl018.Caption = "鍗曟嵁绫诲瀷缂栫爜 ";
- this.gv_tbl018.FieldName = "tbl018";
- this.gv_tbl018.MinWidth = 50;
- this.gv_tbl018.Name = "gv_tbl018";
- this.gv_tbl018.OptionsColumn.AllowEdit = false;
- this.gv_tbl018.Tag = "query_a.tbl018";
- this.gv_tbl018.Visible = true;
- this.gv_tbl018.VisibleIndex = 18;
- this.gv_tbl018.Width = 94;
- //
- // gv_tbl017
- //
- this.gv_tbl017.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl017.AppearanceCell.Options.UseFont = true;
- this.gv_tbl017.Caption = "渚涘簲鍟嗙紪鐮� ";
- this.gv_tbl017.FieldName = "tbl017";
- this.gv_tbl017.MinWidth = 50;
- this.gv_tbl017.Name = "gv_tbl017";
- this.gv_tbl017.OptionsColumn.AllowEdit = false;
- this.gv_tbl017.Tag = "query_a.tbl017";
- this.gv_tbl017.Visible = true;
- this.gv_tbl017.VisibleIndex = 17;
- this.gv_tbl017.Width = 94;
- //
- // gv_tbl016
- //
- this.gv_tbl016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl016.AppearanceCell.Options.UseFont = true;
- this.gv_tbl016.Caption = "ERP杩斿洖淇℃伅 ";
- this.gv_tbl016.FieldName = "tbl016";
- this.gv_tbl016.MinWidth = 50;
- this.gv_tbl016.Name = "gv_tbl016";
- this.gv_tbl016.OptionsColumn.AllowEdit = false;
- this.gv_tbl016.Tag = "query_a.tbl016";
- this.gv_tbl016.Visible = true;
- this.gv_tbl016.VisibleIndex = 16;
- this.gv_tbl016.Width = 94;
- //
- // gv_tbl015
- //
- this.gv_tbl015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl015.AppearanceCell.Options.UseFont = true;
- this.gv_tbl015.Caption = "ERP鍥炲啓鍗曞彿 ";
- this.gv_tbl015.FieldName = "tbl015";
- this.gv_tbl015.MinWidth = 50;
- this.gv_tbl015.Name = "gv_tbl015";
- this.gv_tbl015.OptionsColumn.AllowEdit = false;
- this.gv_tbl015.Tag = "query_a.tbl015";
- this.gv_tbl015.Visible = true;
- this.gv_tbl015.VisibleIndex = 15;
- this.gv_tbl015.Width = 94;
- //
- // gv_tbl014
- //
- this.gv_tbl014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl014.AppearanceCell.Options.UseFont = true;
- this.gv_tbl014.Caption = "ERP鍥炲啓鐘舵�� ";
- this.gv_tbl014.FieldName = "tbl014";
- this.gv_tbl014.MinWidth = 50;
- this.gv_tbl014.Name = "gv_tbl014";
- this.gv_tbl014.OptionsColumn.AllowEdit = false;
- this.gv_tbl014.Tag = "query_a.tbl014";
- this.gv_tbl014.Visible = true;
- this.gv_tbl014.VisibleIndex = 14;
- this.gv_tbl014.Width = 94;
+ this.gv_tbl020.VisibleIndex = 1;
+ this.gv_tbl020.Width = 50;
//
// lb_tbl013
//
@@ -773,14 +654,15 @@
this.gv_tbl013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_tbl013.AppearanceCell.Options.UseFont = true;
this.gv_tbl013.Caption = "瀹℃牳鐘舵�� ";
- this.gv_tbl013.FieldName = "tbl013";
+ this.gv_tbl013.FieldName = "isChk";
+ this.gv_tbl013.MaxWidth = 50;
this.gv_tbl013.MinWidth = 50;
this.gv_tbl013.Name = "gv_tbl013";
this.gv_tbl013.OptionsColumn.AllowEdit = false;
this.gv_tbl013.Tag = "query_a.tbl013";
this.gv_tbl013.Visible = true;
- this.gv_tbl013.VisibleIndex = 13;
- this.gv_tbl013.Width = 94;
+ this.gv_tbl013.VisibleIndex = 0;
+ this.gv_tbl013.Width = 50;
//
// lb_tbl012
//
@@ -813,7 +695,7 @@
this.gv_tbl012.OptionsColumn.AllowEdit = false;
this.gv_tbl012.Tag = "query_a.tbl012";
this.gv_tbl012.Visible = true;
- this.gv_tbl012.VisibleIndex = 12;
+ this.gv_tbl012.VisibleIndex = 15;
this.gv_tbl012.Width = 94;
//
// lb_tbl011
@@ -847,7 +729,7 @@
this.gv_tbl011.OptionsColumn.AllowEdit = false;
this.gv_tbl011.Tag = "query_a.tbl011";
this.gv_tbl011.Visible = true;
- this.gv_tbl011.VisibleIndex = 11;
+ this.gv_tbl011.VisibleIndex = 14;
this.gv_tbl011.Width = 94;
//
// gv_tbl010
@@ -861,7 +743,7 @@
this.gv_tbl010.OptionsColumn.AllowEdit = false;
this.gv_tbl010.Tag = "query_a.tbl010";
this.gv_tbl010.Visible = true;
- this.gv_tbl010.VisibleIndex = 10;
+ this.gv_tbl010.VisibleIndex = 13;
this.gv_tbl010.Width = 94;
//
// gv_tbl009
@@ -875,36 +757,8 @@
this.gv_tbl009.OptionsColumn.AllowEdit = false;
this.gv_tbl009.Tag = "query_a.tbl009";
this.gv_tbl009.Visible = true;
- this.gv_tbl009.VisibleIndex = 9;
+ this.gv_tbl009.VisibleIndex = 12;
this.gv_tbl009.Width = 94;
- //
- // gv_tbl008
- //
- this.gv_tbl008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl008.AppearanceCell.Options.UseFont = true;
- this.gv_tbl008.Caption = "浜嬪姟绫诲瀷 ";
- this.gv_tbl008.FieldName = "tbl008";
- this.gv_tbl008.MinWidth = 50;
- this.gv_tbl008.Name = "gv_tbl008";
- this.gv_tbl008.OptionsColumn.AllowEdit = false;
- this.gv_tbl008.Tag = "query_a.tbl008";
- this.gv_tbl008.Visible = true;
- this.gv_tbl008.VisibleIndex = 8;
- this.gv_tbl008.Width = 94;
- //
- // gv_tbl007
- //
- this.gv_tbl007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl007.AppearanceCell.Options.UseFont = true;
- this.gv_tbl007.Caption = "鍗曟嵁绫诲瀷 ";
- this.gv_tbl007.FieldName = "tbl007";
- this.gv_tbl007.MinWidth = 50;
- this.gv_tbl007.Name = "gv_tbl007";
- this.gv_tbl007.OptionsColumn.AllowEdit = false;
- this.gv_tbl007.Tag = "query_a.tbl007";
- this.gv_tbl007.Visible = true;
- this.gv_tbl007.VisibleIndex = 7;
- this.gv_tbl007.Width = 94;
//
// lb_tbl006
//
@@ -924,20 +778,6 @@
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
this.txt_tbl006.Size = new System.Drawing.Size(678, 28);
this.txt_tbl006.TabIndex = 226;
- //
- // gv_tbl006
- //
- this.gv_tbl006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_tbl006.AppearanceCell.Options.UseFont = true;
- this.gv_tbl006.Caption = "澶囨敞 ";
- this.gv_tbl006.FieldName = "tbl006";
- this.gv_tbl006.MinWidth = 50;
- this.gv_tbl006.Name = "gv_tbl006";
- this.gv_tbl006.OptionsColumn.AllowEdit = false;
- this.gv_tbl006.Tag = "query_a.tbl006";
- this.gv_tbl006.Visible = true;
- this.gv_tbl006.VisibleIndex = 6;
- this.gv_tbl006.Width = 94;
//
// lb_tbl005
//
@@ -960,7 +800,7 @@
this.gv_tbl005.OptionsColumn.AllowEdit = false;
this.gv_tbl005.Tag = "query_a.tbl005";
this.gv_tbl005.Visible = true;
- this.gv_tbl005.VisibleIndex = 5;
+ this.gv_tbl005.VisibleIndex = 11;
this.gv_tbl005.Width = 94;
//
// lb_tbl004
@@ -988,13 +828,13 @@
this.gv_tbl004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_tbl004.AppearanceCell.Options.UseFont = true;
this.gv_tbl004.Caption = "浜у搧鍨嬪彿 ";
- this.gv_tbl004.FieldName = "tbl004";
+ this.gv_tbl004.FieldName = "daa004";
this.gv_tbl004.MinWidth = 50;
this.gv_tbl004.Name = "gv_tbl004";
this.gv_tbl004.OptionsColumn.AllowEdit = false;
this.gv_tbl004.Tag = "query_a.tbl004";
this.gv_tbl004.Visible = true;
- this.gv_tbl004.VisibleIndex = 4;
+ this.gv_tbl004.VisibleIndex = 10;
this.gv_tbl004.Width = 94;
//
// lb_tbl003
@@ -1022,13 +862,13 @@
this.gv_tbl003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_tbl003.AppearanceCell.Options.UseFont = true;
this.gv_tbl003.Caption = "浠诲姟鍗曞彿 ";
- this.gv_tbl003.FieldName = "tbl003";
+ this.gv_tbl003.FieldName = "daa021";
this.gv_tbl003.MinWidth = 50;
this.gv_tbl003.Name = "gv_tbl003";
this.gv_tbl003.OptionsColumn.AllowEdit = false;
this.gv_tbl003.Tag = "query_a.tbl003";
this.gv_tbl003.Visible = true;
- this.gv_tbl003.VisibleIndex = 3;
+ this.gv_tbl003.VisibleIndex = 4;
this.gv_tbl003.Width = 94;
//
// lb_tbl002
@@ -1046,13 +886,13 @@
this.gv_tbl002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_tbl002.AppearanceCell.Options.UseFont = true;
this.gv_tbl002.Caption = "鐢熶骇宸ュ崟 ";
- this.gv_tbl002.FieldName = "tbl002";
+ this.gv_tbl002.FieldName = "daa001";
this.gv_tbl002.MinWidth = 50;
this.gv_tbl002.Name = "gv_tbl002";
this.gv_tbl002.OptionsColumn.AllowEdit = false;
this.gv_tbl002.Tag = "query_a.tbl002";
this.gv_tbl002.Visible = true;
- this.gv_tbl002.VisibleIndex = 2;
+ this.gv_tbl002.VisibleIndex = 5;
this.gv_tbl002.Width = 94;
//
// lb_tbl001
@@ -1086,7 +926,7 @@
this.gv_tbl001.OptionsColumn.AllowEdit = false;
this.gv_tbl001.Tag = "query_a.tbl001";
this.gv_tbl001.Visible = true;
- this.gv_tbl001.VisibleIndex = 1;
+ this.gv_tbl001.VisibleIndex = 7;
this.gv_tbl001.Width = 94;
//
// lb_billNo
@@ -1113,14 +953,14 @@
//
this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_billNo.AppearanceCell.Options.UseFont = true;
- this.gv_billNo.Caption = "鍗曞彿 ";
+ this.gv_billNo.Caption = "鐢宠鍗曞彿 ";
this.gv_billNo.FieldName = "billNo";
this.gv_billNo.MinWidth = 50;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 0;
+ this.gv_billNo.VisibleIndex = 3;
this.gv_billNo.Width = 94;
//
// toolBarMenu1
@@ -1152,39 +992,65 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_tbl013,
+ this.gv_tbl020,
+ this.gridColumn5,
this.gv_billNo,
- this.gv_tbl001,
- this.gv_tbl002,
this.gv_tbl003,
+ this.gv_tbl002,
+ this.gv_tbl021,
+ this.gv_tbl001,
+ this.gridColumn6,
+ this.gridColumn10,
this.gv_tbl004,
this.gv_tbl005,
- this.gv_tbl006,
- this.gv_tbl007,
- this.gv_tbl008,
this.gv_tbl009,
this.gv_tbl010,
this.gv_tbl011,
- this.gv_tbl012,
- this.gv_tbl013,
- this.gv_tbl014,
- this.gv_tbl015,
- this.gv_tbl016,
- this.gv_tbl017,
- this.gv_tbl018,
- this.gv_tbl019,
- this.gv_tbl020,
- this.gv_tbl021,
- this.gv_itemId,
- this.gv_tbl022});
+ this.gv_tbl012});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "閫�鏂欑粍缁�";
+ this.gridColumn5.FieldName = "tlOrg";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Tag = "org.fnamber";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "浜у搧缂栫爜";
+ this.gridColumn6.FieldName = "daa029";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 8;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "浜у搧鍚嶇О";
+ this.gridColumn10.FieldName = "daa003";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.Width = 94;
//
// xtraTabControl1
//
@@ -1615,8 +1481,6 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl022;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
private DevExpress.XtraEditors.LabelControl lb_tbl021;
private DevExpress.XtraEditors.TextEdit txt_workName;
@@ -1624,12 +1488,6 @@
private DevExpress.XtraEditors.LabelControl lb_tbl020;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl020;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl019;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl018;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl017;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl016;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl015;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl014;
private DevExpress.XtraEditors.LabelControl lb_tbl013;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl013;
@@ -1643,12 +1501,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl011;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl010;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl009;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl008;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl007;
private DevExpress.XtraEditors.LabelControl lb_tbl006;
private DevExpress.XtraEditors.TextEdit txt_tbl006;
- private DevExpress.XtraGrid.Columns.GridColumn gv_tbl006;
private DevExpress.XtraEditors.LabelControl lb_tbl005;
private DevExpress.XtraGrid.Columns.GridColumn gv_tbl005;
@@ -1717,5 +1572,8 @@
private UserControl.UcLookOrg txt_tbl023;
private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
index f4931c2..54fd462 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.Designer.cs
@@ -1680,8 +1680,8 @@
this.tabMx.Size = new System.Drawing.Size(1346, 426);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1,
- this.tabMxPage2});
+ this.tabMxPage2,
+ this.tabMxPage1});
//
// panel1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
index 8d26e98..50355b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
@@ -1,16 +1,11 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.Entity;
+锘縰sing Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
--
Gitblit v1.9.3