From c4ebd2f08d72990416f3dd8d4a6a4ea62dc58da0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 28 十二月 2024 10:59:39 +0800
Subject: [PATCH] 线体
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 12
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 66 -
/dev/null | 120 ----
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 77 +-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 585 +++++-----------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 270 +--------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 10
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 55 -
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs | 351 +------------
10 files changed, 290 insertions(+), 1,260 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 48985a7..a645fe4 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index 3abbe4a..1001d5f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -36,42 +36,23 @@
this.lb_fforbidstatus = new DevExpress.XtraEditors.LabelControl();
this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_iscommit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lotFlag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_itemSap = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_itemC = 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.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.lb_anred = new DevExpress.XtraEditors.LabelControl();
this.txt_anred = new DevExpress.XtraEditors.TextEdit();
this.gv_anred = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_telfx = new DevExpress.XtraEditors.LabelControl();
- this.txt_telfx = new DevExpress.XtraEditors.TextEdit();
- this.gv_telfx = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_telf1 = new DevExpress.XtraEditors.LabelControl();
this.txt_telf1 = new DevExpress.XtraEditors.TextEdit();
this.gv_telf1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_stras = new DevExpress.XtraEditors.LabelControl();
- this.txt_stras = new DevExpress.XtraEditors.TextEdit();
- this.gv_stras = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_custSname = new DevExpress.XtraEditors.LabelControl();
this.txt_custSname = new DevExpress.XtraEditors.TextEdit();
this.gv_custSname = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_custName = new DevExpress.XtraEditors.LabelControl();
this.txt_custName = new DevExpress.XtraEditors.TextEdit();
this.gv_custName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_land = new DevExpress.XtraEditors.LabelControl();
- this.txt_land = new DevExpress.XtraEditors.TextEdit();
- this.gv_land = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_custNo = new DevExpress.XtraEditors.LabelControl();
this.txt_custNo = new DevExpress.XtraEditors.TextEdit();
this.gv_custNo = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -89,20 +70,15 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.txt_fseller.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_anred.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_telfx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_telf1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_stras.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custSname.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).BeginInit();
- ((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.gcMain)).BeginInit();
@@ -118,7 +94,7 @@
//
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(567, 124);
+ this.lb_fseller.Location = new System.Drawing.Point(320, 121);
this.lb_fseller.Name = "lb_fseller";
this.lb_fseller.Size = new System.Drawing.Size(56, 21);
this.lb_fseller.TabIndex = 298;
@@ -126,7 +102,7 @@
//
// txt_fseller
//
- this.txt_fseller.Location = new System.Drawing.Point(626, 120);
+ this.txt_fseller.Location = new System.Drawing.Point(379, 117);
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;
@@ -144,14 +120,14 @@
this.gv_fseller.OptionsColumn.AllowEdit = false;
this.gv_fseller.Tag = "query_a.fseller";
this.gv_fseller.Visible = true;
- this.gv_fseller.VisibleIndex = 16;
+ this.gv_fseller.VisibleIndex = 9;
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(41, 194);
+ this.lb_fforbidstatus.Location = new System.Drawing.Point(41, 118);
this.lb_fforbidstatus.Name = "lb_fforbidstatus";
this.lb_fforbidstatus.Size = new System.Drawing.Size(73, 21);
this.lb_fforbidstatus.TabIndex = 291;
@@ -159,7 +135,7 @@
//
// txt_fforbidstatus
//
- this.txt_fforbidstatus.Location = new System.Drawing.Point(120, 190);
+ this.txt_fforbidstatus.Location = new System.Drawing.Point(120, 114);
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;
@@ -177,70 +153,14 @@
this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 15;
+ this.gv_fforbidstatus.VisibleIndex = 8;
this.gv_fforbidstatus.Width = 94;
- //
- // gv_iscommit
- //
- this.gv_iscommit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_iscommit.AppearanceCell.Options.UseFont = true;
- this.gv_iscommit.Caption = "WMS鏄惁鍙戦�佹暟鎹細1宸插彂閫侊紝鍏朵粬鍧囨湭鍙戦�� ";
- this.gv_iscommit.FieldName = "iscommit";
- this.gv_iscommit.MinWidth = 50;
- this.gv_iscommit.Name = "gv_iscommit";
- this.gv_iscommit.OptionsColumn.AllowEdit = false;
- this.gv_iscommit.Tag = "query_a.iscommit";
- this.gv_iscommit.Visible = true;
- this.gv_iscommit.VisibleIndex = 14;
- this.gv_iscommit.Width = 94;
- //
- // gv_lotFlag
- //
- this.gv_lotFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lotFlag.AppearanceCell.Options.UseFont = true;
- this.gv_lotFlag.Caption = "鏄惁鎵规绠＄悊(鏄紝鍚�) ";
- this.gv_lotFlag.FieldName = "lotFlag";
- this.gv_lotFlag.MinWidth = 50;
- this.gv_lotFlag.Name = "gv_lotFlag";
- this.gv_lotFlag.OptionsColumn.AllowEdit = false;
- this.gv_lotFlag.Tag = "query_a.lot_flag";
- this.gv_lotFlag.Visible = true;
- this.gv_lotFlag.VisibleIndex = 13;
- this.gv_lotFlag.Width = 94;
- //
- // gv_itemSap
- //
- this.gv_itemSap.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemSap.AppearanceCell.Options.UseFont = true;
- this.gv_itemSap.Caption = "鐗╂枡鏄惁鍥炲啓SAP鎺ュ彛(鏄紝鍚�) ";
- this.gv_itemSap.FieldName = "itemSap";
- this.gv_itemSap.MinWidth = 50;
- this.gv_itemSap.Name = "gv_itemSap";
- this.gv_itemSap.OptionsColumn.AllowEdit = false;
- this.gv_itemSap.Tag = "query_a.item_sap";
- this.gv_itemSap.Visible = true;
- this.gv_itemSap.VisibleIndex = 12;
- this.gv_itemSap.Width = 94;
- //
- // gv_itemC
- //
- this.gv_itemC.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_itemC.AppearanceCell.Options.UseFont = true;
- this.gv_itemC.Caption = "鐗╂枡鏄惁鍏辩(鏄紝鍚�) ";
- this.gv_itemC.FieldName = "itemC";
- this.gv_itemC.MinWidth = 50;
- this.gv_itemC.Name = "gv_itemC";
- this.gv_itemC.OptionsColumn.AllowEdit = false;
- this.gv_itemC.Tag = "query_a.item_c";
- this.gv_itemC.Visible = true;
- this.gv_itemC.VisibleIndex = 11;
- this.gv_itemC.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(584, 86);
+ this.lb_remark.Location = new System.Drawing.Point(75, 158);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 252;
@@ -248,7 +168,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(626, 82);
+ this.txt_remark.Location = new System.Drawing.Point(117, 154);
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;
@@ -266,84 +186,27 @@
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 = 7;
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(286, 117);
- this.lb_lastupdateBy.Name = "lb_lastupdateBy";
- this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
- this.lb_lastupdateBy.TabIndex = 247;
- this.lb_lastupdateBy.Text = "鏈�鍚庝慨鏀逛汉 ";
- //
- // txt_lastupdateBy
- //
- 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;
//
// 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(7, 117);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(303, 157);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
- this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
+ this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
this.lb_lastupdateDate.TabIndex = 243;
- this.lb_lastupdateDate.Text = "鏈�鍚庝慨鏀规椂闂� ";
+ this.lb_lastupdateDate.Text = "鍚屾鏃堕棿 ";
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(120, 113);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(379, 153);
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;
- //
- // 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(320, 155);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(56, 21);
- this.lb_createBy.TabIndex = 240;
- this.lb_createBy.Text = "鍒涘缓浜� ";
- //
- // txt_createBy
- //
- 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;
- //
- // 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(303, 197);
- this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(73, 21);
- this.lb_createDate.TabIndex = 235;
- this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
- //
- // txt_createDate
- //
- this.txt_createDate.Location = new System.Drawing.Point(379, 193);
- 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;
//
// lb_anred
//
@@ -375,47 +238,14 @@
this.gv_anred.OptionsColumn.AllowEdit = false;
this.gv_anred.Tag = "query_a.anred";
this.gv_anred.Visible = true;
- this.gv_anred.VisibleIndex = 9;
+ this.gv_anred.VisibleIndex = 6;
this.gv_anred.Width = 94;
- //
- // lb_telfx
- //
- 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(75, 84);
- this.lb_telfx.Name = "lb_telfx";
- this.lb_telfx.Size = new System.Drawing.Size(39, 21);
- this.lb_telfx.TabIndex = 228;
- this.lb_telfx.Text = "浼犵湡 ";
- //
- // txt_telfx
- //
- 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;
- this.txt_telfx.Size = new System.Drawing.Size(150, 28);
- this.txt_telfx.TabIndex = 228;
- //
- // gv_telfx
- //
- this.gv_telfx.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_telfx.AppearanceCell.Options.UseFont = true;
- this.gv_telfx.Caption = "浼犵湡 ";
- this.gv_telfx.FieldName = "telfx";
- this.gv_telfx.MinWidth = 50;
- this.gv_telfx.Name = "gv_telfx";
- this.gv_telfx.OptionsColumn.AllowEdit = false;
- this.gv_telfx.Tag = "query_a.telfx";
- this.gv_telfx.Visible = true;
- this.gv_telfx.VisibleIndex = 8;
- this.gv_telfx.Width = 94;
//
// lb_telf1
//
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(75, 155);
+ this.lb_telf1.Location = new System.Drawing.Point(75, 84);
this.lb_telf1.Name = "lb_telf1";
this.lb_telf1.Size = new System.Drawing.Size(39, 21);
this.lb_telf1.TabIndex = 226;
@@ -423,7 +253,7 @@
//
// txt_telf1
//
- this.txt_telf1.Location = new System.Drawing.Point(120, 151);
+ this.txt_telf1.Location = new System.Drawing.Point(120, 80);
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;
@@ -441,47 +271,14 @@
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 = 5;
this.gv_telf1.Width = 94;
- //
- // lb_stras
- //
- 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(584, 52);
- this.lb_stras.Name = "lb_stras";
- this.lb_stras.Size = new System.Drawing.Size(39, 21);
- this.lb_stras.TabIndex = 222;
- this.lb_stras.Text = "鍦板潃 ";
- //
- // txt_stras
- //
- 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;
- this.txt_stras.Size = new System.Drawing.Size(150, 28);
- this.txt_stras.TabIndex = 222;
- //
- // gv_stras
- //
- this.gv_stras.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_stras.AppearanceCell.Options.UseFont = true;
- this.gv_stras.Caption = "鍦板潃 ";
- this.gv_stras.FieldName = "stras";
- this.gv_stras.MinWidth = 50;
- this.gv_stras.Name = "gv_stras";
- 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.Width = 94;
//
// lb_custSname
//
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(303, 52);
+ this.lb_custSname.Location = new System.Drawing.Point(303, 49);
this.lb_custSname.Name = "lb_custSname";
this.lb_custSname.Size = new System.Drawing.Size(73, 21);
this.lb_custSname.TabIndex = 219;
@@ -489,7 +286,7 @@
//
// txt_custSname
//
- this.txt_custSname.Location = new System.Drawing.Point(377, 48);
+ this.txt_custSname.Location = new System.Drawing.Point(377, 45);
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;
@@ -514,7 +311,7 @@
//
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(41, 52);
+ this.lb_custName.Location = new System.Drawing.Point(41, 49);
this.lb_custName.Name = "lb_custName";
this.lb_custName.Size = new System.Drawing.Size(73, 21);
this.lb_custName.TabIndex = 217;
@@ -522,7 +319,7 @@
//
// txt_custName
//
- this.txt_custName.Location = new System.Drawing.Point(120, 48);
+ this.txt_custName.Location = new System.Drawing.Point(120, 45);
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;
@@ -542,39 +339,6 @@
this.gv_custName.Visible = true;
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(584, 14);
- this.lb_land.Name = "lb_land";
- this.lb_land.Size = new System.Drawing.Size(39, 21);
- this.lb_land.TabIndex = 216;
- this.lb_land.Text = "鍦板尯 ";
- //
- // txt_land
- //
- 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;
- this.txt_land.Size = new System.Drawing.Size(150, 28);
- this.txt_land.TabIndex = 216;
- //
- // gv_land
- //
- this.gv_land.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_land.AppearanceCell.Options.UseFont = true;
- this.gv_land.Caption = "鍦板尯 ";
- this.gv_land.FieldName = "land";
- this.gv_land.MinWidth = 50;
- this.gv_land.Name = "gv_land";
- this.gv_land.OptionsColumn.AllowEdit = false;
- this.gv_land.Tag = "query_a.land";
- this.gv_land.Visible = true;
- this.gv_land.VisibleIndex = 5;
- this.gv_land.Width = 94;
//
// lb_custNo
//
@@ -679,18 +443,12 @@
this.gv_custNo,
this.gv_custName,
this.gv_custSname,
- this.gv_land,
- this.gv_stras,
this.gv_telf1,
- this.gv_telfx,
this.gv_anred,
this.gv_remark,
- this.gv_itemC,
- this.gv_itemSap,
- this.gv_lotFlag,
- this.gv_iscommit,
this.gv_fforbidstatus,
- this.gv_fseller});
+ this.gv_fseller,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -759,28 +517,16 @@
this.panel1.Controls.Add(this.txt_fforbidstatus);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.lb_lastupdateBy);
- this.panel1.Controls.Add(this.txt_lastupdateBy);
this.panel1.Controls.Add(this.lb_lastupdateDate);
this.panel1.Controls.Add(this.txt_lastupdateDate);
- this.panel1.Controls.Add(this.lb_createBy);
- this.panel1.Controls.Add(this.txt_createBy);
- this.panel1.Controls.Add(this.lb_createDate);
- this.panel1.Controls.Add(this.txt_createDate);
this.panel1.Controls.Add(this.lb_anred);
this.panel1.Controls.Add(this.txt_anred);
- this.panel1.Controls.Add(this.lb_telfx);
- this.panel1.Controls.Add(this.txt_telfx);
this.panel1.Controls.Add(this.lb_telf1);
this.panel1.Controls.Add(this.txt_telf1);
- this.panel1.Controls.Add(this.lb_stras);
- this.panel1.Controls.Add(this.txt_stras);
this.panel1.Controls.Add(this.lb_custSname);
this.panel1.Controls.Add(this.txt_custSname);
this.panel1.Controls.Add(this.lb_custName);
this.panel1.Controls.Add(this.txt_custName);
- this.panel1.Controls.Add(this.lb_land);
- this.panel1.Controls.Add(this.txt_land);
this.panel1.Controls.Add(this.lb_custNo);
this.panel1.Controls.Add(this.txt_custNo);
this.panel1.Controls.Add(this.lb_id);
@@ -788,12 +534,12 @@
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(820, 299);
+ this.panel1.Size = new System.Drawing.Size(651, 299);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(422, 223);
+ this.labelControl11.Location = new System.Drawing.Point(412, 206);
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);
@@ -804,11 +550,22 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(473, 223);
+ this.lbGuid.Location = new System.Drawing.Point(463, 206);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍚屾鏃堕棿";
+ this.gridColumn1.FieldName = "lastupdateDate";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "query_a.lastupdate_date";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 10;
+ this.gridColumn1.Width = 180;
//
// Frm_Customer
//
@@ -822,17 +579,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fseller.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_anred.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_telfx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_telf1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_stras.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custSname.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custName.Properties)).EndInit();
- ((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.gcMain)).EndInit();
@@ -865,42 +616,21 @@
private DevExpress.XtraEditors.LabelControl lb_fforbidstatus;
private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_iscommit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lotFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemSap;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemC;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
- private DevExpress.XtraEditors.LabelControl lb_createBy;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
-
- private DevExpress.XtraEditors.LabelControl lb_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraEditors.LabelControl lb_anred;
private DevExpress.XtraEditors.TextEdit txt_anred;
private DevExpress.XtraGrid.Columns.GridColumn gv_anred;
- private DevExpress.XtraEditors.LabelControl lb_telfx;
- private DevExpress.XtraEditors.TextEdit txt_telfx;
- private DevExpress.XtraGrid.Columns.GridColumn gv_telfx;
-
private DevExpress.XtraEditors.LabelControl lb_telf1;
private DevExpress.XtraEditors.TextEdit txt_telf1;
private DevExpress.XtraGrid.Columns.GridColumn gv_telf1;
-
- private DevExpress.XtraEditors.LabelControl lb_stras;
- private DevExpress.XtraEditors.TextEdit txt_stras;
- private DevExpress.XtraGrid.Columns.GridColumn gv_stras;
private DevExpress.XtraEditors.LabelControl lb_custSname;
private DevExpress.XtraEditors.TextEdit txt_custSname;
@@ -910,10 +640,6 @@
private DevExpress.XtraEditors.TextEdit txt_custName;
private DevExpress.XtraGrid.Columns.GridColumn gv_custName;
- private DevExpress.XtraEditors.LabelControl lb_land;
- private DevExpress.XtraEditors.TextEdit txt_land;
- private DevExpress.XtraGrid.Columns.GridColumn gv_land;
-
private DevExpress.XtraEditors.LabelControl lb_custNo;
private DevExpress.XtraEditors.TextEdit txt_custNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_custNo;
@@ -922,5 +648,6 @@
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_org;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ 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 5ee09c5..54d8f68 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -32,8 +32,6 @@
private void InitializeComponent()
{
this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl();
- this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
this.lb_productionWorkshop = new DevExpress.XtraEditors.LabelControl();
this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
@@ -74,7 +72,7 @@
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_materialProperti.Properties)).BeginInit();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit();
@@ -106,27 +104,8 @@
this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_parentId.Tag = "query_c.Departmentname";
this.gv_parentId.Visible = true;
- this.gv_parentId.VisibleIndex = 10;
+ this.gv_parentId.VisibleIndex = 9;
this.gv_parentId.Width = 150;
- //
- // lb_materialProperti
- //
- this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_materialProperti.Appearance.Options.UseFont = true;
- this.lb_materialProperti.Location = new System.Drawing.Point(270, 87);
- this.lb_materialProperti.Name = "lb_materialProperti";
- this.lb_materialProperti.Size = new System.Drawing.Size(73, 21);
- this.lb_materialProperti.TabIndex = 291;
- this.lb_materialProperti.Text = "鐗╂枡灞炴�� ";
- //
- // txt_materialProperti
- //
- this.txt_materialProperti.Location = new System.Drawing.Point(349, 83);
- this.txt_materialProperti.Name = "txt_materialProperti";
- this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
- this.txt_materialProperti.Size = new System.Drawing.Size(150, 28);
- this.txt_materialProperti.TabIndex = 291;
//
// lb_productionWorkshop
//
@@ -178,7 +157,7 @@
this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.VisibleIndex = 8;
this.gv_remark.Width = 94;
//
// gv_factory
@@ -228,7 +207,7 @@
this.gv_fmanager.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_fmanager.Tag = "query_a.fmanager";
this.gv_fmanager.Visible = true;
- this.gv_fmanager.VisibleIndex = 8;
+ this.gv_fmanager.VisibleIndex = 7;
this.gv_fmanager.Width = 94;
//
// lb_depextr4
@@ -254,7 +233,7 @@
//
this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depextr4.AppearanceCell.Options.UseFont = true;
- this.gv_depextr4.Caption = "A鍚敤B绂佺敤";
+ this.gv_depextr4.Caption = "绂佺敤鐘舵��";
this.gv_depextr4.FieldName = "depextr4";
this.gv_depextr4.MinWidth = 50;
this.gv_depextr4.Name = "gv_depextr4";
@@ -262,8 +241,8 @@
this.gv_depextr4.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr4.Tag = "query_a.depextr4";
this.gv_depextr4.Visible = true;
- this.gv_depextr4.VisibleIndex = 7;
- this.gv_depextr4.Width = 94;
+ this.gv_depextr4.VisibleIndex = 6;
+ this.gv_depextr4.Width = 50;
//
// lb_depextr3
//
@@ -296,14 +275,14 @@
this.gv_depextr3.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr3.Tag = "query_a.depextr3";
this.gv_depextr3.Visible = true;
- this.gv_depextr3.VisibleIndex = 6;
+ this.gv_depextr3.VisibleIndex = 5;
this.gv_depextr3.Width = 94;
//
// lb_depextr2
//
this.lb_depextr2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depextr2.Appearance.Options.UseFont = true;
- this.lb_depextr2.Location = new System.Drawing.Point(526, 14);
+ this.lb_depextr2.Location = new System.Drawing.Point(274, 87);
this.lb_depextr2.Name = "lb_depextr2";
this.lb_depextr2.Size = new System.Drawing.Size(73, 21);
this.lb_depextr2.TabIndex = 222;
@@ -311,7 +290,7 @@
//
// txt_depextr2
//
- this.txt_depextr2.Location = new System.Drawing.Point(605, 14);
+ this.txt_depextr2.Location = new System.Drawing.Point(349, 83);
this.txt_depextr2.Name = "txt_depextr2";
this.txt_depextr2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_depextr2.Properties.Appearance.Options.UseFont = true;
@@ -330,7 +309,7 @@
this.gv_depextr2.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr2.Tag = "query_a.depextr2";
this.gv_depextr2.Visible = true;
- this.gv_depextr2.VisibleIndex = 5;
+ this.gv_depextr2.VisibleIndex = 4;
this.gv_depextr2.Width = 100;
//
// lb_depextr1
@@ -364,7 +343,7 @@
this.gv_depextr1.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_depextr1.Tag = "query_a.depextr1";
this.gv_depextr1.Visible = true;
- this.gv_depextr1.VisibleIndex = 4;
+ this.gv_depextr1.VisibleIndex = 3;
this.gv_depextr1.Width = 100;
//
// lb_departmentname
@@ -398,7 +377,7 @@
this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentname.Tag = "query_a.departmentname";
this.gv_departmentname.Visible = true;
- this.gv_departmentname.VisibleIndex = 3;
+ this.gv_departmentname.VisibleIndex = 2;
this.gv_departmentname.Width = 150;
//
// lb_departmentcode
@@ -432,7 +411,7 @@
this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentcode.Tag = "query_a.departmentcode";
this.gv_departmentcode.Visible = true;
- this.gv_departmentcode.VisibleIndex = 2;
+ this.gv_departmentcode.VisibleIndex = 1;
this.gv_departmentcode.Width = 94;
//
// lb_departmentid
@@ -465,8 +444,6 @@
this.gv_departmentid.OptionsColumn.AllowEdit = false;
this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentid.Tag = "query_a.departmentid";
- this.gv_departmentid.Visible = true;
- this.gv_departmentid.VisibleIndex = 1;
this.gv_departmentid.Width = 94;
//
// toolBarMenu1
@@ -498,8 +475,11 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_factory,
this.gv_departmentid,
@@ -511,7 +491,8 @@
this.gv_depextr4,
this.gv_fmanager,
this.gv_remark,
- this.gv_parentId});
+ this.gv_parentId,
+ this.gridColumn1});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -567,8 +548,6 @@
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_materialProperti);
- this.panel1.Controls.Add(this.txt_materialProperti);
this.panel1.Controls.Add(this.lb_productionWorkshop);
this.panel1.Controls.Add(this.txt_productionWorkshop);
this.panel1.Controls.Add(this.lb_remark);
@@ -592,7 +571,7 @@
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(800, 262);
+ this.panel1.Size = new System.Drawing.Size(579, 262);
this.panel1.TabIndex = 1;
//
// labelControl11
@@ -614,6 +593,17 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍚屾鏃堕棿";
+ this.gridColumn1.FieldName = "lastupdateDate";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Tag = "query_a.lastupdate_date";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 10;
+ this.gridColumn1.Width = 180;
+ //
// Frm_Department
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -623,7 +613,6 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Department";
this.Text = "閮ㄩ棬淇℃伅";
- ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).EndInit();
@@ -657,9 +646,6 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
-
- private DevExpress.XtraEditors.LabelControl lb_materialProperti;
- private DevExpress.XtraEditors.TextEdit txt_materialProperti;
private DevExpress.XtraEditors.LabelControl lb_productionWorkshop;
private DevExpress.XtraEditors.TextEdit txt_productionWorkshop;
@@ -700,5 +686,6 @@
private DevExpress.XtraEditors.LabelControl lb_departmentid;
private DevExpress.XtraEditors.TextEdit txt_departmentid;
private DevExpress.XtraGrid.Columns.GridColumn gv_departmentid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 6e1ae97..5a203c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -34,12 +34,9 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- this.gvMx1depotSectionNamet = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1kbQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1description = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1completenessFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotSectionName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -48,42 +45,23 @@
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl();
- this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
this.lb_isFkc = new DevExpress.XtraEditors.LabelControl();
this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
this.gv_isFkc = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_zuid = new DevExpress.XtraEditors.LabelControl();
this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
this.gv_zuid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_piType = new DevExpress.XtraEditors.LabelControl();
- this.txt_piType = new DevExpress.XtraEditors.TextEdit();
- this.lb_cwhaddress = new DevExpress.XtraEditors.LabelControl();
- this.txt_cwhaddress = new DevExpress.XtraEditors.TextEdit();
this.lb_isNg = new DevExpress.XtraEditors.LabelControl();
this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_isWy = new DevExpress.XtraEditors.LabelControl();
this.txt_isWy = new DevExpress.XtraEditors.TextEdit();
this.gv_isWy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_iconType = new DevExpress.XtraEditors.LabelControl();
- this.txt_iconType = new DevExpress.XtraEditors.TextEdit();
- this.lb_depottypecode = new DevExpress.XtraEditors.LabelControl();
- this.txt_depottypecode = new DevExpress.XtraEditors.TextEdit();
- this.gv_depottypecode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_type2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_type2 = new DevExpress.XtraEditors.TextEdit();
- this.lb_type1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_type1 = new DevExpress.XtraEditors.TextEdit();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_factory = new DevExpress.XtraEditors.TextEdit();
this.lb_depottype = new DevExpress.XtraEditors.LabelControl();
this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
@@ -91,7 +69,6 @@
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_description = new DevExpress.XtraEditors.LabelControl();
this.txt_description = new DevExpress.XtraEditors.TextEdit();
- this.gv_description = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depotName = new DevExpress.XtraEditors.LabelControl();
this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -102,10 +79,12 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -119,21 +98,12 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cwhaddress.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
@@ -151,33 +121,6 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
- // gvMx1depotSectionNamet
- //
- this.gvMx1depotSectionNamet.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1depotSectionNamet.AppearanceCell.Options.UseFont = true;
- this.gvMx1depotSectionNamet.Caption = "浠撲綅鍏ㄥ悕";
- this.gvMx1depotSectionNamet.FieldName = "depotSectionNamet";
- this.gvMx1depotSectionNamet.MinWidth = 50;
- this.gvMx1depotSectionNamet.Name = "gvMx1depotSectionNamet";
- this.gvMx1depotSectionNamet.Tag = "edit";
- this.gvMx1depotSectionNamet.Visible = true;
- this.gvMx1depotSectionNamet.VisibleIndex = 5;
- this.gvMx1depotSectionNamet.Width = 94;
- //
- // gvMx1kbQty
- //
- this.gvMx1kbQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1kbQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1kbQty.Caption = "鍗℃澘鏁�";
- this.gvMx1kbQty.FieldName = "kbQty";
- this.gvMx1kbQty.MinWidth = 50;
- this.gvMx1kbQty.Name = "gvMx1kbQty";
- this.gvMx1kbQty.Tag = "yz_quantity_0_edit";
- this.gvMx1kbQty.UnboundDataType = typeof(decimal);
- this.gvMx1kbQty.Visible = true;
- this.gvMx1kbQty.VisibleIndex = 4;
- this.gvMx1kbQty.Width = 94;
- //
// gvMx1lastupdateDate
//
this.gvMx1lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -189,8 +132,8 @@
this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true;
this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
this.gvMx1lastupdateDate.Visible = true;
- this.gvMx1lastupdateDate.VisibleIndex = 7;
- this.gvMx1lastupdateDate.Width = 94;
+ this.gvMx1lastupdateDate.VisibleIndex = 3;
+ this.gvMx1lastupdateDate.Width = 180;
//
// gvMx1lastupdateBy
//
@@ -203,7 +146,7 @@
this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true;
this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
this.gvMx1lastupdateBy.Visible = true;
- this.gvMx1lastupdateBy.VisibleIndex = 6;
+ this.gvMx1lastupdateBy.VisibleIndex = 4;
this.gvMx1lastupdateBy.Width = 94;
//
// gvMx1description
@@ -216,22 +159,8 @@
this.gvMx1description.Name = "gvMx1description";
this.gvMx1description.Tag = "edit";
this.gvMx1description.Visible = true;
- this.gvMx1description.VisibleIndex = 3;
+ this.gvMx1description.VisibleIndex = 2;
this.gvMx1description.Width = 94;
- //
- // gvMx1completenessFlag
- //
- this.gvMx1completenessFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1completenessFlag.AppearanceCell.Options.UseFont = true;
- this.gvMx1completenessFlag.Caption = "鍙備笌榻愬鏍￠獙(0:鍚�,1:鏄�)";
- this.gvMx1completenessFlag.FieldName = "completenessFlag";
- this.gvMx1completenessFlag.MinWidth = 50;
- this.gvMx1completenessFlag.Name = "gvMx1completenessFlag";
- this.gvMx1completenessFlag.Tag = "edit";
- this.gvMx1completenessFlag.UnboundDataType = typeof(bool);
- this.gvMx1completenessFlag.Visible = true;
- this.gvMx1completenessFlag.VisibleIndex = 2;
- this.gvMx1completenessFlag.Width = 94;
//
// gvMx1depotSectionName
//
@@ -275,7 +204,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
+ this.tabMxPage1.Size = new System.Drawing.Size(1262, 415);
this.tabMxPage1.Text = "浠撲綅鍒楄〃";
//
// gcMx1
@@ -286,7 +215,7 @@
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 338);
+ this.gcMx1.Size = new System.Drawing.Size(1262, 415);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -297,10 +226,7 @@
this.gvMx1guid,
this.gvMx1depotSectionCode,
this.gvMx1depotSectionName,
- this.gvMx1completenessFlag,
this.gvMx1description,
- this.gvMx1kbQty,
- this.gvMx1depotSectionNamet,
this.gvMx1lastupdateBy,
this.gvMx1lastupdateDate,
this.gvMxDel});
@@ -318,8 +244,8 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.VisibleIndex = 5;
+ this.gvMxDel.Width = 100;
//
// repositoryItemButtonEdit1
//
@@ -332,31 +258,11 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // lb_materialProperti
- //
- this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_materialProperti.Appearance.Options.UseFont = true;
- this.lb_materialProperti.Location = new System.Drawing.Point(558, 52);
- this.lb_materialProperti.Name = "lb_materialProperti";
- this.lb_materialProperti.Size = new System.Drawing.Size(73, 21);
- this.lb_materialProperti.TabIndex = 306;
- this.lb_materialProperti.Text = "鐗╂枡灞炴�� ";
- //
- // txt_materialProperti
- //
- this.txt_materialProperti.Enabled = false;
- this.txt_materialProperti.Location = new System.Drawing.Point(638, 48);
- this.txt_materialProperti.Name = "txt_materialProperti";
- this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
- this.txt_materialProperti.Size = new System.Drawing.Size(150, 28);
- this.txt_materialProperti.TabIndex = 306;
- //
// lb_isFkc
//
this.lb_isFkc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isFkc.Appearance.Options.UseFont = true;
- this.lb_isFkc.Location = new System.Drawing.Point(541, 118);
+ this.lb_isFkc.Location = new System.Drawing.Point(23, 85);
this.lb_isFkc.Name = "lb_isFkc";
this.lb_isFkc.Size = new System.Drawing.Size(90, 21);
this.lb_isFkc.TabIndex = 291;
@@ -365,7 +271,7 @@
// txt_isFkc
//
this.txt_isFkc.Enabled = false;
- this.txt_isFkc.Location = new System.Drawing.Point(638, 114);
+ this.txt_isFkc.Location = new System.Drawing.Point(118, 81);
this.txt_isFkc.Name = "txt_isFkc";
this.txt_isFkc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
@@ -378,19 +284,19 @@
this.gv_isFkc.AppearanceCell.Options.UseFont = true;
this.gv_isFkc.Caption = "鍏佽鍗虫椂搴撳瓨璐熷簱瀛�";
this.gv_isFkc.FieldName = "isFkc";
- this.gv_isFkc.MinWidth = 50;
+ this.gv_isFkc.MinWidth = 70;
this.gv_isFkc.Name = "gv_isFkc";
this.gv_isFkc.OptionsColumn.AllowEdit = false;
this.gv_isFkc.Tag = "query_a.is_fkc";
this.gv_isFkc.Visible = true;
- this.gv_isFkc.VisibleIndex = 12;
- this.gv_isFkc.Width = 94;
+ this.gv_isFkc.VisibleIndex = 8;
+ this.gv_isFkc.Width = 70;
//
// lb_zuid
//
this.lb_zuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_zuid.Appearance.Options.UseFont = true;
- this.lb_zuid.Location = new System.Drawing.Point(592, 149);
+ this.lb_zuid.Location = new System.Drawing.Point(571, 52);
this.lb_zuid.Name = "lb_zuid";
this.lb_zuid.Size = new System.Drawing.Size(39, 21);
this.lb_zuid.TabIndex = 285;
@@ -399,11 +305,11 @@
// txt_zuid
//
this.txt_zuid.Enabled = false;
- this.txt_zuid.Location = new System.Drawing.Point(638, 145);
+ this.txt_zuid.Location = new System.Drawing.Point(617, 48);
this.txt_zuid.Name = "txt_zuid";
this.txt_zuid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_zuid.Properties.Appearance.Options.UseFont = true;
- this.txt_zuid.Size = new System.Drawing.Size(150, 28);
+ this.txt_zuid.Size = new System.Drawing.Size(119, 28);
this.txt_zuid.TabIndex = 285;
//
// gv_zuid
@@ -417,54 +323,14 @@
this.gv_zuid.OptionsColumn.AllowEdit = false;
this.gv_zuid.Tag = "query_a.zuid";
this.gv_zuid.Visible = true;
- this.gv_zuid.VisibleIndex = 11;
- this.gv_zuid.Width = 94;
- //
- // lb_piType
- //
- this.lb_piType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_piType.Appearance.Options.UseFont = true;
- this.lb_piType.Location = new System.Drawing.Point(814, 118);
- this.lb_piType.Name = "lb_piType";
- this.lb_piType.Size = new System.Drawing.Size(107, 21);
- this.lb_piType.TabIndex = 280;
- this.lb_piType.Text = "鐪嬫澘鍖哄煙缂栧彿 ";
- //
- // txt_piType
- //
- this.txt_piType.Enabled = false;
- this.txt_piType.Location = new System.Drawing.Point(927, 114);
- this.txt_piType.Name = "txt_piType";
- this.txt_piType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_piType.Properties.Appearance.Options.UseFont = true;
- this.txt_piType.Size = new System.Drawing.Size(150, 28);
- this.txt_piType.TabIndex = 280;
- //
- // lb_cwhaddress
- //
- this.lb_cwhaddress.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_cwhaddress.Appearance.Options.UseFont = true;
- this.lb_cwhaddress.Location = new System.Drawing.Point(305, 119);
- this.lb_cwhaddress.Name = "lb_cwhaddress";
- this.lb_cwhaddress.Size = new System.Drawing.Size(73, 21);
- this.lb_cwhaddress.TabIndex = 273;
- this.lb_cwhaddress.Text = "浠撳簱鍦板潃 ";
- //
- // txt_cwhaddress
- //
- this.txt_cwhaddress.Enabled = false;
- this.txt_cwhaddress.Location = new System.Drawing.Point(382, 115);
- this.txt_cwhaddress.Name = "txt_cwhaddress";
- this.txt_cwhaddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_cwhaddress.Properties.Appearance.Options.UseFont = true;
- this.txt_cwhaddress.Size = new System.Drawing.Size(150, 28);
- this.txt_cwhaddress.TabIndex = 273;
+ this.gv_zuid.VisibleIndex = 7;
+ this.gv_zuid.Width = 71;
//
// lb_isNg
//
this.lb_isNg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isNg.Appearance.Options.UseFont = true;
- this.lb_isNg.Location = new System.Drawing.Point(271, 148);
+ this.lb_isNg.Location = new System.Drawing.Point(914, 86);
this.lb_isNg.Name = "lb_isNg";
this.lb_isNg.Size = new System.Drawing.Size(107, 21);
this.lb_isNg.TabIndex = 267;
@@ -473,11 +339,11 @@
// txt_isNg
//
this.txt_isNg.Enabled = false;
- this.txt_isNg.Location = new System.Drawing.Point(382, 144);
+ this.txt_isNg.Location = new System.Drawing.Point(1026, 82);
this.txt_isNg.Name = "txt_isNg";
this.txt_isNg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_isNg.Properties.Appearance.Options.UseFont = true;
- this.txt_isNg.Size = new System.Drawing.Size(150, 28);
+ this.txt_isNg.Size = new System.Drawing.Size(35, 28);
this.txt_isNg.TabIndex = 267;
//
// gv_isNg
@@ -486,19 +352,19 @@
this.gv_isNg.AppearanceCell.Options.UseFont = true;
this.gv_isNg.Caption = "鏄惁涓嶈壇鍝佷粨";
this.gv_isNg.FieldName = "isNg";
- this.gv_isNg.MinWidth = 50;
+ this.gv_isNg.MinWidth = 70;
this.gv_isNg.Name = "gv_isNg";
this.gv_isNg.OptionsColumn.AllowEdit = false;
this.gv_isNg.Tag = "query_a.is_ng";
this.gv_isNg.Visible = true;
- this.gv_isNg.VisibleIndex = 10;
- this.gv_isNg.Width = 94;
+ this.gv_isNg.VisibleIndex = 6;
+ this.gv_isNg.Width = 70;
//
// lb_isWy
//
this.lb_isWy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isWy.Appearance.Options.UseFont = true;
- this.lb_isWy.Location = new System.Drawing.Point(6, 148);
+ this.lb_isWy.Location = new System.Drawing.Point(756, 86);
this.lb_isWy.Name = "lb_isWy";
this.lb_isWy.Size = new System.Drawing.Size(107, 21);
this.lb_isWy.TabIndex = 262;
@@ -507,11 +373,11 @@
// txt_isWy
//
this.txt_isWy.Enabled = false;
- this.txt_isWy.Location = new System.Drawing.Point(118, 144);
+ this.txt_isWy.Location = new System.Drawing.Point(869, 82);
this.txt_isWy.Name = "txt_isWy";
this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_isWy.Properties.Appearance.Options.UseFont = true;
- this.txt_isWy.Size = new System.Drawing.Size(150, 28);
+ this.txt_isWy.Size = new System.Drawing.Size(35, 28);
this.txt_isWy.TabIndex = 262;
//
// gv_isWy
@@ -520,133 +386,19 @@
this.gv_isWy.AppearanceCell.Options.UseFont = true;
this.gv_isWy.Caption = "鏄惁濮斿浠撳簱";
this.gv_isWy.FieldName = "isWy";
- this.gv_isWy.MinWidth = 50;
+ this.gv_isWy.MinWidth = 70;
this.gv_isWy.Name = "gv_isWy";
this.gv_isWy.OptionsColumn.AllowEdit = false;
this.gv_isWy.Tag = "query_a.is_wy";
this.gv_isWy.Visible = true;
- this.gv_isWy.VisibleIndex = 9;
- this.gv_isWy.Width = 94;
- //
- // lb_iconType
- //
- this.lb_iconType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_iconType.Appearance.Options.UseFont = true;
- this.lb_iconType.Location = new System.Drawing.Point(848, 149);
- this.lb_iconType.Name = "lb_iconType";
- this.lb_iconType.Size = new System.Drawing.Size(73, 21);
- this.lb_iconType.TabIndex = 258;
- this.lb_iconType.Text = "鐪嬫澘鍥炬爣 ";
- //
- // txt_iconType
- //
- this.txt_iconType.Enabled = false;
- this.txt_iconType.Location = new System.Drawing.Point(927, 145);
- this.txt_iconType.Name = "txt_iconType";
- this.txt_iconType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_iconType.Properties.Appearance.Options.UseFont = true;
- this.txt_iconType.Size = new System.Drawing.Size(150, 28);
- this.txt_iconType.TabIndex = 258;
- //
- // lb_depottypecode
- //
- this.lb_depottypecode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_depottypecode.Appearance.Options.UseFont = true;
- this.lb_depottypecode.Location = new System.Drawing.Point(6, 86);
- this.lb_depottypecode.Name = "lb_depottypecode";
- this.lb_depottypecode.Size = new System.Drawing.Size(107, 21);
- this.lb_depottypecode.TabIndex = 247;
- this.lb_depottypecode.Text = "浠撳簱绫诲瀷缂栫爜 ";
- //
- // txt_depottypecode
- //
- this.txt_depottypecode.Enabled = false;
- this.txt_depottypecode.Location = new System.Drawing.Point(118, 82);
- this.txt_depottypecode.Name = "txt_depottypecode";
- this.txt_depottypecode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depottypecode.Properties.Appearance.Options.UseFont = true;
- this.txt_depottypecode.Size = new System.Drawing.Size(150, 28);
- this.txt_depottypecode.TabIndex = 247;
- //
- // gv_depottypecode
- //
- this.gv_depottypecode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_depottypecode.AppearanceCell.Options.UseFont = true;
- this.gv_depottypecode.Caption = "浠撳簱绫诲瀷缂栫爜";
- this.gv_depottypecode.FieldName = "depottypecode";
- this.gv_depottypecode.MinWidth = 50;
- this.gv_depottypecode.Name = "gv_depottypecode";
- this.gv_depottypecode.OptionsColumn.AllowEdit = false;
- this.gv_depottypecode.Tag = "query_a.depottypecode";
- this.gv_depottypecode.Visible = true;
- this.gv_depottypecode.VisibleIndex = 8;
- this.gv_depottypecode.Width = 94;
- //
- // lb_type2
- //
- this.lb_type2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_type2.Appearance.Options.UseFont = true;
- this.lb_type2.Location = new System.Drawing.Point(40, 116);
- this.lb_type2.Name = "lb_type2";
- this.lb_type2.Size = new System.Drawing.Size(73, 21);
- this.lb_type2.TabIndex = 243;
- this.lb_type2.Text = "鎴愬搧浣跨敤 ";
- //
- // txt_type2
- //
- this.txt_type2.Enabled = false;
- this.txt_type2.Location = new System.Drawing.Point(118, 112);
- this.txt_type2.Name = "txt_type2";
- this.txt_type2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_type2.Properties.Appearance.Options.UseFont = true;
- this.txt_type2.Size = new System.Drawing.Size(150, 28);
- this.txt_type2.TabIndex = 243;
- //
- // lb_type1
- //
- this.lb_type1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_type1.Appearance.Options.UseFont = true;
- this.lb_type1.Location = new System.Drawing.Point(305, 86);
- this.lb_type1.Name = "lb_type1";
- this.lb_type1.Size = new System.Drawing.Size(73, 21);
- this.lb_type1.TabIndex = 240;
- this.lb_type1.Text = "鐗╂枡浣跨敤 ";
- //
- // txt_type1
- //
- this.txt_type1.Enabled = false;
- this.txt_type1.Location = new System.Drawing.Point(382, 82);
- this.txt_type1.Name = "txt_type1";
- this.txt_type1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_type1.Properties.Appearance.Options.UseFont = true;
- this.txt_type1.Size = new System.Drawing.Size(150, 28);
- this.txt_type1.TabIndex = 240;
- //
- // 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(558, 86);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(73, 21);
- this.lb_factory.TabIndex = 235;
- this.lb_factory.Text = "鍒嗗巶缂栫爜 ";
- //
- // txt_factory
- //
- this.txt_factory.Enabled = false;
- this.txt_factory.Location = new System.Drawing.Point(638, 82);
- 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 = 235;
+ this.gv_isWy.VisibleIndex = 5;
+ this.gv_isWy.Width = 70;
//
// lb_depottype
//
this.lb_depottype.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depottype.Appearance.Options.UseFont = true;
- this.lb_depottype.Location = new System.Drawing.Point(305, 52);
+ this.lb_depottype.Location = new System.Drawing.Point(284, 52);
this.lb_depottype.Name = "lb_depottype";
this.lb_depottype.Size = new System.Drawing.Size(73, 21);
this.lb_depottype.TabIndex = 231;
@@ -655,7 +407,7 @@
// txt_depottype
//
this.txt_depottype.Enabled = false;
- this.txt_depottype.Location = new System.Drawing.Point(382, 48);
+ this.txt_depottype.Location = new System.Drawing.Point(361, 48);
this.txt_depottype.Name = "txt_depottype";
this.txt_depottype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_depottype.Properties.Appearance.Options.UseFont = true;
@@ -668,19 +420,19 @@
this.gv_depottype.AppearanceCell.Options.UseFont = true;
this.gv_depottype.Caption = "浠撳簱绫诲瀷";
this.gv_depottype.FieldName = "depottype";
- this.gv_depottype.MinWidth = 50;
+ this.gv_depottype.MinWidth = 80;
this.gv_depottype.Name = "gv_depottype";
this.gv_depottype.OptionsColumn.AllowEdit = false;
this.gv_depottype.Tag = "query_a.depottype";
this.gv_depottype.Visible = true;
- this.gv_depottype.VisibleIndex = 7;
- this.gv_depottype.Width = 94;
+ this.gv_depottype.VisibleIndex = 3;
+ this.gv_depottype.Width = 80;
//
// 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(814, 86);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(756, 52);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
this.lb_lastupdateDate.TabIndex = 228;
@@ -689,38 +441,18 @@
// txt_lastupdateDate
//
this.txt_lastupdateDate.Enabled = false;
- this.txt_lastupdateDate.Location = new System.Drawing.Point(927, 82);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(869, 48);
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.Size = new System.Drawing.Size(192, 28);
this.txt_lastupdateDate.TabIndex = 228;
- //
- // 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(831, 52);
- this.lb_lastupdateBy.Name = "lb_lastupdateBy";
- this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
- this.lb_lastupdateBy.TabIndex = 226;
- this.lb_lastupdateBy.Text = "鏈�鍚庢洿鏂颁汉 ";
- //
- // txt_lastupdateBy
- //
- this.txt_lastupdateBy.Enabled = false;
- this.txt_lastupdateBy.Location = new System.Drawing.Point(927, 48);
- 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 = 226;
//
// 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(848, 18);
+ this.lb_createDate.Location = new System.Drawing.Point(790, 18);
this.lb_createDate.Name = "lb_createDate";
this.lb_createDate.Size = new System.Drawing.Size(73, 21);
this.lb_createDate.TabIndex = 222;
@@ -729,18 +461,18 @@
// txt_createDate
//
this.txt_createDate.Enabled = false;
- this.txt_createDate.Location = new System.Drawing.Point(927, 14);
+ this.txt_createDate.Location = new System.Drawing.Point(869, 14);
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.Size = new System.Drawing.Size(192, 28);
this.txt_createDate.TabIndex = 222;
//
// 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(541, 18);
+ this.lb_createBy.Location = new System.Drawing.Point(520, 18);
this.lb_createBy.Name = "lb_createBy";
this.lb_createBy.Size = new System.Drawing.Size(90, 21);
this.lb_createBy.TabIndex = 219;
@@ -749,11 +481,11 @@
// txt_createBy
//
this.txt_createBy.Enabled = false;
- this.txt_createBy.Location = new System.Drawing.Point(638, 14);
+ this.txt_createBy.Location = new System.Drawing.Point(617, 14);
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.Size = new System.Drawing.Size(119, 28);
this.txt_createBy.TabIndex = 219;
//
// gv_createBy
@@ -767,8 +499,8 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 6;
- this.gv_createBy.Width = 94;
+ this.gv_createBy.VisibleIndex = 4;
+ this.gv_createBy.Width = 71;
//
// lb_description
//
@@ -790,25 +522,11 @@
this.txt_description.Size = new System.Drawing.Size(150, 28);
this.txt_description.TabIndex = 217;
//
- // gv_description
- //
- this.gv_description.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_description.AppearanceCell.Options.UseFont = true;
- this.gv_description.Caption = "澶囨敞";
- this.gv_description.FieldName = "description";
- this.gv_description.MinWidth = 50;
- this.gv_description.Name = "gv_description";
- this.gv_description.OptionsColumn.AllowEdit = false;
- this.gv_description.Tag = "query_a.description";
- this.gv_description.Visible = true;
- this.gv_description.VisibleIndex = 5;
- this.gv_description.Width = 94;
- //
// lb_depotName
//
this.lb_depotName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotName.Appearance.Options.UseFont = true;
- this.lb_depotName.Location = new System.Drawing.Point(305, 18);
+ this.lb_depotName.Location = new System.Drawing.Point(284, 18);
this.lb_depotName.Name = "lb_depotName";
this.lb_depotName.Size = new System.Drawing.Size(73, 21);
this.lb_depotName.TabIndex = 216;
@@ -817,7 +535,7 @@
// txt_depotName
//
this.txt_depotName.Enabled = false;
- this.txt_depotName.Location = new System.Drawing.Point(382, 14);
+ this.txt_depotName.Location = new System.Drawing.Point(361, 14);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
@@ -835,7 +553,7 @@
this.gv_depotName.OptionsColumn.AllowEdit = false;
this.gv_depotName.Tag = "query_a.depot_name";
this.gv_depotName.Visible = true;
- this.gv_depotName.VisibleIndex = 4;
+ this.gv_depotName.VisibleIndex = 2;
this.gv_depotName.Width = 150;
//
// lb_depotCode
@@ -869,7 +587,7 @@
this.gv_depotCode.OptionsColumn.AllowEdit = false;
this.gv_depotCode.Tag = "query_a.depot_code";
this.gv_depotCode.Visible = true;
- this.gv_depotCode.VisibleIndex = 3;
+ this.gv_depotCode.VisibleIndex = 1;
this.gv_depotCode.Width = 100;
//
// toolBarMenu1
@@ -882,7 +600,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1266, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
this.toolBarMenu1.xlsOutParameter = null;
@@ -894,7 +612,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(1264, 531);
this.gcMain.TabIndex = 1;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -908,20 +626,20 @@
this.gridView1.ColumnPanelRowHeight = 60;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
- this.gridColumn4,
- this.gv_id,
this.gv_depotCode,
this.gv_depotName,
this.gv_depottype,
- this.gv_description,
this.gv_createBy,
- this.gv_depottypecode,
this.gv_isWy,
this.gv_isNg,
this.gv_zuid,
this.gv_isFkc,
- this.gridColumn3,
- this.gridColumn2});
+ this.gridColumn2,
+ this.gridColumn6,
+ this.gridColumn5,
+ this.gridColumn4,
+ this.gridColumn7,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -941,52 +659,70 @@
this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 250;
//
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "绂佺敤鐘舵��";
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "query_a.zuid";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 9;
+ this.gridColumn2.Width = 52;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "渚涘簲鍟�";
+ this.gridColumn6.FieldName = "SUPPLIER_ID";
+ this.gridColumn6.MinWidth = 60;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Tag = "query_a.SUPPLIER_ID";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 10;
+ this.gridColumn6.Width = 70;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "瀹㈡埛";
+ this.gridColumn5.FieldName = "Client_Id";
+ this.gridColumn5.MinWidth = 60;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Tag = "query_a.Client_Id";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 11;
+ this.gridColumn5.Width = 60;
+ //
// gridColumn4
//
- this.gridColumn4.Caption = "瀹℃牳鐘舵��";
- this.gridColumn4.FieldName = "checkStatus";
- this.gridColumn4.MaxWidth = 50;
- this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.Caption = "閮ㄩ棬";
+ this.gridColumn4.FieldName = "department";
+ this.gridColumn4.MinWidth = 60;
this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.AllowEdit = false;
- this.gridColumn4.UnboundDataType = typeof(bool);
+ this.gridColumn4.Tag = "query_a.department";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 1;
- this.gridColumn4.Width = 50;
+ this.gridColumn4.VisibleIndex = 12;
+ this.gridColumn4.Width = 60;
//
- // gv_id
+ // gridColumn7
//
- this.gv_id.Caption = "浠撳簱ID";
- this.gv_id.FieldName = "depotId";
- this.gv_id.MinWidth = 25;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.depot_Id";
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 2;
- this.gv_id.Width = 94;
+ this.gridColumn7.Caption = "鑱旂郴鐢佃瘽";
+ this.gridColumn7.FieldName = "phone";
+ this.gridColumn7.MinWidth = 60;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Tag = "query_a.Phone";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.Width = 60;
//
// gridColumn3
//
- this.gridColumn3.Caption = "瀹℃牳浜�";
- this.gridColumn3.FieldName = "checkBy";
- this.gridColumn3.MinWidth = 100;
+ this.gridColumn3.Caption = "鍚屾鏃堕棿";
+ this.gridColumn3.FieldName = "lastupdateDate";
+ this.gridColumn3.MinWidth = 180;
this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.Tag = "query_a.lastupdate_date";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 13;
- this.gridColumn3.Width = 100;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "瀹℃牳鏃堕棿";
- this.gridColumn2.FieldName = "checkDate";
- this.gridColumn2.MinWidth = 180;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.OptionsColumn.AllowEdit = false;
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 14;
- this.gridColumn2.Width = 180;
+ this.gridColumn3.VisibleIndex = 14;
+ this.gridColumn3.Width = 180;
//
// xtraTabControl1
//
@@ -994,7 +730,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(1266, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -1005,7 +741,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(1264, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
@@ -1016,7 +752,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1264, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -1025,16 +761,16 @@
this.xtraTabPage2.Controls.Add(this.tabMx);
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1264, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 200);
+ this.tabMx.Location = new System.Drawing.Point(0, 123);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 370);
+ this.tabMx.Size = new System.Drawing.Size(1264, 447);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1044,36 +780,18 @@
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_materialProperti);
- this.panel1.Controls.Add(this.txt_materialProperti);
this.panel1.Controls.Add(this.lb_isFkc);
this.panel1.Controls.Add(this.txt_isFkc);
this.panel1.Controls.Add(this.lb_zuid);
this.panel1.Controls.Add(this.txt_zuid);
- this.panel1.Controls.Add(this.lb_piType);
- this.panel1.Controls.Add(this.txt_piType);
- this.panel1.Controls.Add(this.lb_cwhaddress);
- this.panel1.Controls.Add(this.txt_cwhaddress);
this.panel1.Controls.Add(this.lb_isNg);
this.panel1.Controls.Add(this.txt_isNg);
this.panel1.Controls.Add(this.lb_isWy);
this.panel1.Controls.Add(this.txt_isWy);
- this.panel1.Controls.Add(this.lb_iconType);
- this.panel1.Controls.Add(this.txt_iconType);
- this.panel1.Controls.Add(this.lb_depottypecode);
- this.panel1.Controls.Add(this.txt_depottypecode);
- this.panel1.Controls.Add(this.lb_type2);
- this.panel1.Controls.Add(this.txt_type2);
- this.panel1.Controls.Add(this.lb_type1);
- this.panel1.Controls.Add(this.txt_type1);
- this.panel1.Controls.Add(this.lb_factory);
- this.panel1.Controls.Add(this.txt_factory);
this.panel1.Controls.Add(this.lb_depottype);
this.panel1.Controls.Add(this.txt_depottype);
this.panel1.Controls.Add(this.lb_lastupdateDate);
this.panel1.Controls.Add(this.txt_lastupdateDate);
- this.panel1.Controls.Add(this.lb_lastupdateBy);
- this.panel1.Controls.Add(this.txt_lastupdateBy);
this.panel1.Controls.Add(this.lb_createDate);
this.panel1.Controls.Add(this.txt_createDate);
this.panel1.Controls.Add(this.lb_createBy);
@@ -1088,12 +806,12 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 200);
+ this.panel1.Size = new System.Drawing.Size(1264, 123);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(918, 177);
+ this.labelControl11.Location = new System.Drawing.Point(545, 88);
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);
@@ -1104,7 +822,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(969, 177);
+ this.lbGuid.Location = new System.Drawing.Point(596, 86);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1125,7 +843,7 @@
//
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(1266, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -1135,21 +853,12 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cwhaddress.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
@@ -1181,21 +890,15 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1completenessFlag;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-
- private DevExpress.XtraEditors.LabelControl lb_materialProperti;
- private DevExpress.XtraEditors.TextEdit txt_materialProperti;
private DevExpress.XtraEditors.LabelControl lb_isFkc;
private DevExpress.XtraEditors.TextEdit txt_isFkc;
@@ -1205,12 +908,6 @@
private DevExpress.XtraEditors.TextEdit txt_zuid;
private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
- private DevExpress.XtraEditors.LabelControl lb_piType;
- private DevExpress.XtraEditors.TextEdit txt_piType;
-
- private DevExpress.XtraEditors.LabelControl lb_cwhaddress;
- private DevExpress.XtraEditors.TextEdit txt_cwhaddress;
-
private DevExpress.XtraEditors.LabelControl lb_isNg;
private DevExpress.XtraEditors.TextEdit txt_isNg;
private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
@@ -1219,31 +916,12 @@
private DevExpress.XtraEditors.TextEdit txt_isWy;
private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
- private DevExpress.XtraEditors.LabelControl lb_iconType;
- private DevExpress.XtraEditors.TextEdit txt_iconType;
-
- private DevExpress.XtraEditors.LabelControl lb_depottypecode;
- private DevExpress.XtraEditors.TextEdit txt_depottypecode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode;
-
- private DevExpress.XtraEditors.LabelControl lb_type2;
- private DevExpress.XtraEditors.TextEdit txt_type2;
-
- private DevExpress.XtraEditors.LabelControl lb_type1;
- private DevExpress.XtraEditors.TextEdit txt_type1;
-
- private DevExpress.XtraEditors.LabelControl lb_factory;
- private DevExpress.XtraEditors.TextEdit txt_factory;
-
private DevExpress.XtraEditors.LabelControl lb_depottype;
private DevExpress.XtraEditors.TextEdit txt_depottype;
private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
- private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
private DevExpress.XtraEditors.LabelControl lb_createDate;
private DevExpress.XtraEditors.TextEdit txt_createDate;
@@ -1254,7 +932,6 @@
private DevExpress.XtraEditors.LabelControl lb_description;
private DevExpress.XtraEditors.TextEdit txt_description;
- private DevExpress.XtraGrid.Columns.GridColumn gv_description;
private DevExpress.XtraEditors.LabelControl lb_depotName;
private DevExpress.XtraEditors.TextEdit txt_depotName;
@@ -1265,11 +942,13 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 2cbec65..ccc8345 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -28,10 +28,10 @@
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ //toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ //toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
@@ -205,9 +205,9 @@
DepotSectionCode = row["depotSectionCode"].ToString(),
DepotSectionName = row["DepotSectionName"].ToString(),
Description = row["Description"].ToString(),
- KbQty = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
- DepotSectionNamet = row["depotSectionNamet"].ToString(),
- CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBoole(row["completenessFlag"].ToString()),
+ //KbQty = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
+ // DepotSectionNamet = row["depotSectionNamet"].ToString(),
+ // CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBoole(row["completenessFlag"].ToString()),
});
}
var _obj = new MesDepots
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
deleted file mode 100644
index b77b7fa..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ /dev/null
@@ -1,812 +0,0 @@
-/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
-{
- partial class Frm_MesWorkshop
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1name = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx1isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_departmentid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_departmentcode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_departmentname = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fmanager = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.panel1 = new System.Windows.Forms.Panel();
- this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
- this.lb_checkStatus = new DevExpress.XtraEditors.LabelControl();
- this.lb_checkBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.lb_remark = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.lb_departmentname = new DevExpress.XtraEditors.LabelControl();
- this.txt_departmentname = new DevExpress.XtraEditors.TextEdit();
- this.lb_departmentcode = new DevExpress.XtraEditors.LabelControl();
- this.txt_departmentcode = new DevExpress.XtraEditors.TextEdit();
- this.lb_departmentid = new DevExpress.XtraEditors.LabelControl();
- this.txt_departmentid = new DevExpress.XtraEditors.TextEdit();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- this.xtraTabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- this.SuspendLayout();
- //
- // gvMx1createBy
- //
- this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
- this.gvMx1createBy.Caption = "寤虹珛鑰�";
- this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 50;
- this.gvMx1createBy.Name = "gvMx1createBy";
- this.gvMx1createBy.OptionsColumn.ReadOnly = true;
- this.gvMx1createBy.Tag = "query_a.create_by";
- this.gvMx1createBy.Visible = true;
- this.gvMx1createBy.VisibleIndex = 4;
- this.gvMx1createBy.Width = 94;
- //
- // gvMx1createDate
- //
- this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1createDate.Caption = "寤虹珛鏃堕棿";
- this.gvMx1createDate.FieldName = "createDate";
- this.gvMx1createDate.MinWidth = 180;
- this.gvMx1createDate.Name = "gvMx1createDate";
- this.gvMx1createDate.OptionsColumn.ReadOnly = true;
- this.gvMx1createDate.Tag = "query_a.create_date";
- this.gvMx1createDate.Visible = true;
- this.gvMx1createDate.VisibleIndex = 5;
- this.gvMx1createDate.Width = 180;
- //
- // gvMx1remark
- //
- this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1remark.AppearanceCell.Options.UseFont = true;
- this.gvMx1remark.Caption = "澶囨敞";
- this.gvMx1remark.FieldName = "remark";
- this.gvMx1remark.MinWidth = 50;
- this.gvMx1remark.Name = "gvMx1remark";
- this.gvMx1remark.Tag = "edit";
- this.gvMx1remark.Visible = true;
- this.gvMx1remark.VisibleIndex = 2;
- this.gvMx1remark.Width = 94;
- //
- // gvMx1name
- //
- this.gvMx1name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1name.AppearanceCell.Options.UseFont = true;
- this.gvMx1name.Caption = "浜х嚎鍚嶇О";
- this.gvMx1name.FieldName = "name";
- this.gvMx1name.MinWidth = 50;
- this.gvMx1name.Name = "gvMx1name";
- this.gvMx1name.Tag = "edit";
- this.gvMx1name.Visible = true;
- this.gvMx1name.VisibleIndex = 1;
- this.gvMx1name.Width = 94;
- //
- // gvMx1lineNo
- //
- this.gvMx1lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lineNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1lineNo.Caption = "浜х嚎缂栧彿";
- this.gvMx1lineNo.FieldName = "lineNo";
- this.gvMx1lineNo.MinWidth = 50;
- this.gvMx1lineNo.Name = "gvMx1lineNo";
- this.gvMx1lineNo.Tag = "edit";
- this.gvMx1lineNo.Visible = true;
- this.gvMx1lineNo.VisibleIndex = 0;
- this.gvMx1lineNo.Width = 94;
- //
- // gvMx1guid
- //
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "涓婚敭涓嶈兘绉诲嚭";
- this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
- this.gvMx1guid.Name = "gvMx1guid";
- this.gvMx1guid.OptionsColumn.ReadOnly = true;
- this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
- //
- // tabMxPage1
- //
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1279, 450);
- this.tabMxPage1.Text = "浜х嚎鍒楄〃";
- //
- // gcMx1
- //
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
- this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Name = "gcMx1";
- this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1,
- this.repositoryItemCheckEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1279, 450);
- this.gcMx1.TabIndex = 0;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
- //
- // gvMx1
- //
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1guid,
- this.gvMx1lineNo,
- this.gvMx1name,
- this.gvMx1remark,
- this.gvMx1isStatus,
- this.gvMx1createBy,
- this.gvMx1createDate,
- this.gvMxDel});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
- //
- // gvMx1isStatus
- //
- this.gvMx1isStatus.Caption = "鐘舵��";
- this.gvMx1isStatus.ColumnEdit = this.repositoryItemCheckEdit1;
- this.gvMx1isStatus.FieldName = "isStatus";
- this.gvMx1isStatus.MinWidth = 25;
- this.gvMx1isStatus.Name = "gvMx1isStatus";
- this.gvMx1isStatus.Tag = "edit";
- this.gvMx1isStatus.UnboundDataType = typeof(bool);
- this.gvMx1isStatus.Visible = true;
- this.gvMx1isStatus.VisibleIndex = 3;
- this.gvMx1isStatus.Width = 94;
- //
- // repositoryItemCheckEdit1
- //
- this.repositoryItemCheckEdit1.AutoHeight = false;
- this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
- //
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 6;
- this.gvMxDel.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // toolBarMenu1
- //
- this.toolBarMenu1.chkParameter = "SYS_DEPARTMENT,check_date,check_status,check_by";
- this.toolBarMenu1.currentAction = 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(1283, 80);
- this.toolBarMenu1.TabIndex = 0;
- this.toolBarMenu1.xlsInService = null;
- this.toolBarMenu1.xlsOutParameter = "xlsOut_workline{}";
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- 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(1283, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1281, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1281, 531);
- this.gcMain.TabIndex = 4;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 50;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_factory,
- this.gridColumn3,
- this.gv_departmentid,
- this.gv_departmentcode,
- this.gv_departmentname,
- this.gridColumn2,
- this.gridColumn1,
- this.gv_depextr4,
- this.gv_fmanager,
- this.gv_remark,
- this.gv_parentId});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsCustomization.AllowFilter = false;
- this.gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
- this.gridView1.OptionsFilter.AllowFilterEditor = false;
- this.gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // 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.FieldName = "fSubsidiary";
- this.gv_factory.MinWidth = 250;
- this.gv_factory.Name = "gv_factory";
- this.gv_factory.OptionsColumn.AllowEdit = false;
- this.gv_factory.OptionsFilter.AllowFilterModeChanging = DevExpress.Utils.DefaultBoolean.False;
- this.gv_factory.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_factory.Tag = "org.fnamber";
- this.gv_factory.Visible = true;
- this.gv_factory.VisibleIndex = 0;
- this.gv_factory.Width = 250;
- //
- // gv_departmentid
- //
- this.gv_departmentid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_departmentid.AppearanceCell.Options.UseFont = true;
- this.gv_departmentid.Caption = "閮ㄩ棬ID";
- this.gv_departmentid.FieldName = "departmentid";
- this.gv_departmentid.MinWidth = 50;
- this.gv_departmentid.Name = "gv_departmentid";
- this.gv_departmentid.OptionsColumn.AllowEdit = false;
- this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_departmentid.Tag = "query_a.departmentid";
- this.gv_departmentid.Visible = true;
- this.gv_departmentid.VisibleIndex = 2;
- this.gv_departmentid.Width = 94;
- //
- // gv_departmentcode
- //
- this.gv_departmentcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
- this.gv_departmentcode.Caption = "閮ㄩ棬缂栧彿";
- this.gv_departmentcode.FieldName = "departmentcode";
- this.gv_departmentcode.MinWidth = 80;
- this.gv_departmentcode.Name = "gv_departmentcode";
- this.gv_departmentcode.OptionsColumn.AllowEdit = false;
- this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_departmentcode.Tag = "query_a.departmentcode";
- this.gv_departmentcode.Visible = true;
- this.gv_departmentcode.VisibleIndex = 3;
- this.gv_departmentcode.Width = 94;
- //
- // gv_departmentname
- //
- this.gv_departmentname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_departmentname.AppearanceCell.Options.UseFont = true;
- this.gv_departmentname.Caption = "閮ㄩ棬鍚嶇О";
- this.gv_departmentname.FieldName = "departmentname";
- this.gv_departmentname.MinWidth = 150;
- this.gv_departmentname.Name = "gv_departmentname";
- this.gv_departmentname.OptionsColumn.AllowEdit = false;
- this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_departmentname.Tag = "query_a.departmentname";
- this.gv_departmentname.Visible = true;
- this.gv_departmentname.VisibleIndex = 4;
- this.gv_departmentname.Width = 150;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "瀹℃牳鐘舵��";
- this.gridColumn3.FieldName = "checkStatus";
- this.gridColumn3.MaxWidth = 50;
- this.gridColumn3.MinWidth = 50;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
- this.gridColumn3.Width = 50;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "瀹℃牳浜�";
- this.gridColumn2.FieldName = "checkBy";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 94;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "瀹℃牳鏃ユ湡";
- this.gridColumn1.FieldName = "checkDate";
- this.gridColumn1.MinWidth = 120;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 6;
- this.gridColumn1.Width = 120;
- //
- // gv_depextr4
- //
- this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_depextr4.AppearanceCell.Options.UseFont = true;
- this.gv_depextr4.Caption = "A鍚敤B绂佺敤";
- this.gv_depextr4.FieldName = "depextr4";
- this.gv_depextr4.MinWidth = 50;
- this.gv_depextr4.Name = "gv_depextr4";
- this.gv_depextr4.OptionsColumn.AllowEdit = false;
- this.gv_depextr4.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_depextr4.Tag = "query_a.depextr4";
- this.gv_depextr4.Visible = true;
- this.gv_depextr4.VisibleIndex = 7;
- this.gv_depextr4.Width = 94;
- //
- // gv_fmanager
- //
- this.gv_fmanager.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fmanager.AppearanceCell.Options.UseFont = true;
- this.gv_fmanager.Caption = "閮ㄩ棬缁忕悊";
- this.gv_fmanager.FieldName = "fmanager";
- this.gv_fmanager.MinWidth = 50;
- this.gv_fmanager.Name = "gv_fmanager";
- this.gv_fmanager.OptionsColumn.AllowEdit = false;
- this.gv_fmanager.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_fmanager.Tag = "query_a.fmanager";
- this.gv_fmanager.Visible = true;
- this.gv_fmanager.VisibleIndex = 8;
- this.gv_fmanager.Width = 94;
- //
- // gv_remark
- //
- this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
- this.gv_remark.Name = "gv_remark";
- this.gv_remark.OptionsColumn.AllowEdit = false;
- this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_remark.Tag = "query_a.remark";
- this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
- this.gv_remark.Width = 94;
- //
- // gv_parentId
- //
- this.gv_parentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_parentId.AppearanceCell.Options.UseFont = true;
- this.gv_parentId.Caption = "涓婄骇閮ㄩ棬";
- this.gv_parentId.FieldName = "fParentID";
- this.gv_parentId.MinWidth = 150;
- this.gv_parentId.Name = "gv_parentId";
- this.gv_parentId.OptionsColumn.AllowEdit = false;
- this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
- this.gv_parentId.Tag = "query_c.Departmentname";
- this.gv_parentId.Visible = true;
- this.gv_parentId.VisibleIndex = 10;
- this.gv_parentId.Width = 150;
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1281, 39);
- this.pageBar1.TabIndex = 3;
- this.pageBar1.TotalPages = 0;
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.Controls.Add(this.tabMx);
- this.xtraTabPage2.Controls.Add(this.panel1);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1281, 570);
- this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
- //
- // tabMx
- //
- this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 88);
- this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1281, 482);
- this.tabMx.TabIndex = 2;
- this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
- //
- // panel1
- //
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.txt_checkStatus);
- this.panel1.Controls.Add(this.lb_checkStatus);
- this.panel1.Controls.Add(this.lb_checkBy);
- this.panel1.Controls.Add(this.txt_checkBy);
- this.panel1.Controls.Add(this.lb_checkDate);
- this.panel1.Controls.Add(this.txt_checkDate);
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_remark);
- this.panel1.Controls.Add(this.txt_remark);
- this.panel1.Controls.Add(this.lb_departmentname);
- this.panel1.Controls.Add(this.txt_departmentname);
- this.panel1.Controls.Add(this.lb_departmentcode);
- this.panel1.Controls.Add(this.txt_departmentcode);
- this.panel1.Controls.Add(this.lb_departmentid);
- this.panel1.Controls.Add(this.txt_departmentid);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1281, 88);
- this.panel1.TabIndex = 1;
- //
- // txt_checkStatus
- //
- this.txt_checkStatus.Enabled = false;
- this.txt_checkStatus.Location = new System.Drawing.Point(845, 56);
- this.txt_checkStatus.Name = "txt_checkStatus";
- this.txt_checkStatus.Properties.Caption = "";
- this.txt_checkStatus.Size = new System.Drawing.Size(94, 24);
- this.txt_checkStatus.TabIndex = 321;
- //
- // lb_checkStatus
- //
- this.lb_checkStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkStatus.Appearance.Options.UseFont = true;
- this.lb_checkStatus.Location = new System.Drawing.Point(771, 58);
- this.lb_checkStatus.Name = "lb_checkStatus";
- this.lb_checkStatus.Size = new System.Drawing.Size(68, 21);
- this.lb_checkStatus.TabIndex = 320;
- this.lb_checkStatus.Text = "瀹℃牳鐘舵��";
- //
- // lb_checkBy
- //
- this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkBy.Appearance.Options.UseFont = true;
- this.lb_checkBy.Location = new System.Drawing.Point(546, 19);
- this.lb_checkBy.Name = "lb_checkBy";
- this.lb_checkBy.Size = new System.Drawing.Size(51, 21);
- this.lb_checkBy.TabIndex = 318;
- this.lb_checkBy.Text = "瀹℃牳浜�";
- //
- // txt_checkBy
- //
- this.txt_checkBy.Enabled = false;
- this.txt_checkBy.Location = new System.Drawing.Point(615, 15);
- this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_checkBy.Size = new System.Drawing.Size(150, 28);
- this.txt_checkBy.TabIndex = 319;
- //
- // lb_checkDate
- //
- this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_checkDate.Appearance.Options.UseFont = true;
- this.lb_checkDate.Location = new System.Drawing.Point(529, 58);
- this.lb_checkDate.Name = "lb_checkDate";
- this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
- this.lb_checkDate.TabIndex = 316;
- this.lb_checkDate.Text = "瀹℃牳鏃堕棿";
- //
- // txt_checkDate
- //
- this.txt_checkDate.Enabled = false;
- this.txt_checkDate.Location = new System.Drawing.Point(615, 54);
- this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
- this.txt_checkDate.TabIndex = 317;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(857, 19);
- 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 = 293;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(908, 19);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 292;
- this.lbGuid.Visible = false;
- //
- // 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(315, 58);
- this.lb_remark.Name = "lb_remark";
- this.lb_remark.Size = new System.Drawing.Size(39, 21);
- this.lb_remark.TabIndex = 315;
- this.lb_remark.Text = "澶囨敞 ";
- //
- // txt_remark
- //
- this.txt_remark.Enabled = false;
- this.txt_remark.Location = new System.Drawing.Point(360, 54);
- this.txt_remark.Name = "txt_remark";
- this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(150, 28);
- this.txt_remark.TabIndex = 314;
- //
- // lb_departmentname
- //
- this.lb_departmentname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_departmentname.Appearance.Options.UseFont = true;
- this.lb_departmentname.Location = new System.Drawing.Point(39, 57);
- this.lb_departmentname.Name = "lb_departmentname";
- this.lb_departmentname.Size = new System.Drawing.Size(73, 21);
- this.lb_departmentname.TabIndex = 299;
- this.lb_departmentname.Text = "閮ㄩ棬鍚嶇О ";
- //
- // txt_departmentname
- //
- this.txt_departmentname.Enabled = false;
- this.txt_departmentname.Location = new System.Drawing.Point(118, 53);
- this.txt_departmentname.Name = "txt_departmentname";
- this.txt_departmentname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_departmentname.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentname.Size = new System.Drawing.Size(150, 28);
- this.txt_departmentname.TabIndex = 298;
- //
- // lb_departmentcode
- //
- this.lb_departmentcode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_departmentcode.Appearance.Options.UseFont = true;
- this.lb_departmentcode.Location = new System.Drawing.Point(281, 19);
- this.lb_departmentcode.Name = "lb_departmentcode";
- this.lb_departmentcode.Size = new System.Drawing.Size(73, 21);
- this.lb_departmentcode.TabIndex = 297;
- this.lb_departmentcode.Text = "閮ㄩ棬缂栧彿 ";
- //
- // txt_departmentcode
- //
- this.txt_departmentcode.Enabled = false;
- this.txt_departmentcode.Location = new System.Drawing.Point(360, 15);
- this.txt_departmentcode.Name = "txt_departmentcode";
- this.txt_departmentcode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_departmentcode.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentcode.Size = new System.Drawing.Size(150, 28);
- this.txt_departmentcode.TabIndex = 296;
- //
- // lb_departmentid
- //
- this.lb_departmentid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_departmentid.Appearance.Options.UseFont = true;
- this.lb_departmentid.Location = new System.Drawing.Point(55, 19);
- this.lb_departmentid.Name = "lb_departmentid";
- this.lb_departmentid.Size = new System.Drawing.Size(57, 21);
- this.lb_departmentid.TabIndex = 294;
- this.lb_departmentid.Text = "閮ㄩ棬ID ";
- //
- // txt_departmentid
- //
- this.txt_departmentid.Enabled = false;
- this.txt_departmentid.Location = new System.Drawing.Point(118, 15);
- this.txt_departmentid.Name = "txt_departmentid";
- this.txt_departmentid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_departmentid.Properties.Appearance.Options.UseFont = true;
- this.txt_departmentid.Size = new System.Drawing.Size(150, 28);
- this.txt_departmentid.TabIndex = 295;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1034, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 5;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
- // Frm_MesWorkshop
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1283, 682);
- this.Controls.Add(this.picCheckBox);
- this.Controls.Add(this.xtraTabControl1);
- this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_MesWorkshop";
- this.Text = "绾夸綋淇℃伅";
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- this.xtraTabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- this.ResumeLayout(false);
-
- }
- #endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1name;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1isStatus;
- private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
- private System.Windows.Forms.PictureBox picCheckBox;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
- private DevExpress.XtraGrid.Columns.GridColumn gv_departmentid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_departmentcode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_departmentname;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depextr4;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmanager;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl lb_remark;
- private DevExpress.XtraEditors.TextEdit txt_remark;
- private DevExpress.XtraEditors.LabelControl lb_departmentname;
- private DevExpress.XtraEditors.TextEdit txt_departmentname;
- private DevExpress.XtraEditors.LabelControl lb_departmentcode;
- private DevExpress.XtraEditors.TextEdit txt_departmentcode;
- private DevExpress.XtraEditors.LabelControl lb_departmentid;
- private DevExpress.XtraEditors.TextEdit txt_departmentid;
- private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
- private DevExpress.XtraEditors.LabelControl lb_checkStatus;
- private DevExpress.XtraEditors.LabelControl lb_checkBy;
- private DevExpress.XtraEditors.TextEdit txt_checkBy;
- private DevExpress.XtraEditors.LabelControl lb_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
deleted file mode 100644
index 14b4257..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ /dev/null
@@ -1,421 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Gs.DevApp.DevFrm
-{
- public partial class Frm_MesWorkshop : XtraForm
- {
- private List<FilterEntity> _filterList = new List<FilterEntity>();
- private readonly string _webServiceName = "SysDepartmentManager/";
- public Frm_MesWorkshop()
- {
- InitializeComponent();
- toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
- Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
- {
- getModel(value);
- }, (value) =>
- {
- getPageList(this.pageBar1.CurrentPage);
- });
- getPageList(1);
- pageBar1.PagerEvent += PageBar1_PagerEvent;
- }
-
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
- Task.Delay(100);
- getPageList(1);
- }
-
-
- /// <summary>
- /// 鍒嗛〉浜嬩欢
- /// </summary>
- /// <param name="curPage"></param>
- /// <param name="pageSize"></param>
- private void PageBar1_PagerEvent(int curPage, int pageSize)
- {
- getPageList(curPage);
- }
-
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
-
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
- }
-
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
- {
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
- }
- }
-
- /// <summary>
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.create_date",
- "asc", "", _sbSqlWhere.ToString());
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- if (dt.Rows.Count > 0)
- {
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- }
- else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
- }
- private void getModel(string strGuid)
- {
- bool isEdit = false;
- if (toolBarMenu1.currentAction == "add") return;
- if (toolBarMenu1.currentAction == "edit") isEdit = true;
- if (string.IsNullOrEmpty(strGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- var _obj = new
- {
- guid = strGuid //涓诲缓
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "GetModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- var dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
- var gridViews = new List<GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit,
- gridViews);
- var _job = JObject.Parse(strJson);
- var array = new JArray();
- var d = _job["rtnData"]["list"];
- foreach (var a in d) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
- if (dt.Rows.Count > 0)
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- }
- else
- {
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
- }
- else
- {
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- _toolCk(0);
- }
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- }
- /// <summary>
- /// 瀹℃牳浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
- {
- _toolCk(1);
- }
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- toolBarMenu1.currentAction = "edit";
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_departmentcode, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- {
- getModel(rowGuid);
- }
- else {
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
- }
- }
-
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_departmentcode.Text.Trim()))
- {
- MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
- txt_departmentcode.Focus();
- return;
- }
- gvMx1.CloseEditor();
- gvMx1.UpdateCurrentRow();
- var lst = new List<dynamic>();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null)
- lst.Add(new
- {
- guid = UtilityHelper.ToGuid(row["guid"].ToString()),
- lineNo = row["lineNo"].ToString(),
- name = row["name"].ToString(),
- remark = row["remark"].ToString(),
- isStatus = row["isStatus"].ToString()
- });
- }
-
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- list = lst
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- var gridViews = new List<GridView>();
- gridViews.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false,
- gridViews);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- private void repositoryItemButtonEdit1_ButtonClick(object sender,
- ButtonPressedEventArgs e)
- {
- gvMx1.CloseEditor();
- gvMx1.UpdateCurrentRow();
- var rowhandle = gvMx1.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx1.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- if (string.IsNullOrEmpty(mxGuid))
- {
- gvMx1.DeleteRow(rowhandle);
- return;
- }
- var strJson = "";
- var lst = new List<string>();
- lst.Add(mxGuid);
- try
- {
- strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelMx",
- JsonConvert.SerializeObject(lst));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-
-
- /// <summary>
- /// 宸ュ叿鏉′簨浠�
- /// </summary>
- /// <param name="inFieldValue"></param>
- private void _toolCk(int _inFieldValue)
- {
- string strMsg = "";
- switch (_inFieldValue)
- {
- case 1:
- strMsg = "瀹℃牳";
- break;
- case 0:
- strMsg = "鍙嶅鏍�";
- break;
- };
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_departmentname, gridView1, "departmentname");
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
- return;
-
- var _obj = new
- {
- guid = rowGuid,
- ckValue = _inFieldValue,
- parameter = "SYS_DEPARTMENT,check_date,check_status,check_by"
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
- getPageList(this.pageBar1.CurrentPage);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.resx
deleted file mode 100644
index d58980a..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 544ba6e..12dc251 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -33,22 +33,10 @@
this.lb_fforbidStatus = new DevExpress.XtraEditors.LabelControl();
this.txt_fforbidStatus = new DevExpress.XtraEditors.TextEdit();
this.gv_fforbidStatus = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_workMk = new DevExpress.XtraEditors.LabelControl();
- this.txt_workMk = new DevExpress.XtraEditors.TextEdit();
- this.gv_workMk = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_lineNo = new DevExpress.XtraEditors.LabelControl();
- this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_memo = new DevExpress.XtraEditors.LabelControl();
this.txt_memo = new DevExpress.XtraEditors.TextEdit();
this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -78,11 +66,11 @@
this.gv_staffNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -91,13 +79,8 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidStatus.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workMk.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_phoneNumber.Properties)).BeginInit();
@@ -140,87 +123,21 @@
//
this.gv_fforbidStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fforbidStatus.AppearanceCell.Options.UseFont = true;
- this.gv_fforbidStatus.Caption = "鏄惁绂佺敤";
+ this.gv_fforbidStatus.Caption = "绂佺敤鐘舵��";
this.gv_fforbidStatus.FieldName = "fforbidStatus";
this.gv_fforbidStatus.MinWidth = 50;
this.gv_fforbidStatus.Name = "gv_fforbidStatus";
this.gv_fforbidStatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidStatus.Tag = "query_a.fforbid_status";
this.gv_fforbidStatus.Visible = true;
- this.gv_fforbidStatus.VisibleIndex = 13;
- this.gv_fforbidStatus.Width = 94;
- //
- // lb_workMk
- //
- this.lb_workMk.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_workMk.Appearance.Options.UseFont = true;
- this.lb_workMk.Location = new System.Drawing.Point(535, 184);
- this.lb_workMk.Name = "lb_workMk";
- this.lb_workMk.Size = new System.Drawing.Size(107, 21);
- this.lb_workMk.TabIndex = 298;
- this.lb_workMk.Text = "鐢熶骇鍛樺伐鏍囪瘑 ";
- //
- // txt_workMk
- //
- this.txt_workMk.Location = new System.Drawing.Point(653, 180);
- this.txt_workMk.Name = "txt_workMk";
- this.txt_workMk.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_workMk.Properties.Appearance.Options.UseFont = true;
- this.txt_workMk.Size = new System.Drawing.Size(150, 28);
- this.txt_workMk.TabIndex = 298;
- //
- // gv_workMk
- //
- this.gv_workMk.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_workMk.AppearanceCell.Options.UseFont = true;
- this.gv_workMk.Caption = "鐢熶骇鍛樺伐鏍囪瘑";
- this.gv_workMk.FieldName = "workMk";
- this.gv_workMk.MinWidth = 50;
- this.gv_workMk.Name = "gv_workMk";
- this.gv_workMk.OptionsColumn.AllowEdit = false;
- this.gv_workMk.Tag = "query_a.work_mk";
- this.gv_workMk.Visible = true;
- this.gv_workMk.VisibleIndex = 12;
- this.gv_workMk.Width = 94;
- //
- // lb_lineNo
- //
- this.lb_lineNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lineNo.Appearance.Options.UseFont = true;
- this.lb_lineNo.Location = new System.Drawing.Point(315, 183);
- this.lb_lineNo.Name = "lb_lineNo";
- this.lb_lineNo.Size = new System.Drawing.Size(56, 21);
- this.lb_lineNo.TabIndex = 291;
- this.lb_lineNo.Text = "鐢熶骇绾� ";
- //
- // txt_lineNo
- //
- this.txt_lineNo.Location = new System.Drawing.Point(377, 179);
- this.txt_lineNo.Name = "txt_lineNo";
- this.txt_lineNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lineNo.Size = new System.Drawing.Size(150, 28);
- this.txt_lineNo.TabIndex = 291;
- //
- // gv_lineNo
- //
- this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lineNo.AppearanceCell.Options.UseFont = true;
- this.gv_lineNo.Caption = "鐢熶骇绾�";
- this.gv_lineNo.FieldName = "lineNo";
- this.gv_lineNo.MinWidth = 50;
- this.gv_lineNo.Name = "gv_lineNo";
- this.gv_lineNo.OptionsColumn.AllowEdit = false;
- this.gv_lineNo.Tag = "query_a.line_no";
- this.gv_lineNo.Visible = true;
- this.gv_lineNo.VisibleIndex = 11;
- this.gv_lineNo.Width = 94;
+ this.gv_fforbidStatus.VisibleIndex = 10;
+ this.gv_fforbidStatus.Width = 50;
//
// lb_memo
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(66, 183);
+ this.lb_memo.Location = new System.Drawing.Point(66, 150);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(39, 21);
this.lb_memo.TabIndex = 285;
@@ -228,7 +145,7 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(113, 179);
+ this.txt_memo.Location = new System.Drawing.Point(113, 146);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
@@ -239,83 +156,26 @@
//
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(569, 150);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(569, 121);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
this.lb_lastupdateDate.TabIndex = 280;
- this.lb_lastupdateDate.Text = "鏇存柊鏃堕棿 ";
+ this.lb_lastupdateDate.Text = "鍚屾鏃堕棿 ";
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(653, 146);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(653, 117);
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.Size = new System.Drawing.Size(157, 28);
this.txt_lastupdateDate.TabIndex = 280;
- //
- // 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(586, 118);
- this.lb_lastupdateBy.Name = "lb_lastupdateBy";
- this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21);
- this.lb_lastupdateBy.TabIndex = 273;
- this.lb_lastupdateBy.Text = "鏇存柊浜� ";
- //
- // txt_lastupdateBy
- //
- this.txt_lastupdateBy.Location = new System.Drawing.Point(653, 114);
- 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 = 273;
- //
- // 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(298, 150);
- this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(73, 21);
- this.lb_createDate.TabIndex = 267;
- this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
- //
- // txt_createDate
- //
- this.txt_createDate.Location = new System.Drawing.Point(377, 146);
- 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 = 267;
- //
- // 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(315, 118);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(56, 21);
- this.lb_createBy.TabIndex = 262;
- this.lb_createBy.Text = "鍒涘缓浜� ";
- //
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(377, 114);
- 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 = 262;
//
// 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(603, 84);
+ this.lb_remark.Location = new System.Drawing.Point(330, 118);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 235;
@@ -323,7 +183,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(653, 80);
+ this.txt_remark.Location = new System.Drawing.Point(377, 114);
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;
@@ -341,14 +201,14 @@
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 = 9;
this.gv_remark.Width = 94;
//
// lb_startDate
//
this.lb_startDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_startDate.Appearance.Options.UseFont = true;
- this.lb_startDate.Location = new System.Drawing.Point(264, 84);
+ this.lb_startDate.Location = new System.Drawing.Point(535, 84);
this.lb_startDate.Name = "lb_startDate";
this.lb_startDate.Size = new System.Drawing.Size(107, 21);
this.lb_startDate.TabIndex = 231;
@@ -356,11 +216,11 @@
//
// txt_startDate
//
- this.txt_startDate.Location = new System.Drawing.Point(377, 80);
+ this.txt_startDate.Location = new System.Drawing.Point(653, 80);
this.txt_startDate.Name = "txt_startDate";
this.txt_startDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_startDate.Properties.Appearance.Options.UseFont = true;
- this.txt_startDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_startDate.Size = new System.Drawing.Size(157, 28);
this.txt_startDate.TabIndex = 231;
//
// gv_startDate
@@ -374,7 +234,7 @@
this.gv_startDate.OptionsColumn.AllowEdit = false;
this.gv_startDate.Tag = "query_a.start_date";
this.gv_startDate.Visible = true;
- this.gv_startDate.VisibleIndex = 9;
+ this.gv_startDate.VisibleIndex = 8;
this.gv_startDate.Width = 180;
//
// lb_phoneNumber
@@ -407,14 +267,14 @@
this.gv_phoneNumber.OptionsColumn.AllowEdit = false;
this.gv_phoneNumber.Tag = "query_a.phone_number";
this.gv_phoneNumber.Visible = true;
- this.gv_phoneNumber.VisibleIndex = 8;
+ this.gv_phoneNumber.VisibleIndex = 7;
this.gv_phoneNumber.Width = 94;
//
// lb_positionName
//
this.lb_positionName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_positionName.Appearance.Options.UseFont = true;
- this.lb_positionName.Location = new System.Drawing.Point(32, 150);
+ this.lb_positionName.Location = new System.Drawing.Point(296, 84);
this.lb_positionName.Name = "lb_positionName";
this.lb_positionName.Size = new System.Drawing.Size(73, 21);
this.lb_positionName.TabIndex = 226;
@@ -422,7 +282,7 @@
//
// txt_positionName
//
- this.txt_positionName.Location = new System.Drawing.Point(113, 146);
+ this.txt_positionName.Location = new System.Drawing.Point(377, 80);
this.txt_positionName.Name = "txt_positionName";
this.txt_positionName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_positionName.Properties.Appearance.Options.UseFont = true;
@@ -440,7 +300,7 @@
this.gv_positionName.OptionsColumn.AllowEdit = false;
this.gv_positionName.Tag = "query_a.position_name";
this.gv_positionName.Visible = true;
- this.gv_positionName.VisibleIndex = 7;
+ this.gv_positionName.VisibleIndex = 6;
this.gv_positionName.Width = 94;
//
// lb_positionCode
@@ -459,7 +319,7 @@
this.txt_positionCode.Name = "txt_positionCode";
this.txt_positionCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_positionCode.Properties.Appearance.Options.UseFont = true;
- this.txt_positionCode.Size = new System.Drawing.Size(150, 28);
+ this.txt_positionCode.Size = new System.Drawing.Size(157, 28);
this.txt_positionCode.TabIndex = 222;
//
// gv_positionCode
@@ -473,7 +333,7 @@
this.gv_positionCode.OptionsColumn.AllowEdit = false;
this.gv_positionCode.Tag = "query_a.position_code";
this.gv_positionCode.Visible = true;
- this.gv_positionCode.VisibleIndex = 6;
+ this.gv_positionCode.VisibleIndex = 5;
this.gv_positionCode.Width = 94;
//
// lb_departmentName
@@ -506,7 +366,7 @@
this.gv_departmentName.OptionsColumn.AllowEdit = false;
this.gv_departmentName.Tag = "query_a.department_name";
this.gv_departmentName.Visible = true;
- this.gv_departmentName.VisibleIndex = 5;
+ this.gv_departmentName.VisibleIndex = 4;
this.gv_departmentName.Width = 94;
//
// lb_departmentNo
@@ -539,7 +399,7 @@
this.gv_departmentNo.OptionsColumn.AllowEdit = false;
this.gv_departmentNo.Tag = "query_a.department_no";
this.gv_departmentNo.Visible = true;
- this.gv_departmentNo.VisibleIndex = 4;
+ this.gv_departmentNo.VisibleIndex = 3;
this.gv_departmentNo.Width = 94;
//
// lb_staffName
@@ -558,7 +418,7 @@
this.txt_staffName.Name = "txt_staffName";
this.txt_staffName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_staffName.Properties.Appearance.Options.UseFont = true;
- this.txt_staffName.Size = new System.Drawing.Size(150, 28);
+ this.txt_staffName.Size = new System.Drawing.Size(157, 28);
this.txt_staffName.TabIndex = 216;
//
// gv_staffName
@@ -572,7 +432,7 @@
this.gv_staffName.OptionsColumn.AllowEdit = false;
this.gv_staffName.Tag = "query_a.staff_name";
this.gv_staffName.Visible = true;
- this.gv_staffName.VisibleIndex = 3;
+ this.gv_staffName.VisibleIndex = 2;
this.gv_staffName.Width = 94;
//
// lb_staffNo
@@ -605,7 +465,7 @@
this.gv_staffNo.OptionsColumn.AllowEdit = false;
this.gv_staffNo.Tag = "query_a.staff_no";
this.gv_staffNo.Visible = true;
- this.gv_staffNo.VisibleIndex = 2;
+ this.gv_staffNo.VisibleIndex = 1;
this.gv_staffNo.Width = 94;
//
// lb_id
@@ -626,20 +486,6 @@
this.txt_id.Properties.Appearance.Options.UseFont = true;
this.txt_id.Size = new System.Drawing.Size(150, 28);
this.txt_id.TabIndex = 211;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "鍛樺伐ID";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 94;
//
// toolBarMenu1
//
@@ -670,11 +516,13 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
- this.gv_id,
this.gv_staffNo,
this.gv_staffName,
this.gv_departmentNo,
@@ -684,9 +532,8 @@
this.gv_phoneNumber,
this.gv_startDate,
this.gv_remark,
- this.gv_lineNo,
- this.gv_workMk,
- this.gv_fforbidStatus});
+ this.gv_fforbidStatus,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -705,6 +552,17 @@
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 250;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍚屾鏃堕棿";
+ this.gridColumn2.FieldName = "lastupdateDate";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "query_a.lastupdate_date";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 11;
+ this.gridColumn2.Width = 180;
//
// xtraTabControl1
//
@@ -752,20 +610,10 @@
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fforbidStatus);
this.panel1.Controls.Add(this.txt_fforbidStatus);
- this.panel1.Controls.Add(this.lb_workMk);
- this.panel1.Controls.Add(this.txt_workMk);
- this.panel1.Controls.Add(this.lb_lineNo);
- this.panel1.Controls.Add(this.txt_lineNo);
this.panel1.Controls.Add(this.lb_memo);
this.panel1.Controls.Add(this.txt_memo);
this.panel1.Controls.Add(this.lb_lastupdateDate);
this.panel1.Controls.Add(this.txt_lastupdateDate);
- this.panel1.Controls.Add(this.lb_lastupdateBy);
- this.panel1.Controls.Add(this.txt_lastupdateBy);
- this.panel1.Controls.Add(this.lb_createDate);
- this.panel1.Controls.Add(this.txt_createDate);
- this.panel1.Controls.Add(this.lb_createBy);
- this.panel1.Controls.Add(this.txt_createBy);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
this.panel1.Controls.Add(this.lb_startDate);
@@ -789,12 +637,12 @@
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(856, 302);
+ this.panel1.Size = new System.Drawing.Size(830, 228);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(66, 253);
+ this.labelControl11.Location = new System.Drawing.Point(324, 156);
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);
@@ -805,7 +653,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(117, 253);
+ this.lbGuid.Location = new System.Drawing.Point(375, 156);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -821,13 +669,8 @@
this.Name = "Frm_Staff";
this.Text = "鍛樺伐淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidStatus.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_workMk.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_phoneNumber.Properties)).EndInit();
@@ -865,28 +708,11 @@
private DevExpress.XtraEditors.TextEdit txt_fforbidStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidStatus;
- private DevExpress.XtraEditors.LabelControl lb_workMk;
- private DevExpress.XtraEditors.TextEdit txt_workMk;
- private DevExpress.XtraGrid.Columns.GridColumn gv_workMk;
-
- private DevExpress.XtraEditors.LabelControl lb_lineNo;
- private DevExpress.XtraEditors.TextEdit txt_lineNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
-
private DevExpress.XtraEditors.LabelControl lb_memo;
private DevExpress.XtraEditors.TextEdit txt_memo;
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
- private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-
- private DevExpress.XtraEditors.LabelControl lb_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createDate;
-
- private DevExpress.XtraEditors.LabelControl lb_createBy;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -926,7 +752,7 @@
private DevExpress.XtraEditors.LabelControl lb_id;
private DevExpress.XtraEditors.TextEdit txt_id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ 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 b0f5e38..84a96ce 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -51,7 +51,6 @@
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_telfx = new DevExpress.XtraEditors.LabelControl();
this.txt_telfx = new DevExpress.XtraEditors.TextEdit();
this.lb_telf1 = new DevExpress.XtraEditors.LabelControl();
@@ -70,7 +69,6 @@
this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -131,14 +129,14 @@
//
this.gv_fforbidstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fforbidstatus.AppearanceCell.Options.UseFont = true;
- this.gv_fforbidstatus.Caption = "鐘舵��";
+ this.gv_fforbidstatus.Caption = "绂佺敤鐘舵��";
this.gv_fforbidstatus.FieldName = "fforbidstatus";
this.gv_fforbidstatus.MinWidth = 50;
this.gv_fforbidstatus.Name = "gv_fforbidstatus";
this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 8;
+ this.gv_fforbidstatus.VisibleIndex = 7;
this.gv_fforbidstatus.Width = 50;
//
// lb_fstaffid
@@ -171,7 +169,7 @@
this.gv_fstaffid.OptionsColumn.AllowEdit = false;
this.gv_fstaffid.Tag = "query_a.fstaffid";
this.gv_fstaffid.Visible = true;
- this.gv_fstaffid.VisibleIndex = 7;
+ this.gv_fstaffid.VisibleIndex = 6;
this.gv_fstaffid.Width = 100;
//
// lb_lxr
@@ -199,13 +197,13 @@
this.gv_lxr.AppearanceCell.Options.UseFont = true;
this.gv_lxr.Caption = "鑱旂郴浜�";
this.gv_lxr.FieldName = "lxr";
- this.gv_lxr.MinWidth = 50;
+ this.gv_lxr.MinWidth = 70;
this.gv_lxr.Name = "gv_lxr";
this.gv_lxr.OptionsColumn.AllowEdit = false;
this.gv_lxr.Tag = "query_a.lxr";
this.gv_lxr.Visible = true;
- this.gv_lxr.VisibleIndex = 5;
- this.gv_lxr.Width = 50;
+ this.gv_lxr.VisibleIndex = 4;
+ this.gv_lxr.Width = 70;
//
// lb_lotFlag
//
@@ -294,36 +292,22 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.VisibleIndex = 8;
this.gv_remark.Width = 100;
//
// 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.Caption = "鍚屾鏃堕棿";
+ this.gv_createDate.FieldName = "lastupdateDate";
this.gv_createDate.MinWidth = 180;
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 = 11;
+ this.gv_createDate.VisibleIndex = 9;
this.gv_createDate.Width = 180;
- //
- // 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 = 100;
- 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 = 10;
- this.gv_createBy.Width = 100;
//
// lb_telfx
//
@@ -374,7 +358,7 @@
this.gv_telf1.OptionsColumn.AllowEdit = false;
this.gv_telf1.Tag = "query_a.telf1";
this.gv_telf1.Visible = true;
- this.gv_telf1.VisibleIndex = 6;
+ this.gv_telf1.VisibleIndex = 5;
this.gv_telf1.Width = 100;
//
// lb_stras
@@ -455,7 +439,7 @@
this.gv_suppName.OptionsColumn.AllowEdit = false;
this.gv_suppName.Tag = "query_a.supp_name";
this.gv_suppName.Visible = true;
- this.gv_suppName.VisibleIndex = 3;
+ this.gv_suppName.VisibleIndex = 2;
this.gv_suppName.Width = 220;
//
// lb_suppNo
@@ -488,7 +472,7 @@
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 2;
+ this.gv_suppNo.VisibleIndex = 1;
this.gv_suppNo.Width = 100;
//
// lb_id
@@ -509,21 +493,6 @@
this.txt_id.Properties.Appearance.Options.UseFont = true;
this.txt_id.Size = new System.Drawing.Size(150, 28);
this.txt_id.TabIndex = 211;
- //
- // gv_id
- //
- this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "渚涘簲鍟咺D";
- this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 80;
- this.gv_id.Name = "gv_id";
- this.gv_id.OptionsColumn.AllowEdit = false;
- this.gv_id.Tag = "query_a.id";
- this.gv_id.UnboundDataType = typeof(string);
- this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 80;
//
// toolBarMenu1
//
@@ -554,11 +523,13 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn2,
- this.gv_id,
this.gv_suppNo,
this.gv_suppName,
this.gridColumn1,
@@ -567,7 +538,6 @@
this.gv_fstaffid,
this.gv_fforbidstatus,
this.gv_remark,
- this.gv_createBy,
this.gv_createDate});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
@@ -597,7 +567,7 @@
this.gridColumn1.OptionsColumn.AllowEdit = false;
this.gridColumn1.Tag = "a.supp_sname";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 3;
this.gridColumn1.Width = 100;
//
// xtraTabControl1
@@ -781,7 +751,6 @@
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraEditors.LabelControl lb_telfx;
private DevExpress.XtraEditors.TextEdit txt_telfx;
@@ -807,7 +776,6 @@
private DevExpress.XtraEditors.LabelControl lb_id;
private DevExpress.XtraEditors.TextEdit txt_id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
public DevExpress.XtraGrid.Columns.GridColumn gv_suppName;
private DevExpress.XtraEditors.MemoEdit txt_suppName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 755e8c4..af65242 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -218,11 +218,11 @@
<Compile Include="DevFrm\BasicData\Frm_MesPosition.Designer.cs">
<DependentUpon>Frm_MesPosition.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesWorkshop.cs">
+ <Compile Include="DevFrm\BasicData\Frm_MesWorkshopLine.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesWorkshop.Designer.cs">
- <DependentUpon>Frm_MesWorkshop.cs</DependentUpon>
+ <Compile Include="DevFrm\BasicData\Frm_MesWorkshopLine.Designer.cs">
+ <DependentUpon>Frm_MesWorkshopLine.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\BasicData\Frm_Staff.cs">
<SubType>Form</SubType>
@@ -854,8 +854,8 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesPosition.resx">
<DependentUpon>Frm_MesPosition.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\BasicData\Frm_MesWorkshop.resx">
- <DependentUpon>Frm_MesWorkshop.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\BasicData\Frm_MesWorkshopLine.resx">
+ <DependentUpon>Frm_MesWorkshopLine.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_Staff.resx">
<DependentUpon>Frm_Staff.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index fc62bff..b145a1f 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -37,7 +37,6 @@
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -46,7 +45,6 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -90,7 +88,6 @@
this.gv_billNo,
this.gridColumn3,
this.gridColumn4,
- this.gridColumn1,
this.gv_supplierItemCode,
this.gv_supplierItemName,
this.gridColumn5,
@@ -99,7 +96,6 @@
this.gridColumn7,
this.gridColumn9,
this.gv_purchaseUnit,
- this.gv_inventoryUnit,
this.gv_remarks,
this.gridColumn10,
this.gridColumn2});
@@ -186,17 +182,6 @@
this.gridColumn4.VisibleIndex = 4;
this.gridColumn4.Width = 120;
//
- // gridColumn1
- //
- this.gridColumn1.Caption = "鐗╂枡ID";
- this.gridColumn1.FieldName = "itemId";
- this.gridColumn1.MinWidth = 80;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 5;
- this.gridColumn1.Width = 94;
- //
// gv_supplierItemCode
//
this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -209,7 +194,7 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 6;
+ this.gv_supplierItemCode.VisibleIndex = 5;
this.gv_supplierItemCode.Width = 100;
//
// gv_supplierItemName
@@ -224,7 +209,7 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 7;
+ this.gv_supplierItemName.VisibleIndex = 6;
this.gv_supplierItemName.Width = 120;
//
// gridColumn5
@@ -235,7 +220,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 8;
+ this.gridColumn5.VisibleIndex = 7;
this.gridColumn5.Width = 250;
//
// gridColumn6
@@ -247,7 +232,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 50;
//
// gridColumn8
@@ -258,8 +243,6 @@
this.gridColumn8.MinWidth = 50;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 10;
this.gridColumn8.Width = 50;
//
// gridColumn7
@@ -270,8 +253,6 @@
this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 11;
this.gridColumn7.Width = 50;
//
// gridColumn9
@@ -283,7 +264,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
+ this.gridColumn9.VisibleIndex = 11;
this.gridColumn9.Width = 50;
//
// gv_purchaseUnit
@@ -299,24 +280,8 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 13;
+ this.gv_purchaseUnit.VisibleIndex = 12;
this.gv_purchaseUnit.Width = 50;
- //
- // gv_inventoryUnit
- //
- this.gv_inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
- this.gv_inventoryUnit.Caption = "MES搴撳瓨";
- this.gv_inventoryUnit.FieldName = "meskc";
- this.gv_inventoryUnit.MaxWidth = 50;
- this.gv_inventoryUnit.MinWidth = 50;
- this.gv_inventoryUnit.Name = "gv_inventoryUnit";
- this.gv_inventoryUnit.OptionsColumn.AllowEdit = false;
- this.gv_inventoryUnit.OptionsColumn.ReadOnly = true;
- this.gv_inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
- this.gv_inventoryUnit.Visible = true;
- this.gv_inventoryUnit.VisibleIndex = 14;
- this.gv_inventoryUnit.Width = 50;
//
// gv_remarks
//
@@ -330,7 +295,7 @@
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 15;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 100;
//
// gridColumn10
@@ -340,7 +305,7 @@
this.gridColumn10.MinWidth = 125;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 16;
+ this.gridColumn10.VisibleIndex = 14;
this.gridColumn10.Width = 125;
//
// gridColumn2
@@ -350,7 +315,7 @@
this.gridColumn2.MinWidth = 250;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 17;
+ this.gridColumn2.VisibleIndex = 15;
this.gridColumn2.Width = 250;
//
// xtraTabControl1
@@ -437,14 +402,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
- private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryUnit;
private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
--
Gitblit v1.9.3