From 56972203702e52b0d858cdfb63c49ef0fae9e77b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 25 十月 2024 16:16:14 +0800
Subject: [PATCH] 整理
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.resx | 244 +++----
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 84 --
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.resx | 244 +++----
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 36
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 10
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.resx | 244 +++----
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs | 626 ++------------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.resx | 244 +++----
9 files changed, 569 insertions(+), 1,175 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index 00c2703..19c9e77 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -30,60 +30,30 @@
/// </summary>
private void InitializeComponent()
{
- this.lb_remark5 = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark5 = new DevExpress.XtraEditors.TextEdit();
- this.gv_remark5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_remark4 = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark4 = new DevExpress.XtraEditors.TextEdit();
- this.gv_remark4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_remark3 = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark3 = new DevExpress.XtraEditors.TextEdit();
- this.gv_remark3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_useOrg = new DevExpress.XtraEditors.LabelControl();
- this.txt_useOrg = new DevExpress.XtraEditors.TextEdit();
- this.gv_useOrg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_createOrg = new DevExpress.XtraEditors.LabelControl();
- this.txt_createOrg = new DevExpress.XtraEditors.TextEdit();
- this.gv_createOrg = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fseller = new DevExpress.XtraEditors.LabelControl();
this.txt_fseller = new DevExpress.XtraEditors.TextEdit();
this.gv_fseller = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fforbidstatus = new DevExpress.XtraEditors.LabelControl();
this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_iscommit = new DevExpress.XtraEditors.LabelControl();
- this.txt_iscommit = new DevExpress.XtraEditors.TextEdit();
this.gv_iscommit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_lotFlag = new DevExpress.XtraEditors.LabelControl();
- this.txt_lotFlag = new DevExpress.XtraEditors.TextEdit();
this.gv_lotFlag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_itemSap = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemSap = new DevExpress.XtraEditors.TextEdit();
this.gv_itemSap = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_itemC = new DevExpress.XtraEditors.LabelControl();
- this.txt_itemC = new DevExpress.XtraEditors.TextEdit();
this.gv_itemC = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_factory = new DevExpress.XtraEditors.TextEdit();
this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_company = new DevExpress.XtraEditors.LabelControl();
this.txt_company = new DevExpress.XtraEditors.TextEdit();
- this.gv_company = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_anred = new DevExpress.XtraEditors.LabelControl();
this.txt_anred = new DevExpress.XtraEditors.TextEdit();
this.gv_anred = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -111,9 +81,6 @@
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_guid = new DevExpress.XtraEditors.LabelControl();
- this.txt_guid = new DevExpress.XtraEditors.TextEdit();
- this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -124,18 +91,8 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fseller.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iscommit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotFlag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemSap.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemC.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
@@ -151,7 +108,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_land.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -161,176 +117,11 @@
this.panel1.SuspendLayout();
this.SuspendLayout();
//
- // lb_remark5
- //
- this.lb_remark5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark5.Appearance.Options.UseFont = true;
- this.lb_remark5.Location = new System.Drawing.Point(770, 212);
- this.lb_remark5.Name = "lb_remark5";
- this.lb_remark5.Size = new System.Drawing.Size(99, 21);
- this.lb_remark5.TabIndex = 336;
- this.lb_remark5.Text = "鑷畾涔夊瓧娈�5 ";
- //
- // txt_remark5
- //
- this.txt_remark5.Location = new System.Drawing.Point(830, 212);
- this.txt_remark5.Name = "txt_remark5";
- this.txt_remark5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark5.Properties.Appearance.Options.UseFont = true;
- this.txt_remark5.Size = new System.Drawing.Size(150, 28);
- this.txt_remark5.TabIndex = 336;
- //
- // gv_remark5
- //
- this.gv_remark5.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark5.AppearanceCell.Options.UseFont = true;
- this.gv_remark5.Caption = "鑷畾涔夊瓧娈�5 ";
- this.gv_remark5.FieldName = "remark5";
- this.gv_remark5.MinWidth = 50;
- this.gv_remark5.Name = "gv_remark5";
- this.gv_remark5.OptionsColumn.AllowEdit = false;
- this.gv_remark5.Tag = "query_a.remark5";
- this.gv_remark5.Visible = true;
- this.gv_remark5.VisibleIndex = 27;
- this.gv_remark5.Width = 94;
- //
- // lb_remark4
- //
- this.lb_remark4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark4.Appearance.Options.UseFont = true;
- this.lb_remark4.Location = new System.Drawing.Point(520, 212);
- this.lb_remark4.Name = "lb_remark4";
- this.lb_remark4.Size = new System.Drawing.Size(99, 21);
- this.lb_remark4.TabIndex = 327;
- this.lb_remark4.Text = "鑷畾涔夊瓧娈�4 ";
- //
- // txt_remark4
- //
- this.txt_remark4.Location = new System.Drawing.Point(580, 212);
- this.txt_remark4.Name = "txt_remark4";
- this.txt_remark4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark4.Properties.Appearance.Options.UseFont = true;
- this.txt_remark4.Size = new System.Drawing.Size(150, 28);
- this.txt_remark4.TabIndex = 327;
- //
- // gv_remark4
- //
- this.gv_remark4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark4.AppearanceCell.Options.UseFont = true;
- this.gv_remark4.Caption = "鑷畾涔夊瓧娈�4 ";
- this.gv_remark4.FieldName = "remark4";
- this.gv_remark4.MinWidth = 50;
- this.gv_remark4.Name = "gv_remark4";
- this.gv_remark4.OptionsColumn.AllowEdit = false;
- this.gv_remark4.Tag = "query_a.remark4";
- this.gv_remark4.Visible = true;
- this.gv_remark4.VisibleIndex = 26;
- this.gv_remark4.Width = 94;
- //
- // lb_remark3
- //
- this.lb_remark3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark3.Appearance.Options.UseFont = true;
- this.lb_remark3.Location = new System.Drawing.Point(270, 212);
- this.lb_remark3.Name = "lb_remark3";
- this.lb_remark3.Size = new System.Drawing.Size(99, 21);
- this.lb_remark3.TabIndex = 319;
- this.lb_remark3.Text = "鑷畾涔夊瓧娈�3 ";
- //
- // txt_remark3
- //
- this.txt_remark3.Location = new System.Drawing.Point(330, 212);
- this.txt_remark3.Name = "txt_remark3";
- this.txt_remark3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark3.Properties.Appearance.Options.UseFont = true;
- this.txt_remark3.Size = new System.Drawing.Size(150, 28);
- this.txt_remark3.TabIndex = 319;
- //
- // gv_remark3
- //
- this.gv_remark3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark3.AppearanceCell.Options.UseFont = true;
- this.gv_remark3.Caption = "鑷畾涔夊瓧娈�3 ";
- this.gv_remark3.FieldName = "remark3";
- this.gv_remark3.MinWidth = 50;
- this.gv_remark3.Name = "gv_remark3";
- this.gv_remark3.OptionsColumn.AllowEdit = false;
- this.gv_remark3.Tag = "query_a.remark3";
- this.gv_remark3.Visible = true;
- this.gv_remark3.VisibleIndex = 25;
- this.gv_remark3.Width = 94;
- //
- // lb_useOrg
- //
- this.lb_useOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_useOrg.Appearance.Options.UseFont = true;
- this.lb_useOrg.Location = new System.Drawing.Point(20, 212);
- this.lb_useOrg.Name = "lb_useOrg";
- this.lb_useOrg.Size = new System.Drawing.Size(73, 21);
- this.lb_useOrg.TabIndex = 312;
- this.lb_useOrg.Text = "浣跨敤缁勭粐 ";
- //
- // txt_useOrg
- //
- this.txt_useOrg.Location = new System.Drawing.Point(80, 212);
- this.txt_useOrg.Name = "txt_useOrg";
- this.txt_useOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_useOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_useOrg.Size = new System.Drawing.Size(150, 28);
- this.txt_useOrg.TabIndex = 312;
- //
- // gv_useOrg
- //
- this.gv_useOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_useOrg.AppearanceCell.Options.UseFont = true;
- this.gv_useOrg.Caption = "浣跨敤缁勭粐 ";
- this.gv_useOrg.FieldName = "useOrg";
- this.gv_useOrg.MinWidth = 50;
- this.gv_useOrg.Name = "gv_useOrg";
- this.gv_useOrg.OptionsColumn.AllowEdit = false;
- this.gv_useOrg.Tag = "query_a.use_org";
- this.gv_useOrg.Visible = true;
- this.gv_useOrg.VisibleIndex = 24;
- this.gv_useOrg.Width = 94;
- //
- // lb_createOrg
- //
- this.lb_createOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createOrg.Appearance.Options.UseFont = true;
- this.lb_createOrg.Location = new System.Drawing.Point(770, 180);
- this.lb_createOrg.Name = "lb_createOrg";
- this.lb_createOrg.Size = new System.Drawing.Size(73, 21);
- this.lb_createOrg.TabIndex = 306;
- this.lb_createOrg.Text = "鍒涘缓缁勭粐 ";
- //
- // txt_createOrg
- //
- this.txt_createOrg.Location = new System.Drawing.Point(830, 180);
- this.txt_createOrg.Name = "txt_createOrg";
- this.txt_createOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_createOrg.Size = new System.Drawing.Size(150, 28);
- this.txt_createOrg.TabIndex = 306;
- //
- // gv_createOrg
- //
- this.gv_createOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createOrg.AppearanceCell.Options.UseFont = true;
- this.gv_createOrg.Caption = "鍒涘缓缁勭粐 ";
- this.gv_createOrg.FieldName = "createOrg";
- this.gv_createOrg.MinWidth = 50;
- this.gv_createOrg.Name = "gv_createOrg";
- this.gv_createOrg.OptionsColumn.AllowEdit = false;
- this.gv_createOrg.Tag = "query_a.create_org";
- this.gv_createOrg.Visible = true;
- this.gv_createOrg.VisibleIndex = 23;
- this.gv_createOrg.Width = 94;
- //
// lb_fseller
//
this.lb_fseller.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fseller.Appearance.Options.UseFont = true;
- this.lb_fseller.Location = new System.Drawing.Point(520, 180);
+ this.lb_fseller.Location = new System.Drawing.Point(567, 155);
this.lb_fseller.Name = "lb_fseller";
this.lb_fseller.Size = new System.Drawing.Size(56, 21);
this.lb_fseller.TabIndex = 298;
@@ -338,7 +129,7 @@
//
// txt_fseller
//
- this.txt_fseller.Location = new System.Drawing.Point(580, 180);
+ this.txt_fseller.Location = new System.Drawing.Point(626, 151);
this.txt_fseller.Name = "txt_fseller";
this.txt_fseller.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fseller.Properties.Appearance.Options.UseFont = true;
@@ -356,14 +147,14 @@
this.gv_fseller.OptionsColumn.AllowEdit = false;
this.gv_fseller.Tag = "query_a.fseller";
this.gv_fseller.Visible = true;
- this.gv_fseller.VisibleIndex = 22;
+ this.gv_fseller.VisibleIndex = 16;
this.gv_fseller.Width = 94;
//
// lb_fforbidstatus
//
this.lb_fforbidstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fforbidstatus.Appearance.Options.UseFont = true;
- this.lb_fforbidstatus.Location = new System.Drawing.Point(270, 180);
+ this.lb_fforbidstatus.Location = new System.Drawing.Point(41, 194);
this.lb_fforbidstatus.Name = "lb_fforbidstatus";
this.lb_fforbidstatus.Size = new System.Drawing.Size(73, 21);
this.lb_fforbidstatus.TabIndex = 291;
@@ -371,7 +162,7 @@
//
// txt_fforbidstatus
//
- this.txt_fforbidstatus.Location = new System.Drawing.Point(330, 180);
+ this.txt_fforbidstatus.Location = new System.Drawing.Point(120, 190);
this.txt_fforbidstatus.Name = "txt_fforbidstatus";
this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
@@ -389,27 +180,8 @@
this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 21;
+ this.gv_fforbidstatus.VisibleIndex = 15;
this.gv_fforbidstatus.Width = 94;
- //
- // lb_iscommit
- //
- this.lb_iscommit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_iscommit.Appearance.Options.UseFont = true;
- this.lb_iscommit.Location = new System.Drawing.Point(20, 180);
- this.lb_iscommit.Name = "lb_iscommit";
- this.lb_iscommit.Size = new System.Drawing.Size(340, 21);
- this.lb_iscommit.TabIndex = 285;
- this.lb_iscommit.Text = "WMS鏄惁鍙戦�佹暟鎹細1宸插彂閫侊紝鍏朵粬鍧囨湭鍙戦�� ";
- //
- // txt_iscommit
- //
- this.txt_iscommit.Location = new System.Drawing.Point(80, 180);
- this.txt_iscommit.Name = "txt_iscommit";
- this.txt_iscommit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_iscommit.Properties.Appearance.Options.UseFont = true;
- this.txt_iscommit.Size = new System.Drawing.Size(150, 28);
- this.txt_iscommit.TabIndex = 285;
//
// gv_iscommit
//
@@ -422,27 +194,8 @@
this.gv_iscommit.OptionsColumn.AllowEdit = false;
this.gv_iscommit.Tag = "query_a.iscommit";
this.gv_iscommit.Visible = true;
- this.gv_iscommit.VisibleIndex = 20;
+ this.gv_iscommit.VisibleIndex = 14;
this.gv_iscommit.Width = 94;
- //
- // lb_lotFlag
- //
- this.lb_lotFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lotFlag.Appearance.Options.UseFont = true;
- this.lb_lotFlag.Location = new System.Drawing.Point(770, 148);
- this.lb_lotFlag.Name = "lb_lotFlag";
- this.lb_lotFlag.Size = new System.Drawing.Size(172, 21);
- this.lb_lotFlag.TabIndex = 280;
- this.lb_lotFlag.Text = "鏄惁鎵规绠＄悊(鏄紝鍚�) ";
- //
- // txt_lotFlag
- //
- this.txt_lotFlag.Location = new System.Drawing.Point(830, 148);
- this.txt_lotFlag.Name = "txt_lotFlag";
- this.txt_lotFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lotFlag.Properties.Appearance.Options.UseFont = true;
- this.txt_lotFlag.Size = new System.Drawing.Size(150, 28);
- this.txt_lotFlag.TabIndex = 280;
//
// gv_lotFlag
//
@@ -455,27 +208,8 @@
this.gv_lotFlag.OptionsColumn.AllowEdit = false;
this.gv_lotFlag.Tag = "query_a.lot_flag";
this.gv_lotFlag.Visible = true;
- this.gv_lotFlag.VisibleIndex = 19;
+ this.gv_lotFlag.VisibleIndex = 13;
this.gv_lotFlag.Width = 94;
- //
- // lb_itemSap
- //
- this.lb_itemSap.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemSap.Appearance.Options.UseFont = true;
- this.lb_itemSap.Location = new System.Drawing.Point(520, 148);
- this.lb_itemSap.Name = "lb_itemSap";
- this.lb_itemSap.Size = new System.Drawing.Size(235, 21);
- this.lb_itemSap.TabIndex = 273;
- this.lb_itemSap.Text = "鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�) ";
- //
- // txt_itemSap
- //
- this.txt_itemSap.Location = new System.Drawing.Point(580, 148);
- this.txt_itemSap.Name = "txt_itemSap";
- this.txt_itemSap.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemSap.Properties.Appearance.Options.UseFont = true;
- this.txt_itemSap.Size = new System.Drawing.Size(150, 28);
- this.txt_itemSap.TabIndex = 273;
//
// gv_itemSap
//
@@ -488,27 +222,8 @@
this.gv_itemSap.OptionsColumn.AllowEdit = false;
this.gv_itemSap.Tag = "query_a.item_sap";
this.gv_itemSap.Visible = true;
- this.gv_itemSap.VisibleIndex = 18;
+ this.gv_itemSap.VisibleIndex = 12;
this.gv_itemSap.Width = 94;
- //
- // lb_itemC
- //
- this.lb_itemC.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_itemC.Appearance.Options.UseFont = true;
- this.lb_itemC.Location = new System.Drawing.Point(270, 148);
- this.lb_itemC.Name = "lb_itemC";
- this.lb_itemC.Size = new System.Drawing.Size(172, 21);
- this.lb_itemC.TabIndex = 267;
- this.lb_itemC.Text = "鐗╂枡鏄惁鍏辩(鏄紝鍚�) ";
- //
- // txt_itemC
- //
- this.txt_itemC.Location = new System.Drawing.Point(330, 148);
- this.txt_itemC.Name = "txt_itemC";
- this.txt_itemC.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_itemC.Properties.Appearance.Options.UseFont = true;
- this.txt_itemC.Size = new System.Drawing.Size(150, 28);
- this.txt_itemC.TabIndex = 267;
//
// gv_itemC
//
@@ -521,47 +236,28 @@
this.gv_itemC.OptionsColumn.AllowEdit = false;
this.gv_itemC.Tag = "query_a.item_c";
this.gv_itemC.Visible = true;
- this.gv_itemC.VisibleIndex = 17;
+ this.gv_itemC.VisibleIndex = 11;
this.gv_itemC.Width = 94;
- //
- // lb_factory
- //
- this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_factory.Appearance.Options.UseFont = true;
- this.lb_factory.Location = new System.Drawing.Point(20, 148);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(73, 21);
- this.lb_factory.TabIndex = 262;
- this.lb_factory.Text = "鍒嗗巶缂栫爜 ";
- //
- // txt_factory
- //
- this.txt_factory.Location = new System.Drawing.Point(80, 148);
- this.txt_factory.Name = "txt_factory";
- this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_factory.Properties.Appearance.Options.UseFont = true;
- this.txt_factory.Size = new System.Drawing.Size(150, 28);
- this.txt_factory.TabIndex = 262;
//
// gv_factory
//
this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_factory.AppearanceCell.Options.UseFont = true;
- this.gv_factory.Caption = "鍒嗗巶缂栫爜 ";
+ this.gv_factory.Caption = "宸ュ巶缂栫爜 ";
this.gv_factory.FieldName = "factory";
this.gv_factory.MinWidth = 50;
this.gv_factory.Name = "gv_factory";
this.gv_factory.OptionsColumn.AllowEdit = false;
this.gv_factory.Tag = "query_a.factory";
this.gv_factory.Visible = true;
- this.gv_factory.VisibleIndex = 16;
+ this.gv_factory.VisibleIndex = 1;
this.gv_factory.Width = 94;
//
// lb_company
//
this.lb_company.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_company.Appearance.Options.UseFont = true;
- this.lb_company.Location = new System.Drawing.Point(770, 116);
+ this.lb_company.Location = new System.Drawing.Point(337, 191);
this.lb_company.Name = "lb_company";
this.lb_company.Size = new System.Drawing.Size(39, 21);
this.lb_company.TabIndex = 258;
@@ -569,32 +265,18 @@
//
// txt_company
//
- this.txt_company.Location = new System.Drawing.Point(830, 116);
+ this.txt_company.Location = new System.Drawing.Point(377, 187);
this.txt_company.Name = "txt_company";
this.txt_company.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_company.Properties.Appearance.Options.UseFont = true;
this.txt_company.Size = new System.Drawing.Size(150, 28);
this.txt_company.TabIndex = 258;
//
- // gv_company
- //
- this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_company.AppearanceCell.Options.UseFont = true;
- this.gv_company.Caption = "鍏徃 ";
- this.gv_company.FieldName = "company";
- this.gv_company.MinWidth = 50;
- this.gv_company.Name = "gv_company";
- this.gv_company.OptionsColumn.AllowEdit = false;
- this.gv_company.Tag = "query_a.company";
- this.gv_company.Visible = true;
- this.gv_company.VisibleIndex = 15;
- this.gv_company.Width = 94;
- //
// lb_remark
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(520, 116);
+ this.lb_remark.Location = new System.Drawing.Point(584, 117);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 252;
@@ -602,7 +284,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(580, 116);
+ this.txt_remark.Location = new System.Drawing.Point(626, 113);
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;
@@ -620,14 +302,14 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 14;
+ this.gv_remark.VisibleIndex = 10;
this.gv_remark.Width = 94;
//
// lb_lastupdateBy
//
this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateBy.Appearance.Options.UseFont = true;
- this.lb_lastupdateBy.Location = new System.Drawing.Point(270, 116);
+ this.lb_lastupdateBy.Location = new System.Drawing.Point(286, 117);
this.lb_lastupdateBy.Name = "lb_lastupdateBy";
this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
this.lb_lastupdateBy.TabIndex = 247;
@@ -635,32 +317,18 @@
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(330, 116);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(377, 113);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
this.txt_lastupdateBy.TabIndex = 247;
//
- // gv_lastupdateBy
- //
- this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏈�鍚庝慨鏀逛汉 ";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 50;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 13;
- this.gv_lastupdateBy.Width = 94;
- //
// lb_lastupdateDate
//
this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(20, 116);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(7, 117);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
this.lb_lastupdateDate.TabIndex = 243;
@@ -668,32 +336,18 @@
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(80, 116);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(120, 113);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
this.txt_lastupdateDate.TabIndex = 243;
//
- // gv_lastupdateDate
- //
- this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏈�鍚庝慨鏀规椂闂� ";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 50;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 12;
- this.gv_lastupdateDate.Width = 94;
- //
// lb_createBy
//
this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(770, 84);
+ this.lb_createBy.Location = new System.Drawing.Point(320, 155);
this.lb_createBy.Name = "lb_createBy";
this.lb_createBy.Size = new System.Drawing.Size(56, 21);
this.lb_createBy.TabIndex = 240;
@@ -701,32 +355,18 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(830, 84);
+ this.txt_createBy.Location = new System.Drawing.Point(377, 151);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
this.txt_createBy.Size = new System.Drawing.Size(150, 28);
this.txt_createBy.TabIndex = 240;
//
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "鍒涘缓浜� ";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 11;
- this.gv_createBy.Width = 94;
- //
// lb_createDate
//
this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(520, 84);
+ this.lb_createDate.Location = new System.Drawing.Point(550, 84);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(73, 21);
this.lb_createDate.TabIndex = 235;
@@ -734,32 +374,18 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(580, 84);
+ this.txt_createDate.Location = new System.Drawing.Point(626, 80);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(150, 28);
this.txt_createDate.TabIndex = 235;
//
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.create_date";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 10;
- this.gv_createDate.Width = 94;
- //
// lb_anred
//
this.lb_anred.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_anred.Appearance.Options.UseFont = true;
- this.lb_anred.Location = new System.Drawing.Point(270, 84);
+ this.lb_anred.Location = new System.Drawing.Point(320, 84);
this.lb_anred.Name = "lb_anred";
this.lb_anred.Size = new System.Drawing.Size(56, 21);
this.lb_anred.TabIndex = 231;
@@ -767,7 +393,7 @@
//
// txt_anred
//
- this.txt_anred.Location = new System.Drawing.Point(330, 84);
+ this.txt_anred.Location = new System.Drawing.Point(377, 80);
this.txt_anred.Name = "txt_anred";
this.txt_anred.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_anred.Properties.Appearance.Options.UseFont = true;
@@ -792,7 +418,7 @@
//
this.lb_telfx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_telfx.Appearance.Options.UseFont = true;
- this.lb_telfx.Location = new System.Drawing.Point(20, 84);
+ this.lb_telfx.Location = new System.Drawing.Point(75, 84);
this.lb_telfx.Name = "lb_telfx";
this.lb_telfx.Size = new System.Drawing.Size(39, 21);
this.lb_telfx.TabIndex = 228;
@@ -800,7 +426,7 @@
//
// txt_telfx
//
- this.txt_telfx.Location = new System.Drawing.Point(80, 84);
+ this.txt_telfx.Location = new System.Drawing.Point(120, 80);
this.txt_telfx.Name = "txt_telfx";
this.txt_telfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_telfx.Properties.Appearance.Options.UseFont = true;
@@ -825,7 +451,7 @@
//
this.lb_telf1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_telf1.Appearance.Options.UseFont = true;
- this.lb_telf1.Location = new System.Drawing.Point(770, 52);
+ this.lb_telf1.Location = new System.Drawing.Point(75, 155);
this.lb_telf1.Name = "lb_telf1";
this.lb_telf1.Size = new System.Drawing.Size(39, 21);
this.lb_telf1.TabIndex = 226;
@@ -833,7 +459,7 @@
//
// txt_telf1
//
- this.txt_telf1.Location = new System.Drawing.Point(830, 52);
+ this.txt_telf1.Location = new System.Drawing.Point(120, 151);
this.txt_telf1.Name = "txt_telf1";
this.txt_telf1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_telf1.Properties.Appearance.Options.UseFont = true;
@@ -858,7 +484,7 @@
//
this.lb_stras.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_stras.Appearance.Options.UseFont = true;
- this.lb_stras.Location = new System.Drawing.Point(520, 52);
+ this.lb_stras.Location = new System.Drawing.Point(584, 52);
this.lb_stras.Name = "lb_stras";
this.lb_stras.Size = new System.Drawing.Size(39, 21);
this.lb_stras.TabIndex = 222;
@@ -866,7 +492,7 @@
//
// txt_stras
//
- this.txt_stras.Location = new System.Drawing.Point(580, 52);
+ this.txt_stras.Location = new System.Drawing.Point(626, 48);
this.txt_stras.Name = "txt_stras";
this.txt_stras.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_stras.Properties.Appearance.Options.UseFont = true;
@@ -891,7 +517,7 @@
//
this.lb_custSname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_custSname.Appearance.Options.UseFont = true;
- this.lb_custSname.Location = new System.Drawing.Point(270, 52);
+ this.lb_custSname.Location = new System.Drawing.Point(303, 52);
this.lb_custSname.Name = "lb_custSname";
this.lb_custSname.Size = new System.Drawing.Size(73, 21);
this.lb_custSname.TabIndex = 219;
@@ -899,7 +525,7 @@
//
// txt_custSname
//
- this.txt_custSname.Location = new System.Drawing.Point(330, 52);
+ this.txt_custSname.Location = new System.Drawing.Point(377, 48);
this.txt_custSname.Name = "txt_custSname";
this.txt_custSname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_custSname.Properties.Appearance.Options.UseFont = true;
@@ -917,14 +543,14 @@
this.gv_custSname.OptionsColumn.AllowEdit = false;
this.gv_custSname.Tag = "query_a.cust_sname";
this.gv_custSname.Visible = true;
- this.gv_custSname.VisibleIndex = 5;
+ this.gv_custSname.VisibleIndex = 4;
this.gv_custSname.Width = 94;
//
// lb_custName
//
this.lb_custName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_custName.Appearance.Options.UseFont = true;
- this.lb_custName.Location = new System.Drawing.Point(20, 52);
+ this.lb_custName.Location = new System.Drawing.Point(41, 52);
this.lb_custName.Name = "lb_custName";
this.lb_custName.Size = new System.Drawing.Size(73, 21);
this.lb_custName.TabIndex = 217;
@@ -932,7 +558,7 @@
//
// txt_custName
//
- this.txt_custName.Location = new System.Drawing.Point(80, 52);
+ this.txt_custName.Location = new System.Drawing.Point(120, 48);
this.txt_custName.Name = "txt_custName";
this.txt_custName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_custName.Properties.Appearance.Options.UseFont = true;
@@ -945,19 +571,19 @@
this.gv_custName.AppearanceCell.Options.UseFont = true;
this.gv_custName.Caption = "瀹㈡埛鍚嶇О ";
this.gv_custName.FieldName = "custName";
- this.gv_custName.MinWidth = 50;
+ this.gv_custName.MinWidth = 200;
this.gv_custName.Name = "gv_custName";
this.gv_custName.OptionsColumn.AllowEdit = false;
this.gv_custName.Tag = "query_a.cust_name";
this.gv_custName.Visible = true;
- this.gv_custName.VisibleIndex = 4;
- this.gv_custName.Width = 94;
+ this.gv_custName.VisibleIndex = 3;
+ this.gv_custName.Width = 200;
//
// lb_land
//
this.lb_land.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_land.Appearance.Options.UseFont = true;
- this.lb_land.Location = new System.Drawing.Point(770, 20);
+ this.lb_land.Location = new System.Drawing.Point(584, 14);
this.lb_land.Name = "lb_land";
this.lb_land.Size = new System.Drawing.Size(39, 21);
this.lb_land.TabIndex = 216;
@@ -965,7 +591,7 @@
//
// txt_land
//
- this.txt_land.Location = new System.Drawing.Point(830, 20);
+ this.txt_land.Location = new System.Drawing.Point(626, 10);
this.txt_land.Name = "txt_land";
this.txt_land.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_land.Properties.Appearance.Options.UseFont = true;
@@ -983,14 +609,14 @@
this.gv_land.OptionsColumn.AllowEdit = false;
this.gv_land.Tag = "query_a.land";
this.gv_land.Visible = true;
- this.gv_land.VisibleIndex = 3;
+ this.gv_land.VisibleIndex = 5;
this.gv_land.Width = 94;
//
// lb_custNo
//
this.lb_custNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_custNo.Appearance.Options.UseFont = true;
- this.lb_custNo.Location = new System.Drawing.Point(520, 20);
+ this.lb_custNo.Location = new System.Drawing.Point(303, 14);
this.lb_custNo.Name = "lb_custNo";
this.lb_custNo.Size = new System.Drawing.Size(73, 21);
this.lb_custNo.TabIndex = 213;
@@ -998,7 +624,7 @@
//
// txt_custNo
//
- this.txt_custNo.Location = new System.Drawing.Point(580, 20);
+ this.txt_custNo.Location = new System.Drawing.Point(377, 10);
this.txt_custNo.Name = "txt_custNo";
this.txt_custNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_custNo.Properties.Appearance.Options.UseFont = true;
@@ -1023,7 +649,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(270, 20);
+ this.lb_id.Location = new System.Drawing.Point(91, 14);
this.lb_id.Name = "lb_id";
this.lb_id.Size = new System.Drawing.Size(23, 21);
this.lb_id.TabIndex = 211;
@@ -1031,7 +657,7 @@
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(330, 20);
+ this.txt_id.Location = new System.Drawing.Point(120, 10);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_id.Properties.Appearance.Options.UseFont = true;
@@ -1049,52 +675,22 @@
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 1;
+ this.gv_id.VisibleIndex = 0;
this.gv_id.Width = 94;
- //
- // lb_guid
- //
- this.lb_guid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_guid.Appearance.Options.UseFont = true;
- this.lb_guid.Location = new System.Drawing.Point(20, 20);
- this.lb_guid.Name = "lb_guid";
- this.lb_guid.Size = new System.Drawing.Size(36, 21);
- this.lb_guid.TabIndex = 210;
- this.lb_guid.Text = "guid ";
- //
- // txt_guid
- //
- this.txt_guid.Location = new System.Drawing.Point(80, 20);
- this.txt_guid.Name = "txt_guid";
- this.txt_guid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_guid.Properties.Appearance.Options.UseFont = true;
- this.txt_guid.Size = new System.Drawing.Size(150, 28);
- this.txt_guid.TabIndex = 210;
- //
- // gv_guid
- //
- this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_guid.AppearanceCell.Options.UseFont = true;
- this.gv_guid.Caption = "guid ";
- this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
- this.gv_guid.Name = "gv_guid";
- this.gv_guid.OptionsColumn.AllowEdit = false;
- this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Visible = true;
- this.gv_guid.VisibleIndex = 0;
- this.gv_guid.Width = 94;
//
// toolBarMenu1
//
+ this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1221, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_customer{}";
//
// gcMain
//
@@ -1103,7 +699,7 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain.Size = new System.Drawing.Size(1219, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -1113,34 +709,23 @@
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_guid,
this.gv_id,
+ this.gv_factory,
this.gv_custNo,
- this.gv_land,
this.gv_custName,
this.gv_custSname,
+ this.gv_land,
this.gv_stras,
this.gv_telf1,
this.gv_telfx,
this.gv_anred,
- this.gv_createDate,
- this.gv_createBy,
- this.gv_lastupdateDate,
- this.gv_lastupdateBy,
this.gv_remark,
- this.gv_company,
- this.gv_factory,
this.gv_itemC,
this.gv_itemSap,
this.gv_lotFlag,
this.gv_iscommit,
this.gv_fforbidstatus,
- this.gv_fseller,
- this.gv_createOrg,
- this.gv_useOrg,
- this.gv_remark3,
- this.gv_remark4,
- this.gv_remark5});
+ this.gv_fseller});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -1154,7 +739,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1221, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -1165,7 +750,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1219, 570);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// pageBar1
@@ -1177,7 +762,7 @@
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.RowsCount = 50;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1219, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -1186,7 +771,7 @@
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
this.xtraTabPage2.PageEnabled = false;
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1219, 570);
this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
//
// panel1
@@ -1194,30 +779,10 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_remark5);
- this.panel1.Controls.Add(this.txt_remark5);
- this.panel1.Controls.Add(this.lb_remark4);
- this.panel1.Controls.Add(this.txt_remark4);
- this.panel1.Controls.Add(this.lb_remark3);
- this.panel1.Controls.Add(this.txt_remark3);
- this.panel1.Controls.Add(this.lb_useOrg);
- this.panel1.Controls.Add(this.txt_useOrg);
- this.panel1.Controls.Add(this.lb_createOrg);
- this.panel1.Controls.Add(this.txt_createOrg);
this.panel1.Controls.Add(this.lb_fseller);
this.panel1.Controls.Add(this.txt_fseller);
this.panel1.Controls.Add(this.lb_fforbidstatus);
this.panel1.Controls.Add(this.txt_fforbidstatus);
- this.panel1.Controls.Add(this.lb_iscommit);
- this.panel1.Controls.Add(this.txt_iscommit);
- this.panel1.Controls.Add(this.lb_lotFlag);
- this.panel1.Controls.Add(this.txt_lotFlag);
- this.panel1.Controls.Add(this.lb_itemSap);
- this.panel1.Controls.Add(this.txt_itemSap);
- this.panel1.Controls.Add(this.lb_itemC);
- this.panel1.Controls.Add(this.txt_itemC);
- this.panel1.Controls.Add(this.lb_factory);
- this.panel1.Controls.Add(this.txt_factory);
this.panel1.Controls.Add(this.lb_company);
this.panel1.Controls.Add(this.txt_company);
this.panel1.Controls.Add(this.lb_remark);
@@ -1248,51 +813,41 @@
this.panel1.Controls.Add(this.txt_custNo);
this.panel1.Controls.Add(this.lb_id);
this.panel1.Controls.Add(this.txt_id);
- this.panel1.Controls.Add(this.lb_guid);
- this.panel1.Controls.Add(this.txt_guid);
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(76, 20);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1011, 426);
+ this.panel1.Size = new System.Drawing.Size(820, 299);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(61, 388);
+ this.labelControl11.Location = new System.Drawing.Point(422, 223);
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);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(112, 388);
+ this.lbGuid.Location = new System.Drawing.Point(473, 223);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// Frm_Customer
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.ClientSize = new System.Drawing.Size(1221, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Customer";
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fseller.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iscommit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotFlag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemSap.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemC.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
@@ -1308,7 +863,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_land.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1331,26 +885,6 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- //BQCreateConrolObejct
- private DevExpress.XtraEditors.LabelControl lb_remark5;
- private DevExpress.XtraEditors.TextEdit txt_remark5;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark5;
-
- private DevExpress.XtraEditors.LabelControl lb_remark4;
- private DevExpress.XtraEditors.TextEdit txt_remark4;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark4;
-
- private DevExpress.XtraEditors.LabelControl lb_remark3;
- private DevExpress.XtraEditors.TextEdit txt_remark3;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark3;
-
- private DevExpress.XtraEditors.LabelControl lb_useOrg;
- private DevExpress.XtraEditors.TextEdit txt_useOrg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_useOrg;
-
- private DevExpress.XtraEditors.LabelControl lb_createOrg;
- private DevExpress.XtraEditors.TextEdit txt_createOrg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createOrg;
private DevExpress.XtraEditors.LabelControl lb_fseller;
private DevExpress.XtraEditors.TextEdit txt_fseller;
@@ -1359,30 +893,14 @@
private DevExpress.XtraEditors.LabelControl lb_fforbidstatus;
private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
-
- private DevExpress.XtraEditors.LabelControl lb_iscommit;
- private DevExpress.XtraEditors.TextEdit txt_iscommit;
private DevExpress.XtraGrid.Columns.GridColumn gv_iscommit;
-
- private DevExpress.XtraEditors.LabelControl lb_lotFlag;
- private DevExpress.XtraEditors.TextEdit txt_lotFlag;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotFlag;
-
- private DevExpress.XtraEditors.LabelControl lb_itemSap;
- private DevExpress.XtraEditors.TextEdit txt_itemSap;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemSap;
-
- private DevExpress.XtraEditors.LabelControl lb_itemC;
- private DevExpress.XtraEditors.TextEdit txt_itemC;
private DevExpress.XtraGrid.Columns.GridColumn gv_itemC;
-
- private DevExpress.XtraEditors.LabelControl lb_factory;
- private DevExpress.XtraEditors.TextEdit txt_factory;
private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
private DevExpress.XtraEditors.LabelControl lb_company;
private DevExpress.XtraEditors.TextEdit txt_company;
- private DevExpress.XtraGrid.Columns.GridColumn gv_company;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -1390,19 +908,15 @@
private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraEditors.LabelControl lb_createBy;
private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraEditors.LabelControl lb_createDate;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
private DevExpress.XtraEditors.LabelControl lb_anred;
private DevExpress.XtraEditors.TextEdit txt_anred;
@@ -1439,10 +953,6 @@
private DevExpress.XtraEditors.LabelControl lb_id;
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-
- private DevExpress.XtraEditors.LabelControl lb_guid;
- private DevExpress.XtraEditors.TextEdit txt_guid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index b41e048..5b3d254 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -100,7 +100,6 @@
this.gv_departmentid = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_company = new DevExpress.XtraEditors.LabelControl();
this.txt_company = new DevExpress.XtraEditors.TextEdit();
- this.gv_company = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -214,7 +213,7 @@
this.gv_parentId.OptionsColumn.AllowEdit = false;
this.gv_parentId.Tag = "query_a.parent_id";
this.gv_parentId.Visible = true;
- this.gv_parentId.VisibleIndex = 17;
+ this.gv_parentId.VisibleIndex = 16;
this.gv_parentId.Width = 94;
//
// lb_useOrg
@@ -247,7 +246,7 @@
this.gv_useOrg.OptionsColumn.AllowEdit = false;
this.gv_useOrg.Tag = "query_a.use_org";
this.gv_useOrg.Visible = true;
- this.gv_useOrg.VisibleIndex = 16;
+ this.gv_useOrg.VisibleIndex = 15;
this.gv_useOrg.Width = 94;
//
// lb_createOrg
@@ -280,7 +279,7 @@
this.gv_createOrg.OptionsColumn.AllowEdit = false;
this.gv_createOrg.Tag = "query_a.create_org";
this.gv_createOrg.Visible = true;
- this.gv_createOrg.VisibleIndex = 15;
+ this.gv_createOrg.VisibleIndex = 14;
this.gv_createOrg.Width = 94;
//
// lb_materialProperti
@@ -313,7 +312,7 @@
this.gv_materialProperti.OptionsColumn.AllowEdit = false;
this.gv_materialProperti.Tag = "query_a.material_properti";
this.gv_materialProperti.Visible = true;
- this.gv_materialProperti.VisibleIndex = 14;
+ this.gv_materialProperti.VisibleIndex = 13;
this.gv_materialProperti.Width = 94;
//
// lb_productionWorkshop
@@ -346,7 +345,7 @@
this.gv_productionWorkshop.OptionsColumn.AllowEdit = false;
this.gv_productionWorkshop.Tag = "query_a.production_workshop";
this.gv_productionWorkshop.Visible = true;
- this.gv_productionWorkshop.VisibleIndex = 13;
+ this.gv_productionWorkshop.VisibleIndex = 12;
this.gv_productionWorkshop.Width = 94;
//
// lb_id
@@ -398,7 +397,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 12;
+ this.gv_remark.VisibleIndex = 11;
this.gv_remark.Width = 94;
//
// lb_lastupdateDate
@@ -507,7 +506,7 @@
this.gv_factory.OptionsColumn.AllowEdit = false;
this.gv_factory.Tag = "query_a.factory";
this.gv_factory.Visible = true;
- this.gv_factory.VisibleIndex = 11;
+ this.gv_factory.VisibleIndex = 0;
this.gv_factory.Width = 94;
//
// lb_fmanager
@@ -878,20 +877,6 @@
this.txt_company.Size = new System.Drawing.Size(150, 28);
this.txt_company.TabIndex = 211;
//
- // gv_company
- //
- this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_company.AppearanceCell.Options.UseFont = true;
- this.gv_company.Caption = "鍏徃 ";
- this.gv_company.FieldName = "company";
- this.gv_company.MinWidth = 50;
- this.gv_company.Name = "gv_company";
- this.gv_company.OptionsColumn.AllowEdit = false;
- this.gv_company.Tag = "query_a.company";
- this.gv_company.Visible = true;
- this.gv_company.VisibleIndex = 0;
- this.gv_company.Width = 94;
- //
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
@@ -900,10 +885,11 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(930, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_department{}";
//
// gcMain
//
@@ -922,7 +908,7 @@
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_company,
+ this.gv_factory,
this.gv_departmentid,
this.gv_departmentcode,
this.gv_departmentname,
@@ -933,7 +919,6 @@
this.gv_workshopNo,
this.gv_workshopName,
this.gv_fmanager,
- this.gv_factory,
this.gv_remark,
this.gv_productionWorkshop,
this.gv_materialProperti,
@@ -1221,7 +1206,6 @@
private DevExpress.XtraEditors.LabelControl lb_company;
private DevExpress.XtraEditors.TextEdit txt_company;
- private DevExpress.XtraGrid.Columns.GridColumn gv_company;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.resx
@@ -1,134 +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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ 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: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: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: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>
+ </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/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index b5bea3b..a386b1a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -1366,6 +1366,8 @@
this.gv_factory.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gv_factory.MinWidth = 80;
this.gv_factory.Name = "gv_factory";
+ this.gv_factory.OptionsColumn.AllowEdit = false;
+ this.gv_factory.OptionsColumn.ReadOnly = true;
this.gv_factory.Tag = "query_a.factory";
this.gv_factory.Visible = true;
this.gv_factory.VisibleIndex = 0;
@@ -1373,13 +1375,17 @@
//
// toolBarMenu1
//
+ this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
-
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1160, 80);
this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_items{}";
//
// gcMain
//
@@ -1607,14 +1613,14 @@
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "itemModel";
//
- // FrmMesItems
+ // Frm_MesItems
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1160, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Name = "FrmMesItems";
+ this.Name = "Frm_MesItems";
((System.ComponentModel.ISupportInitialize)(this.txt_t10.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_t9.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_t8.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.resx
@@ -1,134 +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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ 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: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: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: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>
+ </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/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 3687c9a..538c1e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -803,11 +803,11 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
-
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(1003, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_staff{}";
//
// gcMain
//
@@ -816,7 +816,7 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
+ this.gcMain.Size = new System.Drawing.Size(1001, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -866,7 +866,7 @@
this.xtraTabPage1.Controls.Add(this.gcMain);
this.xtraTabPage1.Controls.Add(this.pageBar1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1001, 570);
this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
//
// pageBar1
@@ -878,7 +878,7 @@
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
this.pageBar1.RowsCount = 50;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1001, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.resx
@@ -1,134 +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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ 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: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: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: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>
+ </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/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index b5ab2fe..b710f9f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -40,10 +40,8 @@
this.txt_remark3 = new DevExpress.XtraEditors.TextEdit();
this.lb_useOrg = new DevExpress.XtraEditors.LabelControl();
this.txt_useOrg = new DevExpress.XtraEditors.TextEdit();
- this.gv_useOrg = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_createOrg = new DevExpress.XtraEditors.LabelControl();
this.txt_createOrg = new DevExpress.XtraEditors.TextEdit();
- this.gv_createOrg = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fforbidstatus = new DevExpress.XtraEditors.LabelControl();
this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -64,7 +62,6 @@
this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_company = new DevExpress.XtraEditors.LabelControl();
this.txt_company = new DevExpress.XtraEditors.TextEdit();
- this.gv_company = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fscode = new DevExpress.XtraEditors.LabelControl();
this.txt_fscode = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
@@ -224,20 +221,6 @@
this.txt_useOrg.Size = new System.Drawing.Size(150, 28);
this.txt_useOrg.TabIndex = 312;
//
- // gv_useOrg
- //
- this.gv_useOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_useOrg.AppearanceCell.Options.UseFont = true;
- this.gv_useOrg.Caption = "浣跨敤缁勭粐 ";
- this.gv_useOrg.FieldName = "useOrg";
- this.gv_useOrg.MinWidth = 50;
- this.gv_useOrg.Name = "gv_useOrg";
- this.gv_useOrg.OptionsColumn.AllowEdit = false;
- this.gv_useOrg.Tag = "query_a.use_org";
- this.gv_useOrg.Visible = true;
- this.gv_useOrg.VisibleIndex = 15;
- this.gv_useOrg.Width = 94;
- //
// lb_createOrg
//
this.lb_createOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -256,20 +239,6 @@
this.txt_createOrg.Properties.Appearance.Options.UseFont = true;
this.txt_createOrg.Size = new System.Drawing.Size(150, 28);
this.txt_createOrg.TabIndex = 306;
- //
- // gv_createOrg
- //
- this.gv_createOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createOrg.AppearanceCell.Options.UseFont = true;
- this.gv_createOrg.Caption = "鍒涘缓缁勭粐 ";
- this.gv_createOrg.FieldName = "createOrg";
- this.gv_createOrg.MinWidth = 50;
- this.gv_createOrg.Name = "gv_createOrg";
- this.gv_createOrg.OptionsColumn.AllowEdit = false;
- this.gv_createOrg.Tag = "query_a.create_org";
- this.gv_createOrg.Visible = true;
- this.gv_createOrg.VisibleIndex = 14;
- this.gv_createOrg.Width = 94;
//
// lb_fforbidstatus
//
@@ -301,7 +270,7 @@
this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 13;
+ this.gv_fforbidstatus.VisibleIndex = 10;
this.gv_fforbidstatus.Width = 94;
//
// lb_fstaffid
@@ -334,7 +303,7 @@
this.gv_fstaffid.OptionsColumn.AllowEdit = false;
this.gv_fstaffid.Tag = "query_a.fstaffid";
this.gv_fstaffid.Visible = true;
- this.gv_fstaffid.VisibleIndex = 12;
+ this.gv_fstaffid.VisibleIndex = 9;
this.gv_fstaffid.Width = 94;
//
// lb_lxr
@@ -367,7 +336,7 @@
this.gv_lxr.OptionsColumn.AllowEdit = false;
this.gv_lxr.Tag = "query_a.lxr";
this.gv_lxr.Visible = true;
- this.gv_lxr.VisibleIndex = 11;
+ this.gv_lxr.VisibleIndex = 7;
this.gv_lxr.Width = 94;
//
// lb_lotFlag
@@ -455,6 +424,7 @@
this.gv_factory.MinWidth = 50;
this.gv_factory.Name = "gv_factory";
this.gv_factory.OptionsColumn.AllowEdit = false;
+ this.gv_factory.OptionsColumn.ReadOnly = true;
this.gv_factory.Tag = "query_a.factory";
this.gv_factory.Visible = true;
this.gv_factory.VisibleIndex = 0;
@@ -478,20 +448,6 @@
this.txt_company.Properties.Appearance.Options.UseFont = true;
this.txt_company.Size = new System.Drawing.Size(150, 28);
this.txt_company.TabIndex = 258;
- //
- // gv_company
- //
- this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_company.AppearanceCell.Options.UseFont = true;
- this.gv_company.Caption = "鍏徃浠ｇ爜 ";
- this.gv_company.FieldName = "company";
- this.gv_company.MinWidth = 50;
- this.gv_company.Name = "gv_company";
- this.gv_company.OptionsColumn.AllowEdit = false;
- this.gv_company.Tag = "query_a.company";
- this.gv_company.Visible = true;
- this.gv_company.VisibleIndex = 4;
- this.gv_company.Width = 94;
//
// lb_fscode
//
@@ -542,7 +498,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 10;
+ this.gv_remark.VisibleIndex = 8;
this.gv_remark.Width = 94;
//
// lb_lastupdateDate
@@ -608,13 +564,13 @@
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 50;
+ this.gv_createDate.MinWidth = 130;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 9;
- this.gv_createDate.Width = 94;
+ this.gv_createDate.VisibleIndex = 12;
+ this.gv_createDate.Width = 130;
//
// lb_createBy
//
@@ -646,7 +602,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 8;
+ this.gv_createBy.VisibleIndex = 11;
this.gv_createBy.Width = 94;
//
// lb_telfx
@@ -698,7 +654,7 @@
this.gv_telf1.OptionsColumn.AllowEdit = false;
this.gv_telf1.Tag = "query_a.telf1";
this.gv_telf1.Visible = true;
- this.gv_telf1.VisibleIndex = 7;
+ this.gv_telf1.VisibleIndex = 6;
this.gv_telf1.Width = 94;
//
// lb_stras
@@ -731,7 +687,7 @@
this.gv_stras.OptionsColumn.AllowEdit = false;
this.gv_stras.Tag = "query_a.stras";
this.gv_stras.Visible = true;
- this.gv_stras.VisibleIndex = 6;
+ this.gv_stras.VisibleIndex = 5;
this.gv_stras.Width = 94;
//
// lb_land1
@@ -764,7 +720,7 @@
this.gv_land1.OptionsColumn.AllowEdit = false;
this.gv_land1.Tag = "query_a.land1";
this.gv_land1.Visible = true;
- this.gv_land1.VisibleIndex = 5;
+ this.gv_land1.VisibleIndex = 4;
this.gv_land1.Width = 94;
//
// lb_suppSname
@@ -875,7 +831,7 @@
//
this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "ID ";
+ this.gv_id.Caption = "渚涘簲鍟咺D ";
this.gv_id.FieldName = "id";
this.gv_id.MinWidth = 50;
this.gv_id.Name = "gv_id";
@@ -893,11 +849,11 @@
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
-
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(992, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = "xlsOut_supplier{}";
//
// gcMain
//
@@ -920,18 +876,15 @@
this.gv_id,
this.gv_suppNo,
this.gv_suppName,
- this.gv_company,
this.gv_land1,
this.gv_stras,
this.gv_telf1,
- this.gv_createBy,
- this.gv_createDate,
this.gv_remark,
this.gv_lxr,
this.gv_fstaffid,
this.gv_fforbidstatus,
- this.gv_createOrg,
- this.gv_useOrg});
+ this.gv_createBy,
+ this.gv_createDate});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -1133,11 +1086,9 @@
private DevExpress.XtraEditors.LabelControl lb_useOrg;
private DevExpress.XtraEditors.TextEdit txt_useOrg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_useOrg;
private DevExpress.XtraEditors.LabelControl lb_createOrg;
private DevExpress.XtraEditors.TextEdit txt_createOrg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createOrg;
private DevExpress.XtraEditors.LabelControl lb_fforbidstatus;
private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
@@ -1166,7 +1117,6 @@
private DevExpress.XtraEditors.LabelControl lb_company;
private DevExpress.XtraEditors.TextEdit txt_company;
- private DevExpress.XtraGrid.Columns.GridColumn gv_company;
private DevExpress.XtraEditors.LabelControl lb_fscode;
private DevExpress.XtraEditors.TextEdit txt_fscode;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.resx
@@ -1,134 +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 xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ 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: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: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: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>
+ </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