From 1f45918504bfdafae93b6fc7a5823a48d73e4d3c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 31 十二月 2024 14:51:58 +0800
Subject: [PATCH] 工单细节
---
DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs | 19 -
DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs | 32 +--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 46 +----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 15 +
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 84 ++++++----
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 229 +++++++++------------------
7 files changed, 174 insertions(+), 253 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index 54d8f68..f95ff2a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -40,7 +40,6 @@
this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fmanager = new DevExpress.XtraEditors.LabelControl();
this.txt_fmanager = new DevExpress.XtraEditors.TextEdit();
- this.gv_fmanager = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_depextr4 = new DevExpress.XtraEditors.LabelControl();
this.txt_depextr4 = new DevExpress.XtraEditors.TextEdit();
this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -65,6 +64,7 @@
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.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -72,7 +72,6 @@
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_productionWorkshop.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit();
@@ -104,7 +103,7 @@
this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_parentId.Tag = "query_c.Departmentname";
this.gv_parentId.Visible = true;
- this.gv_parentId.VisibleIndex = 9;
+ this.gv_parentId.VisibleIndex = 8;
this.gv_parentId.Width = 150;
//
// lb_productionWorkshop
@@ -157,7 +156,7 @@
this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 8;
+ this.gv_remark.VisibleIndex = 7;
this.gv_remark.Width = 94;
//
// gv_factory
@@ -194,21 +193,6 @@
this.txt_fmanager.Properties.Appearance.Options.UseFont = true;
this.txt_fmanager.Size = new System.Drawing.Size(150, 28);
this.txt_fmanager.TabIndex = 243;
- //
- // 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 = 7;
- this.gv_fmanager.Width = 94;
//
// lb_depextr4
//
@@ -489,7 +473,6 @@
this.gv_depextr2,
this.gv_depextr3,
this.gv_depextr4,
- this.gv_fmanager,
this.gv_remark,
this.gv_parentId,
this.gridColumn1});
@@ -503,6 +486,17 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = 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 = 9;
+ this.gridColumn1.Width = 180;
//
// xtraTabControl1
//
@@ -593,17 +587,6 @@
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);
@@ -657,7 +640,6 @@
private DevExpress.XtraEditors.LabelControl lb_fmanager;
private DevExpress.XtraEditors.TextEdit txt_fmanager;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fmanager;
private DevExpress.XtraEditors.LabelControl lb_depextr4;
private DevExpress.XtraEditors.TextEdit txt_depextr4;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index e736103..b152be7 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -93,8 +93,6 @@
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx1hbNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1hbFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1zyBl = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1llBl = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lpTl = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -105,8 +103,6 @@
this.gvMx1scraprate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1scrapqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab019 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1dab018 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1dab017 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab015 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab013 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -133,7 +129,6 @@
this.lb_daa021 = new DevExpress.XtraEditors.LabelControl();
this.txt_daa021 = new DevExpress.XtraEditors.TextEdit();
this.gv_daa021 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_daa020 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_daa017 = new DevExpress.XtraEditors.LabelControl();
this.txt_daa017 = new DevExpress.XtraEditors.TextEdit();
@@ -145,7 +140,7 @@
this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_daa013 = new DevExpress.XtraEditors.LabelControl();
- this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
this.lb_daa011 = new DevExpress.XtraEditors.LabelControl();
this.txt_daa011 = new DevExpress.XtraEditors.TextEdit();
this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -159,7 +154,7 @@
this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
this.gv_daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_daa005 = new DevExpress.XtraEditors.LabelControl();
- this.txt_daa005 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
this.gv_daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_daa004 = new DevExpress.XtraEditors.LabelControl();
this.txt_daa004 = new DevExpress.XtraEditors.TextEdit();
@@ -183,8 +178,8 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.鐢熶骇缁勭粐 = new DevExpress.XtraGrid.Columns.GridColumn();
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();
@@ -221,12 +216,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa017.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa005.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa029.Properties)).BeginInit();
@@ -1130,32 +1125,6 @@
this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
- // gvMx1hbNo
- //
- this.gvMx1hbNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1hbNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1hbNo.Caption = "鍚堝苟鍗曞彿";
- this.gvMx1hbNo.FieldName = "hbNo";
- this.gvMx1hbNo.MinWidth = 50;
- this.gvMx1hbNo.Name = "gvMx1hbNo";
- this.gvMx1hbNo.Tag = "query_a.hb_no";
- this.gvMx1hbNo.Visible = true;
- this.gvMx1hbNo.VisibleIndex = 1;
- this.gvMx1hbNo.Width = 94;
- //
- // gvMx1hbFlag
- //
- this.gvMx1hbFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1hbFlag.AppearanceCell.Options.UseFont = true;
- this.gvMx1hbFlag.Caption = "鍚堝苟鏍囪瘑";
- this.gvMx1hbFlag.FieldName = "hbFlag";
- this.gvMx1hbFlag.MinWidth = 50;
- this.gvMx1hbFlag.Name = "gvMx1hbFlag";
- this.gvMx1hbFlag.Tag = "query_a.hb_flag";
- this.gvMx1hbFlag.Visible = true;
- this.gvMx1hbFlag.VisibleIndex = 0;
- this.gvMx1hbFlag.Width = 94;
- //
// gvMx1zyBl
//
this.gvMx1zyBl.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1286,32 +1255,6 @@
this.gvMx1dab019.VisibleIndex = 22;
this.gvMx1dab019.Width = 94;
//
- // gvMx1dab018
- //
- this.gvMx1dab018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1dab018.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab018.Caption = "浠撳簱鍚嶇О";
- this.gvMx1dab018.FieldName = "dab018";
- this.gvMx1dab018.MinWidth = 50;
- this.gvMx1dab018.Name = "gvMx1dab018";
- this.gvMx1dab018.Tag = "query_a.dab018";
- this.gvMx1dab018.Visible = true;
- this.gvMx1dab018.VisibleIndex = 21;
- this.gvMx1dab018.Width = 94;
- //
- // gvMx1dab017
- //
- this.gvMx1dab017.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1dab017.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab017.Caption = "浠撳簱缂栫爜";
- this.gvMx1dab017.FieldName = "dab017";
- this.gvMx1dab017.MinWidth = 50;
- this.gvMx1dab017.Name = "gvMx1dab017";
- this.gvMx1dab017.Tag = "query_a.dab017";
- this.gvMx1dab017.Visible = true;
- this.gvMx1dab017.VisibleIndex = 20;
- this.gvMx1dab017.Width = 94;
- //
// gvMx1dab015
//
this.gvMx1dab015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1395,12 +1338,12 @@
this.gvMx1dab009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
this.gvMx1dab009.Caption = "鍗曚綅";
- this.gvMx1dab009.FieldName = "dab009";
+ this.gvMx1dab009.FieldName = "dwName";
this.gvMx1dab009.MinWidth = 50;
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
- this.gvMx1dab009.VisibleIndex = 6;
+ this.gvMx1dab009.VisibleIndex = 4;
this.gvMx1dab009.Width = 94;
//
// gvMx1dab007
@@ -1460,12 +1403,12 @@
this.gvMx1dab003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1dab003.AppearanceCell.Options.UseFont = true;
this.gvMx1dab003.Caption = "鏉愭枡缂栫爜";
- this.gvMx1dab003.FieldName = "dab003";
+ this.gvMx1dab003.FieldName = "itemNo";
this.gvMx1dab003.MinWidth = 50;
this.gvMx1dab003.Name = "gvMx1dab003";
this.gvMx1dab003.Tag = "query_a.dab003";
this.gvMx1dab003.Visible = true;
- this.gvMx1dab003.VisibleIndex = 3;
+ this.gvMx1dab003.VisibleIndex = 1;
this.gvMx1dab003.Width = 94;
//
// gvMx1dab001
@@ -1506,8 +1449,6 @@
this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1Guid,
- this.gvMx1hbFlag,
- this.gvMx1hbNo,
this.gvMx1dab001,
this.gvMx1dab003,
this.gvMx1dab004,
@@ -1527,8 +1468,6 @@
this.gvMx1dab015,
this.gvMx1dab012,
this.gvMx1dab014,
- this.gvMx1dab017,
- this.gvMx1dab018,
this.gvMx1dab019,
this.gvMx1dab020,
this.gvMx1dab022,
@@ -1573,7 +1512,7 @@
this.gv_prepareTime.OptionsColumn.AllowEdit = false;
this.gv_prepareTime.Tag = "query_a.prepare_time";
this.gv_prepareTime.Visible = true;
- this.gv_prepareTime.VisibleIndex = 10;
+ this.gv_prepareTime.VisibleIndex = 19;
this.gv_prepareTime.Width = 180;
//
// gv_mesEndProd
@@ -1587,7 +1526,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 29;
+ this.gv_mesEndProd.VisibleIndex = 27;
this.gv_mesEndProd.Width = 180;
//
// gv_mesStartProd
@@ -1601,7 +1540,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 27;
+ this.gv_mesStartProd.VisibleIndex = 26;
this.gv_mesStartProd.Width = 180;
//
// gv_daa028
@@ -1615,7 +1554,7 @@
this.gv_daa028.OptionsColumn.AllowEdit = false;
this.gv_daa028.Tag = "query_a.daa028";
this.gv_daa028.Visible = true;
- this.gv_daa028.VisibleIndex = 11;
+ this.gv_daa028.VisibleIndex = 20;
this.gv_daa028.Width = 180;
//
// gv_daa027
@@ -1632,7 +1571,7 @@
this.gv_daa027.OptionsColumn.AllowEdit = false;
this.gv_daa027.Tag = "query_a.daa027";
this.gv_daa027.Visible = true;
- this.gv_daa027.VisibleIndex = 2;
+ this.gv_daa027.VisibleIndex = 1;
this.gv_daa027.Width = 50;
//
// lb_daa021
@@ -1666,22 +1605,8 @@
this.gv_daa021.OptionsColumn.AllowEdit = false;
this.gv_daa021.Tag = "query_a.daa021";
this.gv_daa021.Visible = true;
- this.gv_daa021.VisibleIndex = 16;
+ this.gv_daa021.VisibleIndex = 11;
this.gv_daa021.Width = 100;
- //
- // gv_daa020
- //
- this.gv_daa020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_daa020.AppearanceCell.Options.UseFont = true;
- this.gv_daa020.Caption = "绾垮埆缂栫爜";
- this.gv_daa020.FieldName = "daa020";
- this.gv_daa020.MinWidth = 80;
- this.gv_daa020.Name = "gv_daa020";
- this.gv_daa020.OptionsColumn.AllowEdit = false;
- this.gv_daa020.Tag = "query_a.daa020";
- this.gv_daa020.Visible = true;
- this.gv_daa020.VisibleIndex = 14;
- this.gv_daa020.Width = 94;
//
// gv_daa018
//
@@ -1694,7 +1619,7 @@
this.gv_daa018.OptionsColumn.AllowEdit = false;
this.gv_daa018.Tag = "query_a.daa018";
this.gv_daa018.Visible = true;
- this.gv_daa018.VisibleIndex = 1;
+ this.gv_daa018.VisibleIndex = 9;
this.gv_daa018.Width = 90;
//
// lb_daa017
@@ -1796,7 +1721,7 @@
this.gv_daa015.OptionsColumn.AllowEdit = false;
this.gv_daa015.Tag = "query_a.daa015";
this.gv_daa015.Visible = true;
- this.gv_daa015.VisibleIndex = 13;
+ this.gv_daa015.VisibleIndex = 17;
this.gv_daa015.Width = 94;
//
// lb_daa013
@@ -1809,15 +1734,15 @@
this.lb_daa013.TabIndex = 258;
this.lb_daa013.Text = "宸ヤ綔杞﹂棿 ";
//
- // txt_daa013
+ // txt_dptName
//
- this.txt_daa013.Enabled = false;
- this.txt_daa013.Location = new System.Drawing.Point(348, 48);
- this.txt_daa013.Name = "txt_daa013";
- this.txt_daa013.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_daa013.Properties.Appearance.Options.UseFont = true;
- this.txt_daa013.Size = new System.Drawing.Size(150, 28);
- this.txt_daa013.TabIndex = 258;
+ this.txt_dptName.Enabled = false;
+ this.txt_dptName.Location = new System.Drawing.Point(348, 48);
+ this.txt_dptName.Name = "txt_dptName";
+ this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dptName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dptName.Size = new System.Drawing.Size(150, 28);
+ this.txt_dptName.TabIndex = 258;
//
// lb_daa011
//
@@ -1918,7 +1843,7 @@
this.gv_daa009.OptionsColumn.AllowEdit = false;
this.gv_daa009.Tag = "query_a.daa009";
this.gv_daa009.Visible = true;
- this.gv_daa009.VisibleIndex = 26;
+ this.gv_daa009.VisibleIndex = 18;
this.gv_daa009.Width = 94;
//
// lb_daa008
@@ -1952,7 +1877,7 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 20;
+ this.gv_daa008.VisibleIndex = 14;
this.gv_daa008.Width = 94;
//
// lb_daa005
@@ -1965,15 +1890,15 @@
this.lb_daa005.TabIndex = 226;
this.lb_daa005.Text = "鍗曚綅 ";
//
- // txt_daa005
+ // txt_dwName
//
- this.txt_daa005.Enabled = false;
- this.txt_daa005.Location = new System.Drawing.Point(589, 112);
- this.txt_daa005.Name = "txt_daa005";
- this.txt_daa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_daa005.Properties.Appearance.Options.UseFont = true;
- this.txt_daa005.Size = new System.Drawing.Size(150, 28);
- this.txt_daa005.TabIndex = 226;
+ this.txt_dwName.Enabled = false;
+ this.txt_dwName.Location = new System.Drawing.Point(589, 112);
+ this.txt_dwName.Name = "txt_dwName";
+ this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_dwName.Properties.Appearance.Options.UseFont = true;
+ this.txt_dwName.Size = new System.Drawing.Size(150, 28);
+ this.txt_dwName.TabIndex = 226;
//
// gv_daa005
//
@@ -2020,7 +1945,7 @@
this.gv_daa004.OptionsColumn.AllowEdit = false;
this.gv_daa004.Tag = "query_a.daa004";
this.gv_daa004.Visible = true;
- this.gv_daa004.VisibleIndex = 18;
+ this.gv_daa004.VisibleIndex = 13;
this.gv_daa004.Width = 150;
//
// lb_daa003
@@ -2054,7 +1979,7 @@
this.gv_daa003.OptionsColumn.AllowEdit = false;
this.gv_daa003.Tag = "query_a.daa003";
this.gv_daa003.Visible = true;
- this.gv_daa003.VisibleIndex = 17;
+ this.gv_daa003.VisibleIndex = 12;
this.gv_daa003.Width = 150;
//
// lb_daa002
@@ -2108,7 +2033,7 @@
this.gv_daa001.OptionsColumn.AllowEdit = false;
this.gv_daa001.Tag = "query_a.daa001";
this.gv_daa001.Visible = true;
- this.gv_daa001.VisibleIndex = 15;
+ this.gv_daa001.VisibleIndex = 10;
this.gv_daa001.Width = 120;
//
// toolBarMenu1
@@ -2147,7 +2072,6 @@
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn5,
- this.gv_daa018,
this.gv_daa027,
this.gridColumn7,
this.gridColumn8,
@@ -2156,23 +2080,23 @@
this.gridColumn11,
this.gridColumn12,
this.gridColumn6,
- this.gv_prepareTime,
- this.gv_daa028,
- this.gridColumn1,
- this.gv_daa015,
- this.gv_daa020,
+ this.gv_daa018,
this.gv_daa001,
this.gv_daa021,
this.gv_daa003,
this.gv_daa004,
- this.gridColumn2,
this.gv_daa008,
+ this.鐢熶骇缁勭粐,
+ this.gridColumn1,
+ this.gv_daa015,
+ this.gv_daa009,
+ this.gv_prepareTime,
+ this.gv_daa028,
this.gv_daa005,
this.gv_daa011,
this.gv_daa010,
this.gv_daa016,
this.gv_daa017,
- this.gv_daa009,
this.gv_mesStartProd,
this.gv_mesEndProd,
this.gv_cust});
@@ -2202,8 +2126,9 @@
this.gridColumn7.MaxWidth = 50;
this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Tag = "query_a.jabs";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.VisibleIndex = 2;
this.gridColumn7.Width = 50;
//
// gridColumn8
@@ -2213,8 +2138,9 @@
this.gridColumn8.MaxWidth = 50;
this.gridColumn8.MinWidth = 50;
this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Tag = "query_a.jabs";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 4;
+ this.gridColumn8.VisibleIndex = 3;
this.gridColumn8.Width = 50;
//
// gridColumn9
@@ -2224,8 +2150,9 @@
this.gridColumn9.MaxWidth = 50;
this.gridColumn9.MinWidth = 50;
this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "query_a.jabs";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 5;
+ this.gridColumn9.VisibleIndex = 4;
this.gridColumn9.Width = 50;
//
// gridColumn10
@@ -2235,8 +2162,9 @@
this.gridColumn10.MaxWidth = 50;
this.gridColumn10.MinWidth = 50;
this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Tag = "query_a.jabs";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 6;
+ this.gridColumn10.VisibleIndex = 5;
this.gridColumn10.Width = 50;
//
// gridColumn11
@@ -2246,8 +2174,9 @@
this.gridColumn11.MaxWidth = 50;
this.gridColumn11.MinWidth = 50;
this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "query_a.jabs";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 7;
+ this.gridColumn11.VisibleIndex = 6;
this.gridColumn11.Width = 50;
//
// gridColumn12
@@ -2257,8 +2186,9 @@
this.gridColumn12.MaxWidth = 50;
this.gridColumn12.MinWidth = 50;
this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Tag = "query_a.jabs";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 8;
+ this.gridColumn12.VisibleIndex = 7;
this.gridColumn12.Width = 50;
//
// gridColumn6
@@ -2268,9 +2198,21 @@
this.gridColumn6.MaxWidth = 50;
this.gridColumn6.MinWidth = 50;
this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Tag = "query_a.jabs";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 9;
+ this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 50;
+ //
+ // 鐢熶骇缁勭粐
+ //
+ this.鐢熶骇缁勭粐.Caption = "鐢熶骇缁勭粐";
+ this.鐢熶骇缁勭粐.FieldName = "fSubsidiary";
+ this.鐢熶骇缁勭粐.MinWidth = 250;
+ this.鐢熶骇缁勭粐.Name = "鐢熶骇缁勭粐";
+ this.鐢熶骇缁勭粐.Tag = "org.fnamber";
+ this.鐢熶骇缁勭粐.Visible = true;
+ this.鐢熶骇缁勭粐.VisibleIndex = 15;
+ this.鐢熶骇缁勭粐.Width = 250;
//
// gridColumn1
//
@@ -2279,18 +2221,8 @@
this.gridColumn1.MinWidth = 80;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 12;
+ this.gridColumn1.VisibleIndex = 16;
this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "榻愬鏁伴噺";
- this.gridColumn2.FieldName = "qunm";
- this.gridColumn2.MinWidth = 50;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 19;
- this.gridColumn2.Width = 94;
//
// xtraTabControl1
//
@@ -2375,7 +2307,7 @@
this.panel1.Controls.Add(this.lb_daa015);
this.panel1.Controls.Add(this.txt_daa015);
this.panel1.Controls.Add(this.lb_daa013);
- this.panel1.Controls.Add(this.txt_daa013);
+ this.panel1.Controls.Add(this.txt_dptName);
this.panel1.Controls.Add(this.lb_daa011);
this.panel1.Controls.Add(this.txt_daa011);
this.panel1.Controls.Add(this.lb_daa010);
@@ -2385,7 +2317,7 @@
this.panel1.Controls.Add(this.lb_daa008);
this.panel1.Controls.Add(this.txt_daa008);
this.panel1.Controls.Add(this.lb_daa005);
- this.panel1.Controls.Add(this.txt_daa005);
+ this.panel1.Controls.Add(this.txt_dwName);
this.panel1.Controls.Add(this.lb_daa004);
this.panel1.Controls.Add(this.txt_daa004);
this.panel1.Controls.Add(this.lb_daa003);
@@ -2611,12 +2543,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa017.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa005.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa029.Properties)).EndInit();
@@ -2718,8 +2650,6 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1hbNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1hbFlag;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1zyBl;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1llBl;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1lpTl;
@@ -2730,8 +2660,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1scraprate;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1scrapqty;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab019;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab018;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab017;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab015;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab014;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab013;
@@ -2758,7 +2686,6 @@
private DevExpress.XtraEditors.LabelControl lb_daa021;
private DevExpress.XtraEditors.TextEdit txt_daa021;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa021;
- private DevExpress.XtraGrid.Columns.GridColumn gv_daa020;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa018;
private DevExpress.XtraEditors.LabelControl lb_daa017;
@@ -2774,7 +2701,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
private DevExpress.XtraEditors.LabelControl lb_daa013;
- private DevExpress.XtraEditors.TextEdit txt_daa013;
+ private DevExpress.XtraEditors.TextEdit txt_dptName;
private DevExpress.XtraEditors.LabelControl lb_daa011;
private DevExpress.XtraEditors.TextEdit txt_daa011;
@@ -2793,7 +2720,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_daa008;
private DevExpress.XtraEditors.LabelControl lb_daa005;
- private DevExpress.XtraEditors.TextEdit txt_daa005;
+ private DevExpress.XtraEditors.TextEdit txt_dwName;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa005;
private DevExpress.XtraEditors.LabelControl lb_daa004;
@@ -2811,7 +2738,6 @@
private DevExpress.XtraEditors.TextEdit txt_daa001;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa001;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
@@ -2839,5 +2765,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private UserControl.UcBtnPrint ucBtnPrint1;
+ private DevExpress.XtraGrid.Columns.GridColumn 鐢熶骇缁勭粐;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 15a34d7..e77afd7 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -27,6 +27,7 @@
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
@@ -122,7 +123,19 @@
{
_toolCk(8);
}
-
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index cb2fb58..e85a6c9 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
@@ -101,6 +101,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_erpSczz = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_pba013 = new Gs.DevApp.UserControl.UcLookWorkshop();
this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
@@ -109,8 +111,7 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.txt_erpSczz = new Gs.DevApp.UserControl.UcLookOrg();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
@@ -697,10 +698,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -736,7 +737,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 2;
+ this.gv_checkUser.VisibleIndex = 4;
this.gv_checkUser.Width = 94;
//
// lb_checkDate
@@ -770,7 +771,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 3;
+ this.gv_checkDate.VisibleIndex = 5;
this.gv_checkDate.Width = 180;
//
// lb_fstatus
@@ -838,7 +839,7 @@
this.gv_pba009.OptionsColumn.AllowEdit = false;
this.gv_pba009.Tag = "query_a.pba009";
this.gv_pba009.Visible = true;
- this.gv_pba009.VisibleIndex = 6;
+ this.gv_pba009.VisibleIndex = 8;
this.gv_pba009.Width = 100;
//
// gv_pba006
@@ -852,7 +853,7 @@
this.gv_pba006.OptionsColumn.AllowEdit = false;
this.gv_pba006.Tag = "query_a.pba006";
this.gv_pba006.Visible = true;
- this.gv_pba006.VisibleIndex = 5;
+ this.gv_pba006.VisibleIndex = 7;
this.gv_pba006.Width = 180;
//
// gv_pba005
@@ -866,7 +867,7 @@
this.gv_pba005.OptionsColumn.AllowEdit = false;
this.gv_pba005.Tag = "query_a.pba005";
this.gv_pba005.Visible = true;
- this.gv_pba005.VisibleIndex = 4;
+ this.gv_pba005.VisibleIndex = 6;
this.gv_pba005.Width = 94;
//
// toolBarMenu1
@@ -905,13 +906,14 @@
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_fstatus,
+ this.gridColumn4,
+ this.gridColumn1,
this.gridColumn2,
this.gv_checkUser,
this.gv_checkDate,
this.gv_pba005,
this.gv_pba006,
- this.gv_pba009,
- this.gridColumn1});
+ this.gv_pba009});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -927,7 +929,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.VisibleIndex = 3;
this.gridColumn2.Width = 150;
//
// gridColumn1
@@ -937,7 +939,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 94;
//
// xtraTabControl1
@@ -1018,6 +1020,24 @@
this.panel1.Size = new System.Drawing.Size(1126, 149);
this.panel1.TabIndex = 1;
//
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(20, 18);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(68, 21);
+ this.labelControl2.TabIndex = 461;
+ this.labelControl2.Text = "鐢熶骇缁勭粐";
+ //
+ // txt_erpSczz
+ //
+ this.txt_erpSczz.IsReadly = false;
+ this.txt_erpSczz.Location = new System.Drawing.Point(100, 14);
+ this.txt_erpSczz.Name = "txt_erpSczz";
+ this.txt_erpSczz.Size = new System.Drawing.Size(180, 28);
+ this.txt_erpSczz.TabIndex = 460;
+ //
// txt_pba013
//
this.txt_pba013.IsReadly = false;
@@ -1094,23 +1114,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_erpSczz
+ // gridColumn4
//
- this.txt_erpSczz.IsReadly = false;
- this.txt_erpSczz.Location = new System.Drawing.Point(100, 14);
- this.txt_erpSczz.Name = "txt_erpSczz";
- this.txt_erpSczz.Size = new System.Drawing.Size(180, 28);
- this.txt_erpSczz.TabIndex = 460;
- //
- // labelControl2
- //
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(20, 18);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(68, 21);
- this.labelControl2.TabIndex = 461;
- this.labelControl2.Text = "鐢熶骇缁勭粐";
+ this.gridColumn4.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn4.FieldName = "fSubsidiary";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Tag = "org.fnamber";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 250;
//
// Frm_Wompba
//
@@ -1234,5 +1247,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3;
private UserControl.UcLookOrg txt_erpSczz;
private DevExpress.XtraEditors.LabelControl labelControl2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index 8202728..5852be0 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -43,6 +43,7 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ this.txt_pba013.getSuppler("");
txt_erpSczz.EditChanged += (s, e) => {
txt_pba013.getSuppler(txt_erpSczz.GetId());
};
@@ -431,6 +432,7 @@
}
private void getModel(string strGuid)
{
+
bool isEdit = false;
if (toolBarMenu1.currentAction == "add")
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
index f727990..f9075bf 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWompba.Designer.cs
@@ -42,7 +42,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();
@@ -131,7 +130,6 @@
this.gv_billNo,
this.gridColumn3,
this.gridColumn4,
- this.gridColumn1,
this.gv_supplierItemCode,
this.gv_supplierItemName,
this.gridColumn5,
@@ -151,6 +149,10 @@
//
// gv_chk
//
+ this.gv_chk.AppearanceCell.ForeColor = System.Drawing.Color.Black;
+ this.gv_chk.AppearanceCell.Options.UseForeColor = true;
+ this.gv_chk.AppearanceHeader.ForeColor = System.Drawing.Color.Black;
+ this.gv_chk.AppearanceHeader.Options.UseForeColor = true;
this.gv_chk.Caption = "閫夋嫨";
this.gv_chk.FieldName = "gvChk";
this.gv_chk.MinWidth = 60;
@@ -210,7 +212,11 @@
// gv_billNo
//
this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_billNo.AppearanceCell.ForeColor = System.Drawing.Color.Red;
this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.AppearanceCell.Options.UseForeColor = true;
+ this.gv_billNo.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gv_billNo.AppearanceHeader.Options.UseForeColor = true;
this.gv_billNo.Caption = "鏈帓鏁伴噺";
this.gv_billNo.FieldName = "caa012";
this.gv_billNo.MinWidth = 80;
@@ -243,17 +249,6 @@
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 6;
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 = 7;
- this.gridColumn1.Width = 94;
//
// gv_supplierItemCode
//
@@ -344,15 +339,15 @@
//
this.gv_purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
- this.gv_purchaseUnit.Caption = "杞﹂棿ID";
- this.gv_purchaseUnit.FieldName = "caa021";
+ this.gv_purchaseUnit.Caption = "杞﹂棿";
+ this.gv_purchaseUnit.FieldName = "dptName";
this.gv_purchaseUnit.MinWidth = 100;
this.gv_purchaseUnit.Name = "gv_purchaseUnit";
this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 15;
+ this.gv_purchaseUnit.VisibleIndex = 14;
this.gv_purchaseUnit.Width = 100;
//
// gv_inventoryUnit
@@ -360,14 +355,14 @@
this.gv_inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_inventoryUnit.AppearanceCell.Options.UseFont = true;
this.gv_inventoryUnit.Caption = "寮�宸ョ姸鎬�";
- this.gv_inventoryUnit.FieldName = "zt";
+ this.gv_inventoryUnit.FieldName = "gdzt";
this.gv_inventoryUnit.MinWidth = 100;
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 = 16;
+ this.gv_inventoryUnit.VisibleIndex = 15;
this.gv_inventoryUnit.Width = 100;
//
// gv_remarks
@@ -434,7 +429,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
index 65e2a9e..7bc91bc 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.Designer.cs
@@ -31,7 +31,6 @@
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -57,7 +56,6 @@
//
this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn5,
- this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
this.gridColumn4});
@@ -74,33 +72,25 @@
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 0;
//
- // gridColumn1
- //
- this.gridColumn1.Caption = "杞﹂棿ID";
- this.gridColumn1.FieldName = "departmentid";
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- //
// gridColumn2
//
- this.gridColumn2.Caption = "杞﹂棿缂栧彿";
+ this.gridColumn2.Caption = "閮ㄩ棬缂栧彿";
this.gridColumn2.FieldName = "departmentcode";
this.gridColumn2.MinWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 80;
//
// gridColumn3
//
- this.gridColumn3.Caption = "杞﹂棿鍚嶇О";
+ this.gridColumn3.Caption = "閮ㄩ棬鍚嶇О";
this.gridColumn3.FieldName = "departmentname";
this.gridColumn3.MinWidth = 100;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 100;
//
// gridColumn4
@@ -127,7 +117,6 @@
private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier;
private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
--
Gitblit v1.9.3