From 3911e6a879ca4e8189c9463afafa6a3d96a19a6f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 22 二月 2025 14:12:31 +0800
Subject: [PATCH] 调拨
---
DevApp/Gs.DevApp/Properties/Resources.Designer.cs | 20
DevApp/Gs.DevApp/UserControl/SelectOrg.cs | 117 ++
DevApp/Gs.DevApp/UserControl/SelectOrg.Designer.cs | 167 +++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 38
DevApp/Gs.DevApp/Resources/lookup&reference_16x162.png | 0
DevApp/Gs.DevApp/UserControl/SelectHz.cs | 103 ++
DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs | 184 +++
DevApp/Gs.DevApp/UserControl/SelectCk.cs | 125 ++
DevApp/Gs.DevApp/UserControl/SelectCw.cs | 129 ++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 294 +++++
DevApp/Gs.DevApp/UserControl/SelectCk.resx | 120 ++
DevApp/Gs.DevApp/Resources/checkbox2_16x162.png | 0
DevApp/Gs.DevApp/Properties/Resources.resx | 56
DevApp/Gs.DevApp/UserControl/SelectCw.resx | 120 ++
DevApp/Gs.DevApp/UserControl/SelectCw.Designer.cs | 167 +++
DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs | 167 +++
DevApp/Gs.DevApp/UserControl/SelectHz.resx | 120 ++
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 795 +++++++++++----
DevApp/Gs.DevApp/UserControl/SelectOrg.resx | 120 ++
19 files changed, 2,558 insertions(+), 284 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 36d97fe..d4c043b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -34,6 +34,46 @@
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();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -55,8 +95,31 @@
this.gvMx1bld010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDcOrg = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDcCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDcCw = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDrOrg = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDrCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptDrCw = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isWc = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billno = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fromFname = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -81,12 +144,18 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.comboBoxEdit4 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+ this.comboBoxEdit3 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.comboBoxEdit2 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_sqOrg = new Gs.DevApp.UserControl.UcLookOrg();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.txt_fstockorgidNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_fstockoutorgidNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_fromFcode = new Gs.DevApp.UserControl.UcLookCk();
- this.txt_invFcode = new Gs.DevApp.UserControl.UcLookCk();
this.txt_isWc = new DevExpress.XtraEditors.CheckEdit();
this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
this.txt_ftransferdirect = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -96,30 +165,28 @@
this.lb_isWc = new DevExpress.XtraEditors.LabelControl();
this.lb_billno = new DevExpress.XtraEditors.LabelControl();
this.txt_billno = new DevExpress.XtraEditors.TextEdit();
- this.lb_fstockorgidNo = new DevExpress.XtraEditors.LabelControl();
- this.lb_fstockoutorgidNo = new DevExpress.XtraEditors.LabelControl();
- this.lb_fromFcode = new DevExpress.XtraEditors.LabelControl();
- this.lb_invFcode = new DevExpress.XtraEditors.LabelControl();
this.lb_shState = new DevExpress.XtraEditors.LabelControl();
this.lb_shDate = new DevExpress.XtraEditors.LabelControl();
this.txt_shDate = new DevExpress.XtraEditors.TextEdit();
this.lb_shBy = new DevExpress.XtraEditors.LabelControl();
this.txt_shBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_fsaleorgid = new DevExpress.XtraEditors.LabelControl();
- this.txt_fsaleorgid = new DevExpress.XtraEditors.TextEdit();
- this.lb_fowneridhead = new DevExpress.XtraEditors.LabelControl();
- this.txt_fowneridhead = new DevExpress.XtraEditors.TextEdit();
- this.lb_fowneroutidhead = new DevExpress.XtraEditors.LabelControl();
- this.txt_fowneroutidhead = new DevExpress.XtraEditors.TextEdit();
this.lb_ftransferdirect = new DevExpress.XtraEditors.LabelControl();
this.lb_fbilltypeid = new DevExpress.XtraEditors.LabelControl();
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.rptDrHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.rptDcHz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcOrg)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcCk)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcCw)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrOrg)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrCk)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrCw)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -130,9 +197,11 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit4.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit3.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstockorgidNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstockoutorgidNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftransferdirect.Properties)).BeginInit();
@@ -140,17 +209,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billno.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsaleorgid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fowneridhead.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fowneroutidhead.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).BeginInit();
this.SuspendLayout();
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 387);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 374);
this.tabMxPage1.Text = "璋冩嫧鐢宠鏄庣粏";
//
// gcMx1
@@ -161,8 +229,16 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
- this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 387);
+ this.repositoryItemButtonEdit1,
+ this.rptDcOrg,
+ this.rptDcCw,
+ this.rptDcCk,
+ this.rptDrOrg,
+ this.rptDrCk,
+ this.rptDrCw,
+ this.rptDrHz,
+ this.rptDcHz});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 374);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -180,7 +256,24 @@
this.gvMx1bld010,
this.gvMx1bld008,
this.gridColumn1,
- this.gvMxDel});
+ this.gridColumn9,
+ this.gridColumn10,
+ this.gridColumn11,
+ this.gridColumn12,
+ this.gridColumn16,
+ this.gridColumn17,
+ this.gridColumn23,
+ this.gridColumn24,
+ this.gvMxDel,
+ this.gridColumn8,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn13,
+ this.gridColumn18,
+ this.gridColumn19,
+ this.gridColumn20,
+ this.gridColumn21,
+ this.gridColumn22});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -220,9 +313,8 @@
this.gvMx1bld012.AppearanceCell.Options.UseForeColor = true;
this.gvMx1bld012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1bld012.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1bld012.Caption = "鐗╂枡id";
+ this.gvMx1bld012.Caption = "璇烽�夋嫨";
this.gvMx1bld012.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gvMx1bld012.FieldName = "itemId";
this.gvMx1bld012.MinWidth = 50;
this.gvMx1bld012.Name = "gvMx1bld012";
this.gvMx1bld012.Tag = "edit";
@@ -409,6 +501,147 @@
this.gridColumn1.VisibleIndex = 7;
this.gridColumn1.Width = 94;
//
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "璋冨嚭缁勭粐";
+ this.gridColumn9.ColumnEdit = this.rptDcOrg;
+ this.gridColumn9.FieldName = "dcOrg";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 8;
+ this.gridColumn9.Width = 94;
+ //
+ // rptDcOrg
+ //
+ this.rptDcOrg.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
+ this.rptDcOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ 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.rptDcOrg.Name = "rptDcOrg";
+ this.rptDcOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcOrg_ButtonClick);
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "璋冨嚭浠撳簱";
+ this.gridColumn10.ColumnEdit = this.rptDcCk;
+ this.gridColumn10.FieldName = "dcCk";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.Width = 94;
+ //
+ // rptDcCk
+ //
+ this.rptDcCk.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDcCk.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.rptDcCk.Name = "rptDcCk";
+ this.rptDcCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCk_ButtonClick);
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "璋冨嚭浠撲綅";
+ this.gridColumn11.ColumnEdit = this.rptDcCw;
+ this.gridColumn11.FieldName = "dcCw";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 10;
+ this.gridColumn11.Width = 94;
+ //
+ // rptDcCw
+ //
+ this.rptDcCw.AutoHeight = false;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDcCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDcCw.Name = "rptDcCw";
+ this.rptDcCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCw_ButtonClick);
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "璋冨叆缁勭粐";
+ this.gridColumn12.ColumnEdit = this.rptDrOrg;
+ this.gridColumn12.FieldName = "drOrg";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 11;
+ this.gridColumn12.Width = 94;
+ //
+ // rptDrOrg
+ //
+ this.rptDrOrg.AutoHeight = false;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDrOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDrOrg.Name = "rptDrOrg";
+ this.rptDrOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrOrg_ButtonClick);
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "璋冨叆浠撳簱";
+ this.gridColumn16.ColumnEdit = this.rptDrCk;
+ this.gridColumn16.FieldName = "drCk";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 12;
+ this.gridColumn16.Width = 94;
+ //
+ // rptDrCk
+ //
+ this.rptDrCk.AutoHeight = false;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDrCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDrCk.Name = "rptDrCk";
+ this.rptDrCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCk_ButtonClick);
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "璋冨叆浠撲綅";
+ this.gridColumn17.ColumnEdit = this.rptDrCw;
+ this.gridColumn17.FieldName = "drCw";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 13;
+ this.gridColumn17.Width = 94;
+ //
+ // rptDrCw
+ //
+ this.rptDrCw.AutoHeight = false;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDrCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDrCw.Name = "rptDrCw";
+ this.rptDrCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCw_ButtonClick);
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "璋冨嚭璐т富";
+ this.gridColumn23.FieldName = "dcHz";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 14;
+ this.gridColumn23.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "璋冨叆璐т富";
+ this.gridColumn24.ColumnEdit = this.rptDrHz;
+ this.gridColumn24.FieldName = "drHz";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 15;
+ this.gridColumn24.Width = 94;
+ //
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
@@ -416,19 +649,92 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
+ this.gvMxDel.VisibleIndex = 16;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions8.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐗╂枡ID";
+ this.gridColumn8.FieldName = "itemId";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "璋冨嚭缁勭粐Guid";
+ this.gridColumn14.FieldName = "dcOrgGuid";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "璋冨嚭浠撳簱Guid";
+ this.gridColumn15.FieldName = "dcCkGuid";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "璋冨嚭浠撲綅Guid";
+ this.gridColumn13.FieldName = "dcCwGuid";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "璋冨叆缁勭粐Guid";
+ this.gridColumn18.FieldName = "drOrgGuid";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "璋冨叆浠撳簱Guid";
+ this.gridColumn19.FieldName = "drCkGuid";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "璋冨叆浠撲綅Guid";
+ this.gridColumn20.FieldName = "drCwGuid";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Width = 94;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "璋冨嚭璐т富Gui";
+ this.gridColumn21.ColumnEdit = this.rptDcHz;
+ this.gridColumn21.FieldName = "dcHzGuid";
+ this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Width = 94;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "璋冨叆璐т富Guid";
+ this.gridColumn22.FieldName = "drHzGuid";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Width = 94;
//
// gv_isWc
//
@@ -743,10 +1049,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 151);
+ this.tabMx.Location = new System.Drawing.Point(0, 164);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 419);
+ this.tabMx.Size = new System.Drawing.Size(1126, 406);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -754,12 +1060,18 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.comboBoxEdit4);
+ this.panel1.Controls.Add(this.labelControl6);
+ this.panel1.Controls.Add(this.comboBoxEdit3);
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.comboBoxEdit2);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_sqOrg);
+ this.panel1.Controls.Add(this.labelControl3);
+ this.panel1.Controls.Add(this.comboBoxEdit1);
+ this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.txt_fstockorgidNo);
- this.panel1.Controls.Add(this.txt_fstockoutorgidNo);
- this.panel1.Controls.Add(this.txt_fromFcode);
- this.panel1.Controls.Add(this.txt_invFcode);
this.panel1.Controls.Add(this.txt_isWc);
this.panel1.Controls.Add(this.txt_shState);
this.panel1.Controls.Add(this.txt_ftransferdirect);
@@ -769,21 +1081,11 @@
this.panel1.Controls.Add(this.lb_isWc);
this.panel1.Controls.Add(this.lb_billno);
this.panel1.Controls.Add(this.txt_billno);
- this.panel1.Controls.Add(this.lb_fstockorgidNo);
- this.panel1.Controls.Add(this.lb_fstockoutorgidNo);
- this.panel1.Controls.Add(this.lb_fromFcode);
- this.panel1.Controls.Add(this.lb_invFcode);
this.panel1.Controls.Add(this.lb_shState);
this.panel1.Controls.Add(this.lb_shDate);
this.panel1.Controls.Add(this.txt_shDate);
this.panel1.Controls.Add(this.lb_shBy);
this.panel1.Controls.Add(this.txt_shBy);
- this.panel1.Controls.Add(this.lb_fsaleorgid);
- this.panel1.Controls.Add(this.txt_fsaleorgid);
- this.panel1.Controls.Add(this.lb_fowneridhead);
- this.panel1.Controls.Add(this.txt_fowneridhead);
- this.panel1.Controls.Add(this.lb_fowneroutidhead);
- this.panel1.Controls.Add(this.txt_fowneroutidhead);
this.panel1.Controls.Add(this.lb_ftransferdirect);
this.panel1.Controls.Add(this.lb_fbilltypeid);
this.panel1.Controls.Add(this.lb_id);
@@ -791,14 +1093,131 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 151);
+ this.panel1.Size = new System.Drawing.Size(1126, 164);
this.panel1.TabIndex = 1;
+ //
+ // comboBoxEdit4
+ //
+ this.comboBoxEdit4.EditValue = "鏍囧噯";
+ this.comboBoxEdit4.Location = new System.Drawing.Point(471, 100);
+ this.comboBoxEdit4.Name = "comboBoxEdit4";
+ this.comboBoxEdit4.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.comboBoxEdit4.Properties.Items.AddRange(new object[] {
+ "璇烽�夋嫨",
+ "缁勭粐(BD_OwnerOrg)",
+ "渚涘簲鍟�(BD_Supplier)",
+ "瀹㈡埛(BD_Customer)"});
+ this.comboBoxEdit4.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.comboBoxEdit4.Size = new System.Drawing.Size(182, 24);
+ this.comboBoxEdit4.TabIndex = 382;
+ //
+ // labelControl6
+ //
+ this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl6.Appearance.Options.UseFont = true;
+ this.labelControl6.Location = new System.Drawing.Point(358, 102);
+ this.labelControl6.Name = "labelControl6";
+ this.labelControl6.Size = new System.Drawing.Size(107, 21);
+ this.labelControl6.TabIndex = 381;
+ this.labelControl6.Text = "璋冨叆璐т富绫诲瀷 ";
+ //
+ // comboBoxEdit3
+ //
+ this.comboBoxEdit3.EditValue = "鏍囧噯";
+ this.comboBoxEdit3.Location = new System.Drawing.Point(471, 72);
+ this.comboBoxEdit3.Name = "comboBoxEdit3";
+ this.comboBoxEdit3.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.comboBoxEdit3.Properties.Items.AddRange(new object[] {
+ "璇烽�夋嫨",
+ "缁勭粐(BD_OwnerOrg)",
+ "渚涘簲鍟�(BD_Supplier)",
+ "瀹㈡埛(BD_Customer)"});
+ this.comboBoxEdit3.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.comboBoxEdit3.Size = new System.Drawing.Size(182, 24);
+ this.comboBoxEdit3.TabIndex = 380;
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(358, 74);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(107, 21);
+ this.labelControl5.TabIndex = 379;
+ this.labelControl5.Text = "璋冨嚭璐т富绫诲瀷 ";
+ //
+ // comboBoxEdit2
+ //
+ this.comboBoxEdit2.EditValue = "鏍囧噯";
+ this.comboBoxEdit2.Location = new System.Drawing.Point(432, 43);
+ this.comboBoxEdit2.Name = "comboBoxEdit2";
+ this.comboBoxEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.comboBoxEdit2.Properties.Items.AddRange(new object[] {
+ "缁勭粐鍐呰皟鎷�",
+ "璺ㄧ粍缁囪皟鎷�"});
+ this.comboBoxEdit2.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.comboBoxEdit2.Size = new System.Drawing.Size(221, 24);
+ this.comboBoxEdit2.TabIndex = 378;
+ //
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(358, 45);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(73, 21);
+ this.labelControl4.TabIndex = 377;
+ this.labelControl4.Text = "璋冩嫧绫诲瀷 ";
+ //
+ // txt_sqOrg
+ //
+ this.txt_sqOrg.IsReadly = false;
+ this.txt_sqOrg.Location = new System.Drawing.Point(432, 10);
+ this.txt_sqOrg.Name = "txt_sqOrg";
+ this.txt_sqOrg.Size = new System.Drawing.Size(221, 30);
+ this.txt_sqOrg.TabIndex = 376;
+ //
+ // labelControl3
+ //
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(358, 15);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(68, 21);
+ this.labelControl3.TabIndex = 375;
+ this.labelControl3.Text = "鐢宠缁勭粐";
+ //
+ // comboBoxEdit1
+ //
+ this.comboBoxEdit1.EditValue = "鏍囧噯";
+ this.comboBoxEdit1.Location = new System.Drawing.Point(94, 72);
+ this.comboBoxEdit1.Name = "comboBoxEdit1";
+ this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.comboBoxEdit1.Properties.Items.AddRange(new object[] {
+ "鏍囧噯"});
+ this.comboBoxEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.comboBoxEdit1.Size = new System.Drawing.Size(186, 24);
+ this.comboBoxEdit1.TabIndex = 374;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(20, 74);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(73, 21);
+ this.labelControl2.TabIndex = 373;
+ this.labelControl2.Text = "涓氬姟绫诲瀷 ";
//
// labelControl1
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(71, 121);
+ this.labelControl1.Location = new System.Drawing.Point(54, 134);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(34, 21);
this.labelControl1.TabIndex = 372;
@@ -806,55 +1225,17 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(113, 117);
+ this.txt_remark.Location = new System.Drawing.Point(94, 131);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(627, 28);
+ this.txt_remark.Size = new System.Drawing.Size(559, 28);
this.txt_remark.TabIndex = 371;
- //
- // txt_fstockorgidNo
- //
- this.txt_fstockorgidNo.Enabled = false;
- this.txt_fstockorgidNo.Location = new System.Drawing.Point(386, 86);
- this.txt_fstockorgidNo.Name = "txt_fstockorgidNo";
- this.txt_fstockorgidNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fstockorgidNo.Properties.Appearance.Options.UseFont = true;
- this.txt_fstockorgidNo.Size = new System.Drawing.Size(174, 28);
- this.txt_fstockorgidNo.TabIndex = 370;
- //
- // txt_fstockoutorgidNo
- //
- this.txt_fstockoutorgidNo.Enabled = false;
- this.txt_fstockoutorgidNo.Location = new System.Drawing.Point(386, 51);
- this.txt_fstockoutorgidNo.Name = "txt_fstockoutorgidNo";
- this.txt_fstockoutorgidNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fstockoutorgidNo.Properties.Appearance.Options.UseFont = true;
- this.txt_fstockoutorgidNo.Size = new System.Drawing.Size(174, 28);
- this.txt_fstockoutorgidNo.TabIndex = 369;
- //
- // txt_fromFcode
- //
- this.txt_fromFcode.IsReadly = false;
- this.txt_fromFcode.Location = new System.Drawing.Point(113, 85);
- this.txt_fromFcode.Margin = new System.Windows.Forms.Padding(0);
- this.txt_fromFcode.Name = "txt_fromFcode";
- this.txt_fromFcode.Size = new System.Drawing.Size(186, 30);
- this.txt_fromFcode.TabIndex = 366;
- //
- // txt_invFcode
- //
- this.txt_invFcode.IsReadly = false;
- this.txt_invFcode.Location = new System.Drawing.Point(113, 50);
- this.txt_invFcode.Margin = new System.Windows.Forms.Padding(0);
- this.txt_invFcode.Name = "txt_invFcode";
- this.txt_invFcode.Size = new System.Drawing.Size(186, 30);
- this.txt_invFcode.TabIndex = 365;
//
// txt_isWc
//
this.txt_isWc.Enabled = false;
- this.txt_isWc.Location = new System.Drawing.Point(941, 88);
+ this.txt_isWc.Location = new System.Drawing.Point(941, 74);
this.txt_isWc.Name = "txt_isWc";
this.txt_isWc.Properties.Caption = "";
this.txt_isWc.Size = new System.Drawing.Size(39, 24);
@@ -863,7 +1244,7 @@
// txt_shState
//
this.txt_shState.Enabled = false;
- this.txt_shState.Location = new System.Drawing.Point(830, 88);
+ this.txt_shState.Location = new System.Drawing.Point(830, 74);
this.txt_shState.Name = "txt_shState";
this.txt_shState.Properties.Caption = "";
this.txt_shState.Size = new System.Drawing.Size(29, 24);
@@ -871,33 +1252,40 @@
//
// txt_ftransferdirect
//
- this.txt_ftransferdirect.EditValue = "鏅��";
- this.txt_ftransferdirect.Location = new System.Drawing.Point(658, 18);
+ this.txt_ftransferdirect.EditValue = "-璇烽�夋嫨-";
+ this.txt_ftransferdirect.Location = new System.Drawing.Point(94, 100);
this.txt_ftransferdirect.Name = "txt_ftransferdirect";
this.txt_ftransferdirect.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_ftransferdirect.Properties.Items.AddRange(new object[] {
- "鏅��"});
+ "-璇烽�夋嫨-",
+ "閫�璐�(RETURN)",
+ "鏅��(GENERAL)"});
this.txt_ftransferdirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_ftransferdirect.Size = new System.Drawing.Size(82, 24);
+ this.txt_ftransferdirect.Size = new System.Drawing.Size(186, 24);
this.txt_ftransferdirect.TabIndex = 362;
//
// txt_fbilltypeid
//
- this.txt_fbilltypeid.EditValue = "鏍囧噯鐩存帴璋冩嫧鍗�";
- this.txt_fbilltypeid.Location = new System.Drawing.Point(386, 18);
+ this.txt_fbilltypeid.EditValue = "-璇烽�夋嫨-";
+ this.txt_fbilltypeid.Location = new System.Drawing.Point(94, 43);
this.txt_fbilltypeid.Name = "txt_fbilltypeid";
this.txt_fbilltypeid.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fbilltypeid.Properties.Items.AddRange(new object[] {
- "鏍囧噯鐩存帴璋冩嫧鍗�"});
+ "-璇烽�夋嫨-",
+ "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDBO1_SYS)",
+ "瀵勫敭鐩存帴璋冩嫧鍗�(ZJDBO2_SYS)",
+ "濮斿鐩存帴璋冩嫧鍗�(ZIDBO3_SYS)",
+ "鍒嗛攢鐩存帴璋冩嫧鍗�(ZJDBO4_SYS)",
+ "VMI鐩存帴璋冩嫧鍗�(ZJDBO5_SYS)"});
this.txt_fbilltypeid.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fbilltypeid.Size = new System.Drawing.Size(174, 24);
+ this.txt_fbilltypeid.Size = new System.Drawing.Size(186, 24);
this.txt_fbilltypeid.TabIndex = 361;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(986, 89);
+ this.labelControl11.Location = new System.Drawing.Point(986, 77);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -907,7 +1295,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(1037, 89);
+ this.lbGuid.Location = new System.Drawing.Point(1037, 77);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -916,7 +1304,7 @@
//
this.lb_isWc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isWc.Appearance.Options.UseFont = true;
- this.lb_isWc.Location = new System.Drawing.Point(865, 90);
+ this.lb_isWc.Location = new System.Drawing.Point(865, 76);
this.lb_isWc.Name = "lb_isWc";
this.lb_isWc.Size = new System.Drawing.Size(73, 21);
this.lb_isWc.TabIndex = 360;
@@ -926,67 +1314,27 @@
//
this.lb_billno.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_billno.Appearance.Options.UseFont = true;
- this.lb_billno.Location = new System.Drawing.Point(20, 20);
+ this.lb_billno.Location = new System.Drawing.Point(20, 15);
this.lb_billno.Name = "lb_billno";
- this.lb_billno.Size = new System.Drawing.Size(85, 21);
+ this.lb_billno.Size = new System.Drawing.Size(68, 21);
this.lb_billno.TabIndex = 327;
- this.lb_billno.Text = "璋冩嫧鐢宠鍗�";
+ this.lb_billno.Text = "鐢宠鍗曞彿";
//
// txt_billno
//
this.txt_billno.Enabled = false;
- this.txt_billno.Location = new System.Drawing.Point(113, 16);
+ this.txt_billno.Location = new System.Drawing.Point(94, 11);
this.txt_billno.Name = "txt_billno";
this.txt_billno.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billno.Properties.Appearance.Options.UseFont = true;
this.txt_billno.Size = new System.Drawing.Size(186, 28);
this.txt_billno.TabIndex = 327;
//
- // lb_fstockorgidNo
- //
- this.lb_fstockorgidNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fstockorgidNo.Appearance.Options.UseFont = true;
- this.lb_fstockorgidNo.Location = new System.Drawing.Point(312, 90);
- this.lb_fstockorgidNo.Name = "lb_fstockorgidNo";
- this.lb_fstockorgidNo.Size = new System.Drawing.Size(68, 21);
- this.lb_fstockorgidNo.TabIndex = 319;
- this.lb_fstockorgidNo.Text = "璋冨叆缁勭粐";
- //
- // lb_fstockoutorgidNo
- //
- this.lb_fstockoutorgidNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fstockoutorgidNo.Appearance.Options.UseFont = true;
- this.lb_fstockoutorgidNo.Location = new System.Drawing.Point(312, 56);
- this.lb_fstockoutorgidNo.Name = "lb_fstockoutorgidNo";
- this.lb_fstockoutorgidNo.Size = new System.Drawing.Size(68, 21);
- this.lb_fstockoutorgidNo.TabIndex = 312;
- this.lb_fstockoutorgidNo.Text = "璋冨嚭缁勭粐";
- //
- // lb_fromFcode
- //
- this.lb_fromFcode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fromFcode.Appearance.Options.UseFont = true;
- this.lb_fromFcode.Location = new System.Drawing.Point(37, 90);
- this.lb_fromFcode.Name = "lb_fromFcode";
- this.lb_fromFcode.Size = new System.Drawing.Size(68, 21);
- this.lb_fromFcode.TabIndex = 298;
- this.lb_fromFcode.Text = "璋冨叆浠撳簱";
- //
- // lb_invFcode
- //
- this.lb_invFcode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_invFcode.Appearance.Options.UseFont = true;
- this.lb_invFcode.Location = new System.Drawing.Point(37, 56);
- this.lb_invFcode.Name = "lb_invFcode";
- this.lb_invFcode.Size = new System.Drawing.Size(68, 21);
- this.lb_invFcode.TabIndex = 285;
- this.lb_invFcode.Text = "璋冨嚭浠撳簱";
- //
// lb_shState
//
this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shState.Appearance.Options.UseFont = true;
- this.lb_shState.Location = new System.Drawing.Point(753, 90);
+ this.lb_shState.Location = new System.Drawing.Point(753, 76);
this.lb_shState.Name = "lb_shState";
this.lb_shState.Size = new System.Drawing.Size(73, 21);
this.lb_shState.TabIndex = 267;
@@ -996,7 +1344,7 @@
//
this.lb_shDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shDate.Appearance.Options.UseFont = true;
- this.lb_shDate.Location = new System.Drawing.Point(753, 56);
+ this.lb_shDate.Location = new System.Drawing.Point(753, 45);
this.lb_shDate.Name = "lb_shDate";
this.lb_shDate.Size = new System.Drawing.Size(73, 21);
this.lb_shDate.TabIndex = 262;
@@ -1005,7 +1353,7 @@
// txt_shDate
//
this.txt_shDate.Enabled = false;
- this.txt_shDate.Location = new System.Drawing.Point(830, 52);
+ this.txt_shDate.Location = new System.Drawing.Point(830, 41);
this.txt_shDate.Name = "txt_shDate";
this.txt_shDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_shDate.Properties.Appearance.Options.UseFont = true;
@@ -1016,7 +1364,7 @@
//
this.lb_shBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shBy.Appearance.Options.UseFont = true;
- this.lb_shBy.Location = new System.Drawing.Point(770, 20);
+ this.lb_shBy.Location = new System.Drawing.Point(770, 15);
this.lb_shBy.Name = "lb_shBy";
this.lb_shBy.Size = new System.Drawing.Size(56, 21);
this.lb_shBy.TabIndex = 258;
@@ -1025,77 +1373,18 @@
// txt_shBy
//
this.txt_shBy.Enabled = false;
- this.txt_shBy.Location = new System.Drawing.Point(830, 16);
+ this.txt_shBy.Location = new System.Drawing.Point(830, 11);
this.txt_shBy.Name = "txt_shBy";
this.txt_shBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_shBy.Properties.Appearance.Options.UseFont = true;
this.txt_shBy.Size = new System.Drawing.Size(150, 28);
this.txt_shBy.TabIndex = 258;
//
- // lb_fsaleorgid
- //
- this.lb_fsaleorgid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fsaleorgid.Appearance.Options.UseFont = true;
- this.lb_fsaleorgid.Location = new System.Drawing.Point(753, 121);
- this.lb_fsaleorgid.Name = "lb_fsaleorgid";
- this.lb_fsaleorgid.Size = new System.Drawing.Size(73, 21);
- this.lb_fsaleorgid.TabIndex = 235;
- this.lb_fsaleorgid.Text = "閿�鍞粍缁� ";
- //
- // txt_fsaleorgid
- //
- this.txt_fsaleorgid.Location = new System.Drawing.Point(830, 117);
- this.txt_fsaleorgid.Name = "txt_fsaleorgid";
- this.txt_fsaleorgid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fsaleorgid.Properties.Appearance.Options.UseFont = true;
- this.txt_fsaleorgid.Size = new System.Drawing.Size(150, 28);
- this.txt_fsaleorgid.TabIndex = 235;
- //
- // lb_fowneridhead
- //
- this.lb_fowneridhead.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fowneridhead.Appearance.Options.UseFont = true;
- this.lb_fowneridhead.Location = new System.Drawing.Point(579, 90);
- this.lb_fowneridhead.Name = "lb_fowneridhead";
- this.lb_fowneridhead.Size = new System.Drawing.Size(73, 21);
- this.lb_fowneridhead.TabIndex = 231;
- this.lb_fowneridhead.Text = "璋冨叆璐т富 ";
- //
- // txt_fowneridhead
- //
- this.txt_fowneridhead.Enabled = false;
- this.txt_fowneridhead.Location = new System.Drawing.Point(658, 86);
- this.txt_fowneridhead.Name = "txt_fowneridhead";
- this.txt_fowneridhead.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fowneridhead.Properties.Appearance.Options.UseFont = true;
- this.txt_fowneridhead.Size = new System.Drawing.Size(82, 28);
- this.txt_fowneridhead.TabIndex = 231;
- //
- // lb_fowneroutidhead
- //
- this.lb_fowneroutidhead.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_fowneroutidhead.Appearance.Options.UseFont = true;
- this.lb_fowneroutidhead.Location = new System.Drawing.Point(579, 56);
- this.lb_fowneroutidhead.Name = "lb_fowneroutidhead";
- this.lb_fowneroutidhead.Size = new System.Drawing.Size(73, 21);
- this.lb_fowneroutidhead.TabIndex = 226;
- this.lb_fowneroutidhead.Text = "璋冨嚭璐т富 ";
- //
- // txt_fowneroutidhead
- //
- this.txt_fowneroutidhead.Enabled = false;
- this.txt_fowneroutidhead.Location = new System.Drawing.Point(658, 52);
- this.txt_fowneroutidhead.Name = "txt_fowneroutidhead";
- this.txt_fowneroutidhead.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fowneroutidhead.Properties.Appearance.Options.UseFont = true;
- this.txt_fowneroutidhead.Size = new System.Drawing.Size(82, 28);
- this.txt_fowneroutidhead.TabIndex = 226;
- //
// lb_ftransferdirect
//
this.lb_ftransferdirect.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_ftransferdirect.Appearance.Options.UseFont = true;
- this.lb_ftransferdirect.Location = new System.Drawing.Point(579, 20);
+ this.lb_ftransferdirect.Location = new System.Drawing.Point(20, 102);
this.lb_ftransferdirect.Name = "lb_ftransferdirect";
this.lb_ftransferdirect.Size = new System.Drawing.Size(73, 21);
this.lb_ftransferdirect.TabIndex = 213;
@@ -1105,7 +1394,7 @@
//
this.lb_fbilltypeid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fbilltypeid.Appearance.Options.UseFont = true;
- this.lb_fbilltypeid.Location = new System.Drawing.Point(312, 20);
+ this.lb_fbilltypeid.Location = new System.Drawing.Point(20, 45);
this.lb_fbilltypeid.Name = "lb_fbilltypeid";
this.lb_fbilltypeid.Size = new System.Drawing.Size(73, 21);
this.lb_fbilltypeid.TabIndex = 211;
@@ -1115,7 +1404,7 @@
//
this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_id.Appearance.Options.UseFont = true;
- this.lb_id.Location = new System.Drawing.Point(20, 20);
+ this.lb_id.Location = new System.Drawing.Point(20, 15);
this.lb_id.Name = "lb_id";
this.lb_id.Size = new System.Drawing.Size(5, 21);
this.lb_id.TabIndex = 210;
@@ -1132,6 +1421,24 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // rptDrHz
+ //
+ this.rptDrHz.AutoHeight = false;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDrHz.Name = "rptDrHz";
+ this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
+ //
+ // rptDcHz
+ //
+ this.rptDcHz.AutoHeight = false;
+ editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptDcHz.Name = "rptDcHz";
+ this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
+ //
// Frm_MesDbck
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1147,6 +1454,12 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcOrg)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcCk)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcCw)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrOrg)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrCk)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrCw)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1158,9 +1471,11 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit4.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit3.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstockorgidNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fstockoutorgidNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isWc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftransferdirect.Properties)).EndInit();
@@ -1168,10 +1483,9 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billno.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fsaleorgid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fowneridhead.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fowneroutidhead.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDrHz)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptDcHz)).EndInit();
this.ResumeLayout(false);
}
@@ -1222,21 +1536,11 @@
private DevExpress.XtraEditors.LabelControl lb_isWc;
private DevExpress.XtraEditors.LabelControl lb_billno;
private DevExpress.XtraEditors.TextEdit txt_billno;
- private DevExpress.XtraEditors.LabelControl lb_fstockorgidNo;
- private DevExpress.XtraEditors.LabelControl lb_fstockoutorgidNo;
- private DevExpress.XtraEditors.LabelControl lb_fromFcode;
- private DevExpress.XtraEditors.LabelControl lb_invFcode;
private DevExpress.XtraEditors.LabelControl lb_shState;
private DevExpress.XtraEditors.LabelControl lb_shDate;
private DevExpress.XtraEditors.TextEdit txt_shDate;
private DevExpress.XtraEditors.LabelControl lb_shBy;
private DevExpress.XtraEditors.TextEdit txt_shBy;
- private DevExpress.XtraEditors.LabelControl lb_fsaleorgid;
- private DevExpress.XtraEditors.TextEdit txt_fsaleorgid;
- private DevExpress.XtraEditors.LabelControl lb_fowneridhead;
- private DevExpress.XtraEditors.TextEdit txt_fowneridhead;
- private DevExpress.XtraEditors.LabelControl lb_fowneroutidhead;
- private DevExpress.XtraEditors.TextEdit txt_fowneroutidhead;
private DevExpress.XtraEditors.LabelControl lb_ftransferdirect;
private DevExpress.XtraEditors.LabelControl lb_fbilltypeid;
private DevExpress.XtraEditors.LabelControl lb_id;
@@ -1244,10 +1548,6 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_ftransferdirect;
private DevExpress.XtraEditors.CheckEdit txt_isWc;
private DevExpress.XtraEditors.CheckEdit txt_shState;
- private UserControl.UcLookCk txt_invFcode;
- private UserControl.UcLookCk txt_fromFcode;
- private DevExpress.XtraEditors.TextEdit txt_fstockoutorgidNo;
- private DevExpress.XtraEditors.TextEdit txt_fstockorgidNo;
private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
@@ -1257,5 +1557,40 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
+ private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit3;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit2;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private UserControl.UcLookOrg txt_sqOrg;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit4;
+ private DevExpress.XtraEditors.LabelControl labelControl6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDcOrg;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDcCk;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDcCw;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDrOrg;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDrCk;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDrCw;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDrHz;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDcHz;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index bb53560..96b8c05 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -29,8 +29,8 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "shState", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shState", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -44,12 +44,12 @@
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//璁剧疆浠撳簱閫夋嫨
- txt_invFcode.getSuppler("");
- txt_fromFcode.getSuppler("");
- this.txt_invFcode.EditChanged += (s, e) =>
+ //txt_invFcode.getSuppler("");
+ //txt_fromFcode.getSuppler("");
+ this.txt_sqOrg.EditChanged += (s, e) =>
{
- txt_fstockoutorgidNo.Text = txt_invFcode.GetOrgName();
- txt_fowneroutidhead.Text = txt_invFcode.GetOrgId();
+ //txt_fstockoutorgidNo.Text = txt_invFcode.GetOrgName();
+ //txt_fowneroutidhead.Text = txt_invFcode.GetOrgId();
var _obj = new
{
currentPage = 1,
@@ -71,10 +71,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
- this.txt_fromFcode.EditChanged += (s, e) => {
- txt_fstockorgidNo.Text = txt_fromFcode.GetOrgName();
- txt_fowneridhead.Text = txt_fromFcode.GetOrgId();
- };
+ //this.txt_fromFcode.EditChanged += (s, e) => {
+ // txt_fstockorgidNo.Text = txt_fromFcode.GetOrgName();
+ // txt_fowneridhead.Text = txt_fromFcode.GetOrgId();
+ //};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -242,27 +242,27 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- string _inCkId = txt_invFcode.GetId();//鍑�
- string _inRkId = txt_fromFcode.GetId();//鍏�
- if (string.IsNullOrEmpty(_inCkId))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍑鸿揣浠撳簱锛�");
- txt_invFcode.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_inRkId))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀惰揣浠撳簱锛�");
- txt_fromFcode.Focus();
- return;
- }
+ // string _inCkId = txt_invFcode.GetId();//鍑�
+ // string _inRkId = txt_fromFcode.GetId();//鍏�
+ //if (string.IsNullOrEmpty(_inCkId))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍑鸿揣浠撳簱锛�");
+ // txt_invFcode.Focus();
+ // return;
+ //}
+ //if (string.IsNullOrEmpty(_inRkId))
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀惰揣浠撳簱锛�");
+ // txt_fromFcode.Focus();
+ // return;
+ //}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- inCkId = _inCkId,//鍑轰粨
- inRkId = _inRkId,//鍏ュ簱
- inDjlx= txt_fbilltypeid.Text.Trim(),//鍗曟嵁绫诲瀷
- inDbfx= txt_ftransferdirect.Text.Trim(),//璋冩嫧鏂瑰悜
+ //inCkId = _inCkId,//鍑轰粨
+ //inRkId = _inRkId,//鍏ュ簱
+ inDjlx = txt_fbilltypeid.Text.Trim(),//鍗曟嵁绫诲瀷
+ inDbfx = txt_ftransferdirect.Text.Trim(),//璋冩嫧鏂瑰悜
inRemark = txt_remark.Text.Trim(),//澶囨敞
list = new List<dynamic>(),
};
@@ -538,5 +538,241 @@
}
}
+
+ /// <summary>
+ /// 鏌ユ壘璋冨嚭缁勭粐
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDcOrg_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ SelectOrg frm = new SelectOrg();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("dcOrg", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("dcOrgGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ユ壘璋冨嚭浠撳簱
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDcCk_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ if (dr["dcOrgGuid"] == null)
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+ return;
+ };
+ var strOrgGuid = dr["dcOrgGuid"].ToString();
+ if (string.IsNullOrEmpty(strOrgGuid))
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+ return;
+ };
+ SelectCk frm = new SelectCk(strOrgGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("dcCk", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("dcCkGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ユ壘浠撲綅
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDcCw_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ if (dr["dcCkGuid"] == null)
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+ return;
+ };
+ var strCkGuid = dr["dcCkGuid"].ToString();
+ if (string.IsNullOrEmpty(strCkGuid))
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭浠撳簱锛�");
+ return;
+ };
+ SelectCw frm = new SelectCw(strCkGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("dcCw", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("dcCwGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+
+ /// <summary>
+ /// 璋冨叆缁勭粐
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDrOrg_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ SelectOrg frm = new SelectOrg();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("drOrg", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("drOrgGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 璋冨叆浠撳簱
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDrCk_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ if (dr["drOrgGuid"] == null)
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+ return;
+ };
+ var strOrgGuid = dr["drOrgGuid"].ToString();
+ if (string.IsNullOrEmpty(strOrgGuid))
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+ return;
+ };
+ SelectCk frm = new SelectCk(strOrgGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("drCk", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("drCkGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 璋冨叆浠撲綅
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDrCw_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ if (dr["drCkGuid"] == null)
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ return;
+ };
+ var strCkGuid = dr["drCkGuid"].ToString();
+ if (string.IsNullOrEmpty(strCkGuid))
+ {
+ MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ return;
+ };
+ SelectCw frm = new SelectCw(strCkGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("drCw", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("drCwGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+
+ /// <summary>
+ /// 璋冨叆璐т富
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptDrHz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ //var dr = gvMx1.GetDataRow(rowhandle);
+ //if (dr["drCkGuid"] == null)
+ //{
+ // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ // return;
+ //};
+ //var strCkGuid = dr["drCkGuid"].ToString();
+ //if (string.IsNullOrEmpty(strCkGuid))
+ //{
+ // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ // return;
+ //};
+ SelectHz frm = new SelectHz("", "");
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("drHz", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("drHzGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 璋冨嚭璐т富
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+
+ private void rptDcHz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ //var dr = gvMx1.GetDataRow(rowhandle);
+ //if (dr["drCkGuid"] == null)
+ //{
+ // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ // return;
+ //};
+ //var strCkGuid = dr["drCkGuid"].ToString();
+ //if (string.IsNullOrEmpty(strCkGuid))
+ //{
+ // MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+ // return;
+ //};
+ SelectHz frm = new SelectHz("", "");
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("dcHz", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("dcHzGuid", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index b08d780..75e40af 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -720,6 +720,24 @@
<Compile Include="UserControl\SelectCheckDt.Designer.cs">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\SelectCk.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectCk.Designer.cs">
+ <DependentUpon>SelectCk.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectCw.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectCw.Designer.cs">
+ <DependentUpon>SelectCw.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectHz.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectHz.Designer.cs">
+ <DependentUpon>SelectHz.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\SelectItemTbl.cs">
<SubType>Form</SubType>
</Compile>
@@ -731,6 +749,12 @@
</Compile>
<Compile Include="UserControl\SelectMesCgthSq.Designer.cs">
<DependentUpon>SelectMesCgthSq.cs</DependentUpon>
+ </Compile>
+ <Compile Include="UserControl\SelectOrg.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectOrg.Designer.cs">
+ <DependentUpon>SelectOrg.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\SelectWomdaahb.cs">
<SubType>Form</SubType>
@@ -1174,11 +1198,23 @@
<EmbeddedResource Include="UserControl\SelectCheckDt.resx">
<DependentUpon>SelectCheckDt.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectCk.resx">
+ <DependentUpon>SelectCk.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectCw.resx">
+ <DependentUpon>SelectCw.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectHz.resx">
+ <DependentUpon>SelectHz.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectItemTbl.resx">
<DependentUpon>SelectItemTbl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectMesCgthSq.resx">
<DependentUpon>SelectMesCgthSq.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectOrg.resx">
+ <DependentUpon>SelectOrg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectWomdaahb.resx">
<DependentUpon>SelectWomdaahb.cs</DependentUpon>
@@ -1461,6 +1497,8 @@
<None Include="Resources\alignhorizontalcenter.svg" />
<None Include="Resources\alignhorizontalcenter1.svg" />
<None Include="Resources\alignverticalleft.svg" />
+ <None Include="Resources\lookup&reference_16x162.png" />
+ <None Include="Resources\checkbox2_16x162.png" />
<Content Include="Resources\user_16x16.png" />
</ItemGroup>
<ItemGroup />
diff --git a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
index a05c277..7f284de 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
+++ b/DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -343,6 +343,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap checkbox2_16x162 {
+ get {
+ object obj = ResourceManager.GetObject("checkbox2_16x162", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap checkbox2_32x32 {
get {
object obj = ResourceManager.GetObject("checkbox2_32x32", resourceCulture);
@@ -1243,6 +1253,16 @@
/// <summary>
/// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
/// </summary>
+ internal static System.Drawing.Bitmap lookup_reference_16x162 {
+ get {
+ object obj = ResourceManager.GetObject("lookup&reference_16x162", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ /// <summary>
+ /// 鏌ユ壘 System.Drawing.Bitmap 绫诲瀷鐨勬湰鍦板寲璧勬簮銆�
+ /// </summary>
internal static System.Drawing.Bitmap lookup_reference_32x32 {
get {
object obj = ResourceManager.GetObject("lookup&reference_32x32", resourceCulture);
diff --git a/DevApp/Gs.DevApp/Properties/Resources.resx b/DevApp/Gs.DevApp/Properties/Resources.resx
index 5633198..6ba502d 100644
--- a/DevApp/Gs.DevApp/Properties/Resources.resx
+++ b/DevApp/Gs.DevApp/Properties/Resources.resx
@@ -121,9 +121,6 @@
<data name="iconsetarrows3_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconsetarrows3_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -147,6 +144,14 @@
</data>
<data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="lookup&reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\lookup&reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
@@ -260,9 +265,6 @@
<data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -309,10 +311,13 @@
<data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
+ <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sortasc_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortasc_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -365,10 +370,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\show_16x16.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="fill_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\fill_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -495,9 +498,6 @@
<data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="task_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\task_32x32.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
@@ -549,8 +549,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="clearformatting_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\clearformatting_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -708,8 +708,10 @@
<data name="cleartablestyle_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cleartablestyle_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="checkbox2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_32x32.png;System.Drawing.Bitmap,
+ System.Drawing, Version=4.0.0.0, Culture=neutral,
+ PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="exportfile_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\exportfile_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -729,10 +731,8 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="chartsshowlegend_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\chartsshowlegend_32x32.png;System.Drawing.Bitmap,
- System.Drawing, Version=4.0.0.0, Culture=neutral,
- PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
@@ -766,6 +766,9 @@
<value>..\Resources\doublenext_16x16.png;System.Drawing.Bitmap,
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="viewmergeddata_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\viewmergeddata_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dropandhighlowlines_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dropandhighlowlines_32x32.png;System.Drawing.Bitmap,
@@ -819,6 +822,9 @@
</data>
<data name="sendxls_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sendxls_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="down_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\down_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="area3d_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\area3d_16x16.png;System.Drawing.Bitmap,
@@ -889,7 +895,7 @@
System.Drawing, Version=4.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+ <data name="checkbox2_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\checkbox2_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Resources/checkbox2_16x162.png b/DevApp/Gs.DevApp/Resources/checkbox2_16x162.png
new file mode 100644
index 0000000..3e4ab0e
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/checkbox2_16x162.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/Resources/lookup&reference_16x162.png b/DevApp/Gs.DevApp/Resources/lookup&reference_16x162.png
new file mode 100644
index 0000000..8664b34
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/lookup&reference_16x162.png
Binary files differ
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
new file mode 100644
index 0000000..110196d
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.Designer.cs
@@ -0,0 +1,184 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class SelectCk
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ 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.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.TabIndex = 3;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ 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.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_msg,
+ this.gv_userName,
+ this.gv_Btn});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "浠撳簱鍚嶇О";
+ this.gv_operationTime.FieldName = "depotName";
+ this.gv_operationTime.MinWidth = 10;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Tag = "query_OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 300;
+ //
+ // gv_operationTable
+ //
+ this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "浠撳簱缂栧彿";
+ this.gv_operationTable.FieldName = "depotCode";
+ this.gv_operationTable.MinWidth = 10;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 100;
+ //
+ // gv_msg
+ //
+ this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_msg.AppearanceCell.Options.UseFont = true;
+ this.gv_msg.Caption = "浣跨敤鐘舵��";
+ this.gv_msg.FieldName = "isNg";
+ this.gv_msg.MinWidth = 10;
+ this.gv_msg.Name = "gv_msg";
+ this.gv_msg.OptionsColumn.AllowEdit = false;
+ this.gv_msg.Tag = "query_MSG";
+ this.gv_msg.Visible = true;
+ this.gv_msg.VisibleIndex = 2;
+ this.gv_msg.Width = 200;
+ //
+ // gv_userName
+ //
+ this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鍚屾鏃堕棿";
+ this.gv_userName.FieldName = "edtTime";
+ this.gv_userName.MinWidth = 10;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_USER_NAME";
+ this.gv_userName.Width = 250;
+ //
+ // gv_Btn
+ //
+ this.gv_Btn.Caption = "閫夋嫨";
+ this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gv_Btn.MinWidth = 25;
+ this.gv_Btn.Name = "gv_Btn";
+ this.gv_Btn.Visible = true;
+ this.gv_Btn.VisibleIndex = 3;
+ this.gv_Btn.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ 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, 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);
+ //
+ // SelectCk
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(581, 489);
+ this.Controls.Add(this.gcMain);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectCk";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨浠撳簱";
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.cs b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
new file mode 100644
index 0000000..997418a
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.cs
@@ -0,0 +1,125 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+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;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class SelectCk : DevExpress.XtraEditors.XtraForm
+ {
+ string _strGuid = "";
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ public SelectCk(string strGuid)
+ {
+ _strGuid = strGuid;
+ InitializeComponent();
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ _filterList.Clear();
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ _sbSqlWhere += (" and org.guid='" + _strGuid+"'");
+ var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc ,a.depot_code", "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MesDepotsManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ return;
+ }
+ var mxName = dr["depotName"].ToString();
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ guid = mxGuid,
+ name = mxName,
+ });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
+ }
+
+
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCk.resx b/DevApp/Gs.DevApp/UserControl/SelectCk.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCk.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCw.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCw.Designer.cs
new file mode 100644
index 0000000..819e88a
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCw.Designer.cs
@@ -0,0 +1,167 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class SelectCw
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ 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.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.TabIndex = 3;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ 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.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_userName,
+ this.gv_Btn});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "浠撲綅鍚嶇О";
+ this.gv_operationTime.FieldName = "depotSectionName";
+ this.gv_operationTime.MinWidth = 10;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Tag = "query_OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 300;
+ //
+ // gv_operationTable
+ //
+ this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "浠撲綅缂栧彿";
+ this.gv_operationTable.FieldName = "depotSectionCode";
+ this.gv_operationTable.MinWidth = 10;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 100;
+ //
+ // gv_userName
+ //
+ this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鍚屾鏃堕棿";
+ this.gv_userName.FieldName = "lastupdateDate";
+ this.gv_userName.MinWidth = 10;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_USER_NAME";
+ this.gv_userName.Width = 250;
+ //
+ // gv_Btn
+ //
+ this.gv_Btn.Caption = "閫夋嫨";
+ this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gv_Btn.MinWidth = 25;
+ this.gv_Btn.Name = "gv_Btn";
+ this.gv_Btn.Visible = true;
+ this.gv_Btn.VisibleIndex = 2;
+ this.gv_Btn.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ 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, 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);
+ //
+ // SelectCw
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(581, 489);
+ this.Controls.Add(this.gcMain);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectCw";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨浠撲綅";
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCw.cs b/DevApp/Gs.DevApp/UserControl/SelectCw.cs
new file mode 100644
index 0000000..d1a369e
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCw.cs
@@ -0,0 +1,129 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class SelectCw : DevExpress.XtraEditors.XtraForm
+ {
+ string _strGuid = "";
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ public SelectCw(string strGuid)
+ {
+ _strGuid = strGuid;
+ InitializeComponent();
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ _filterList.Clear();
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _obj = new
+ {
+ guid = _strGuid //涓诲缓
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MesDepotsManager/GetModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ var _job = JObject.Parse(strJson);
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["list"]) array.Add(a);
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ {
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ }
+ else
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ return;
+ }
+ var mxName = dr["depotSectionName"].ToString();
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ guid = mxGuid,
+ name = mxName,
+ });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
+ }
+
+
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCw.resx b/DevApp/Gs.DevApp/UserControl/SelectCw.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectCw.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
new file mode 100644
index 0000000..c767fb7
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
@@ -0,0 +1,167 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class SelectHz
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ 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.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.TabIndex = 3;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ 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.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_userName,
+ this.gv_Btn});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "缁勭粐鍚嶇О";
+ this.gv_operationTime.FieldName = "name";
+ this.gv_operationTime.MinWidth = 10;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Tag = "query_OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 300;
+ //
+ // gv_operationTable
+ //
+ this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "缁勭粐缂栧彿";
+ this.gv_operationTable.FieldName = "fNumber";
+ this.gv_operationTable.MinWidth = 10;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 100;
+ //
+ // gv_userName
+ //
+ this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鍚屾鏃堕棿";
+ this.gv_userName.FieldName = "edtTime";
+ this.gv_userName.MinWidth = 10;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_USER_NAME";
+ this.gv_userName.Width = 250;
+ //
+ // gv_Btn
+ //
+ this.gv_Btn.Caption = "閫夋嫨";
+ this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gv_Btn.MinWidth = 25;
+ this.gv_Btn.Name = "gv_Btn";
+ this.gv_Btn.Visible = true;
+ this.gv_Btn.VisibleIndex = 2;
+ this.gv_Btn.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ 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, 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);
+ //
+ // SelectOrg
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(581, 489);
+ this.Controls.Add(this.gcMain);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectOrg";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨缁勭粐";
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
new file mode 100644
index 0000000..ed99ac5
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.cs
@@ -0,0 +1,103 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+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;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class SelectHz : DevExpress.XtraEditors.XtraForm
+ {
+ string _strOrgGuid = "";
+ string _strHzType = "";
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ public SelectHz(string strOrgGuid, string strHzType)
+ {
+ InitializeComponent();
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ _strOrgGuid = strOrgGuid;
+ _strHzType = strHzType;
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ return;
+ }
+ var mxName = dr["name"].ToString();
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ guid = mxGuid,
+ name = mxName,
+ });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
+ }
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.resx b/DevApp/Gs.DevApp/UserControl/SelectHz.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectOrg.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectOrg.Designer.cs
new file mode 100644
index 0000000..c2230c0
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectOrg.Designer.cs
@@ -0,0 +1,167 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class SelectOrg
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ 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.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.TabIndex = 3;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ 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.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_userName,
+ this.gv_Btn});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "缁勭粐鍚嶇О";
+ this.gv_operationTime.FieldName = "name";
+ this.gv_operationTime.MinWidth = 10;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Tag = "query_OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 300;
+ //
+ // gv_operationTable
+ //
+ this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "缁勭粐缂栧彿";
+ this.gv_operationTable.FieldName = "fNumber";
+ this.gv_operationTable.MinWidth = 10;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 100;
+ //
+ // gv_userName
+ //
+ this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "鍚屾鏃堕棿";
+ this.gv_userName.FieldName = "edtTime";
+ this.gv_userName.MinWidth = 10;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_USER_NAME";
+ this.gv_userName.Width = 250;
+ //
+ // gv_Btn
+ //
+ this.gv_Btn.Caption = "閫夋嫨";
+ this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gv_Btn.MinWidth = 25;
+ this.gv_Btn.Name = "gv_Btn";
+ this.gv_Btn.Visible = true;
+ this.gv_Btn.VisibleIndex = 2;
+ this.gv_Btn.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ 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, 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);
+ //
+ // SelectOrg
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(581, 489);
+ this.Controls.Add(this.gcMain);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectOrg";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨缁勭粐";
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectOrg.cs b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
new file mode 100644
index 0000000..286ae02
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectOrg.cs
@@ -0,0 +1,117 @@
+锘縰sing DevExpress.Utils.DirectXPaint;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class SelectOrg : DevExpress.XtraEditors.XtraForm
+ {
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ public SelectOrg()
+ {
+ InitializeComponent();
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gridView1);
+ Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ getPageList(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
+ }
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ _filterList.Clear();
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ var pgq = new PageQueryModel(curPage, 999999, "FID", "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns();
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ return;
+ }
+ var mxName = dr["name"].ToString();
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ guid = mxGuid,
+ name = mxName,
+ });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
+ }
+
+
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectOrg.resx b/DevApp/Gs.DevApp/UserControl/SelectOrg.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectOrg.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
--
Gitblit v1.9.3