From fad2478c12172e84ffb47ae2b97654108ee8856c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 28 十一月 2024 14:36:06 +0800
Subject: [PATCH] 车间产线下拉
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 5
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 1
DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs | 42 ++--
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 91 ++++++++++-
DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs | 23 +-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs | 154 +++++++++---------
DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs | 22 +-
DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs | 4
DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs | 26 +-
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 59 +++++++
12 files changed, 273 insertions(+), 157 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index f393971..dcd0338 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -663,7 +663,6 @@
gvMx1.UpdateCurrentRow();
gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
-
}
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
index 019ec51..c8a33a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs
@@ -1525,7 +1525,6 @@
// txt_daahb015
//
this.txt_daahb015.IsReadly = false;
- this.txt_daahb015.KeyFile = "";
this.txt_daahb015.Location = new System.Drawing.Point(89, 89);
this.txt_daahb015.Name = "txt_daahb015";
this.txt_daahb015.Size = new System.Drawing.Size(188, 28);
@@ -1534,7 +1533,6 @@
// txt_daahb013
//
this.txt_daahb013.IsReadly = false;
- this.txt_daahb013.KeyFile = "";
this.txt_daahb013.Location = new System.Drawing.Point(89, 54);
this.txt_daahb013.Name = "txt_daahb013";
this.txt_daahb013.Size = new System.Drawing.Size(188, 28);
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
index 044ca8f..f883f0d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs
@@ -44,11 +44,7 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
-
- txt_daahb013.KeyFile = "guid";
txt_daahb013.EditChanged += Txt_daahb013_EditChanged;
- txt_daahb015.KeyFile = "guid";
-
}
private void Txt_daahb013_EditChanged(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 2423bcf..8fc63cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -1348,10 +1348,9 @@
// txt_caa021
//
this.txt_caa021.IsReadly = false;
- this.txt_caa021.KeyFile = "";
- this.txt_caa021.Location = new System.Drawing.Point(85, 81);
+ this.txt_caa021.Location = new System.Drawing.Point(95, 85);
this.txt_caa021.Name = "txt_caa021";
- this.txt_caa021.Size = new System.Drawing.Size(160, 29);
+ this.txt_caa021.Size = new System.Drawing.Size(150, 28);
this.txt_caa021.TabIndex = 451;
//
// labelControl11
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index b6249d4..5367a9a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -40,7 +40,6 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
- txt_caa021.KeyFile = "workid";
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 307416f..a793ede 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 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();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -54,8 +54,8 @@
this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa013 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -85,7 +85,6 @@
this.lb_fstatus = new DevExpress.XtraEditors.LabelControl();
this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_pba013 = new DevExpress.XtraEditors.LabelControl();
- this.txt_pba013 = new DevExpress.XtraEditors.TextEdit();
this.gv_pba013 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_pba010 = new DevExpress.XtraEditors.LabelControl();
this.txt_pba015 = new DevExpress.XtraEditors.TextEdit();
@@ -95,7 +94,6 @@
this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_pba001 = new DevExpress.XtraEditors.LabelControl();
- this.txt_pba016 = new DevExpress.XtraEditors.TextEdit();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -107,26 +105,28 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_pba016 = new Gs.DevApp.UserControl.UcLookWorkline();
+ this.txt_pba013 = new Gs.DevApp.UserControl.UcLookWorkshop();
this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pba013.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba015.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pba016.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -155,7 +155,7 @@
this.gvMx1machineNo.Name = "gvMx1machineNo";
this.gvMx1machineNo.Tag = "query_a.machine_no";
this.gvMx1machineNo.Visible = true;
- this.gvMx1machineNo.VisibleIndex = 35;
+ this.gvMx1machineNo.VisibleIndex = 34;
this.gvMx1machineNo.Width = 250;
//
// repositoryItemDateEdit1
@@ -181,7 +181,7 @@
this.gvMx1reporttime.Name = "gvMx1reporttime";
this.gvMx1reporttime.Tag = "query_a.reporttime";
this.gvMx1reporttime.Visible = true;
- this.gvMx1reporttime.VisibleIndex = 34;
+ this.gvMx1reporttime.VisibleIndex = 33;
this.gvMx1reporttime.Width = 94;
//
// gvMx1isReportcheck
@@ -199,7 +199,7 @@
this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
this.gvMx1isReportcheck.Visible = true;
- this.gvMx1isReportcheck.VisibleIndex = 33;
+ this.gvMx1isReportcheck.VisibleIndex = 32;
this.gvMx1isReportcheck.Width = 94;
//
// gvMx1daa026
@@ -216,7 +216,7 @@
this.gvMx1daa026.Name = "gvMx1daa026";
this.gvMx1daa026.Tag = "query_a.daa026";
this.gvMx1daa026.Visible = true;
- this.gvMx1daa026.VisibleIndex = 32;
+ this.gvMx1daa026.VisibleIndex = 31;
this.gvMx1daa026.Width = 94;
//
// gvMx1daa025
@@ -230,7 +230,7 @@
this.gvMx1daa025.OptionsColumn.ReadOnly = true;
this.gvMx1daa025.Tag = "query_a.daa025";
this.gvMx1daa025.Visible = true;
- this.gvMx1daa025.VisibleIndex = 31;
+ this.gvMx1daa025.VisibleIndex = 30;
this.gvMx1daa025.Width = 94;
//
// gvMx1daa024
@@ -244,7 +244,7 @@
this.gvMx1daa024.OptionsColumn.ReadOnly = true;
this.gvMx1daa024.Tag = "query_a.daa024";
this.gvMx1daa024.Visible = true;
- this.gvMx1daa024.VisibleIndex = 30;
+ this.gvMx1daa024.VisibleIndex = 29;
this.gvMx1daa024.Width = 94;
//
// gvMx1daa023
@@ -258,7 +258,7 @@
this.gvMx1daa023.OptionsColumn.ReadOnly = true;
this.gvMx1daa023.Tag = "query_a.daa023";
this.gvMx1daa023.Visible = true;
- this.gvMx1daa023.VisibleIndex = 29;
+ this.gvMx1daa023.VisibleIndex = 28;
this.gvMx1daa023.Width = 94;
//
// gvMx1daa022
@@ -272,7 +272,7 @@
this.gvMx1daa022.OptionsColumn.ReadOnly = true;
this.gvMx1daa022.Tag = "query_a.daa022";
this.gvMx1daa022.Visible = true;
- this.gvMx1daa022.VisibleIndex = 28;
+ this.gvMx1daa022.VisibleIndex = 27;
this.gvMx1daa022.Width = 94;
//
// gvMx1daa021
@@ -286,7 +286,7 @@
this.gvMx1daa021.OptionsColumn.ReadOnly = true;
this.gvMx1daa021.Tag = "query_a.daa021";
this.gvMx1daa021.Visible = true;
- this.gvMx1daa021.VisibleIndex = 27;
+ this.gvMx1daa021.VisibleIndex = 26;
this.gvMx1daa021.Width = 94;
//
// gvMx1daa020
@@ -300,7 +300,7 @@
this.gvMx1daa020.OptionsColumn.ReadOnly = true;
this.gvMx1daa020.Tag = "query_a.daa020";
this.gvMx1daa020.Visible = true;
- this.gvMx1daa020.VisibleIndex = 26;
+ this.gvMx1daa020.VisibleIndex = 25;
this.gvMx1daa020.Width = 94;
//
// gvMx1checkUser
@@ -314,7 +314,7 @@
this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
this.gvMx1checkUser.Tag = "query_a.check_user";
this.gvMx1checkUser.Visible = true;
- this.gvMx1checkUser.VisibleIndex = 25;
+ this.gvMx1checkUser.VisibleIndex = 24;
this.gvMx1checkUser.Width = 94;
//
// gvMx1checkDate
@@ -328,7 +328,7 @@
this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
this.gvMx1checkDate.Tag = "query_a.check_date";
this.gvMx1checkDate.Visible = true;
- this.gvMx1checkDate.VisibleIndex = 24;
+ this.gvMx1checkDate.VisibleIndex = 23;
this.gvMx1checkDate.Width = 94;
//
// gvMx1fstatus
@@ -342,7 +342,7 @@
this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
this.gvMx1fstatus.Tag = "query_a.fstatus";
this.gvMx1fstatus.Visible = true;
- this.gvMx1fstatus.VisibleIndex = 23;
+ this.gvMx1fstatus.VisibleIndex = 22;
this.gvMx1fstatus.Width = 94;
//
// gvMx1daa019
@@ -356,7 +356,7 @@
this.gvMx1daa019.OptionsColumn.ReadOnly = true;
this.gvMx1daa019.Tag = "query_a.daa019";
this.gvMx1daa019.Visible = true;
- this.gvMx1daa019.VisibleIndex = 22;
+ this.gvMx1daa019.VisibleIndex = 21;
this.gvMx1daa019.Width = 94;
//
// gvMx1daa018
@@ -369,7 +369,7 @@
this.gvMx1daa018.Name = "gvMx1daa018";
this.gvMx1daa018.Tag = "query_a.daa018";
this.gvMx1daa018.Visible = true;
- this.gvMx1daa018.VisibleIndex = 21;
+ this.gvMx1daa018.VisibleIndex = 20;
this.gvMx1daa018.Width = 94;
//
// gvMx1daa017
@@ -404,7 +404,7 @@
this.gvMx1daa016.Name = "gvMx1daa016";
this.gvMx1daa016.Tag = "query_a.daa016";
this.gvMx1daa016.Visible = true;
- this.gvMx1daa016.VisibleIndex = 20;
+ this.gvMx1daa016.VisibleIndex = 18;
this.gvMx1daa016.Width = 200;
//
// repositoryItemDateEdit2
@@ -427,22 +427,8 @@
this.gvMx1daa014.OptionsColumn.ReadOnly = true;
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
- this.gvMx1daa014.VisibleIndex = 18;
+ this.gvMx1daa014.VisibleIndex = 17;
this.gvMx1daa014.Width = 94;
- //
- // gvMx1daa013
- //
- this.gvMx1daa013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa013.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa013.Caption = "鐢熶骇绾垮埆";
- this.gvMx1daa013.FieldName = "daa020";
- this.gvMx1daa013.MinWidth = 50;
- this.gvMx1daa013.Name = "gvMx1daa013";
- this.gvMx1daa013.OptionsColumn.ReadOnly = true;
- this.gvMx1daa013.Tag = "query_a.daa013";
- this.gvMx1daa013.Visible = true;
- this.gvMx1daa013.VisibleIndex = 17;
- this.gvMx1daa013.Width = 94;
//
// gvMx1daa012
//
@@ -453,13 +439,22 @@
this.gvMx1daa012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
this.gvMx1daa012.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1daa012.Caption = "绾垮埆缂栫爜";
- this.gvMx1daa012.FieldName = "daa015";
- this.gvMx1daa012.MinWidth = 50;
+ this.gvMx1daa012.ColumnEdit = this.rptJYBZ;
+ this.gvMx1daa012.FieldName = "daa015LineName";
+ this.gvMx1daa012.MinWidth = 150;
this.gvMx1daa012.Name = "gvMx1daa012";
this.gvMx1daa012.Tag = "query_a.daa012";
this.gvMx1daa012.Visible = true;
this.gvMx1daa012.VisibleIndex = 16;
- this.gvMx1daa012.Width = 94;
+ this.gvMx1daa012.Width = 150;
+ //
+ // rptJYBZ
+ //
+ this.rptJYBZ.AutoHeight = false;
+ this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYBZ.Name = "rptJYBZ";
+ this.rptJYBZ.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
//
// gvMx1daa011
//
@@ -676,7 +671,8 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemDateEdit1,
this.repositoryItemDateEdit2,
- this.repositoryItemButtonEdit1});
+ this.repositoryItemButtonEdit1,
+ this.rptJYBZ});
this.gcMx1.Size = new System.Drawing.Size(1124, 381);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -705,7 +701,6 @@
this.gvMx1daa009,
this.gvMx1daa011,
this.gvMx1daa012,
- this.gvMx1daa013,
this.gvMx1daa016,
this.gvMx1daa017,
this.gvMx1daa018,
@@ -723,7 +718,8 @@
this.gvMx1isReportcheck,
this.gvMx1daa014,
this.gvMx1reporttime,
- this.gvMx1machineNo});
+ this.gvMx1machineNo,
+ this.gridColumn3});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -754,10 +750,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, 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);
@@ -864,15 +860,6 @@
this.lb_pba013.TabIndex = 258;
this.lb_pba013.Text = "宸ヤ綔杞﹂棿";
//
- // txt_pba013
- //
- this.txt_pba013.Location = new System.Drawing.Point(100, 18);
- this.txt_pba013.Name = "txt_pba013";
- this.txt_pba013.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_pba013.Properties.Appearance.Options.UseFont = true;
- this.txt_pba013.Size = new System.Drawing.Size(180, 28);
- this.txt_pba013.TabIndex = 258;
- //
// gv_pba013
//
this.gv_pba013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -976,15 +963,6 @@
this.lb_pba001.Size = new System.Drawing.Size(34, 21);
this.lb_pba001.TabIndex = 216;
this.lb_pba001.Text = "浜х嚎";
- //
- // txt_pba016
- //
- this.txt_pba016.Location = new System.Drawing.Point(100, 49);
- this.txt_pba016.Name = "txt_pba016";
- this.txt_pba016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_pba016.Properties.Appearance.Options.UseFont = true;
- this.txt_pba016.Size = new System.Drawing.Size(180, 28);
- this.txt_pba016.TabIndex = 216;
//
// toolBarMenu1
//
@@ -1109,6 +1087,8 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_pba016);
+ this.panel1.Controls.Add(this.txt_pba013);
this.panel1.Controls.Add(this.txt_hNo);
this.panel1.Controls.Add(this.labelControl1);
this.panel1.Controls.Add(this.btnSelect);
@@ -1121,19 +1101,33 @@
this.panel1.Controls.Add(this.txt_checkDate);
this.panel1.Controls.Add(this.lb_fstatus);
this.panel1.Controls.Add(this.lb_pba013);
- this.panel1.Controls.Add(this.txt_pba013);
this.panel1.Controls.Add(this.lb_pba010);
this.panel1.Controls.Add(this.txt_pba015);
this.panel1.Controls.Add(this.lb_pba009);
this.panel1.Controls.Add(this.txt_pba009);
this.panel1.Controls.Add(this.lb_pba001);
- this.panel1.Controls.Add(this.txt_pba016);
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(1126, 157);
this.panel1.TabIndex = 1;
+ //
+ // txt_pba016
+ //
+ this.txt_pba016.IsReadly = false;
+ this.txt_pba016.Location = new System.Drawing.Point(100, 49);
+ this.txt_pba016.Name = "txt_pba016";
+ this.txt_pba016.Size = new System.Drawing.Size(180, 28);
+ this.txt_pba016.TabIndex = 460;
+ //
+ // txt_pba013
+ //
+ this.txt_pba013.IsReadly = false;
+ this.txt_pba013.Location = new System.Drawing.Point(100, 18);
+ this.txt_pba013.Name = "txt_pba013";
+ this.txt_pba013.Size = new System.Drawing.Size(180, 28);
+ this.txt_pba013.TabIndex = 459;
//
// txt_hNo
//
@@ -1192,6 +1186,16 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "绾夸綋ID";
+ this.gridColumn3.FieldName = "daa015";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 35;
+ this.gridColumn3.Width = 94;
+ //
// Frm_Wompba
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1204,16 +1208,15 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pba013.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba015.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pba016.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1259,7 +1262,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa017;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa016;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa013;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
@@ -1291,7 +1293,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
private DevExpress.XtraEditors.LabelControl lb_pba013;
- private DevExpress.XtraEditors.TextEdit txt_pba013;
private DevExpress.XtraGrid.Columns.GridColumn gv_pba013;
private DevExpress.XtraEditors.LabelControl lb_pba010;
@@ -1304,7 +1305,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
private DevExpress.XtraEditors.LabelControl lb_pba001;
- private DevExpress.XtraEditors.TextEdit txt_pba016;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraEditors.SimpleButton btnSelect;
@@ -1316,5 +1316,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private UserControl.UcLookWorkshop txt_pba013;
+ private UserControl.UcLookWorkline txt_pba016;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ 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 fc3e2b6..1f7d248 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -1,3 +1,5 @@
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -46,10 +48,16 @@
Rectangle r = new Rectangle(gridView1.GridControl.Width / 2 - 100, e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
+ txt_pba013.EditChanged += (s, e) =>
+ {
+ string workGuid = this.txt_pba013.GetGuid();
+ txt_pba016.getSuppler(workGuid);
+ _getListJybz(workGuid);
+ };
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
- if (string.IsNullOrEmpty(this.txt_pba013.Text))
+ if (string.IsNullOrEmpty(this.txt_pba013.GetId()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
return;
@@ -85,6 +93,8 @@
};
frm.ShowDialog();
};
+
+
}
/// <summary>
@@ -242,7 +252,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_hNo, gridView1,"hNo");
+ lbGuid, txt_hNo, gridView1, "hNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -325,19 +335,32 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
- // txt_account.Focus();
- // return;
- //}
- var _sb = new StringBuilder();
+ string workId = txt_pba013.GetId();
+ if (string.IsNullOrEmpty(workId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
+ txt_pba013.Focus();
+ return;
+ }
+ string lineId = txt_pba016.GetId();
+ if (string.IsNullOrEmpty(lineId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浜х嚎锛�");
+ txt_pba016.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_pba015.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璁″垝浜烘暟涓嶈兘涓虹┖锛�");
+ txt_pba015.Focus();
+ return;
+ }
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
bz = txt_pba009.Text.Trim(),
- cjId = 1,
- cxId = 1,
+ cjId = workId,
+ cxId = lineId,
jhrs = txt_pba015.Text.Trim(),
list = new List<dynamic>(),
};
@@ -522,5 +545,51 @@
}
}
}
+
+ private void _getListJybz(string workGuid)
+ {
+ if (string.IsNullOrEmpty(workGuid))
+ return;
+ var _obj = new
+ {
+ guid = workGuid //涓诲缓
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ "SysDepartmentManager/GetModel", json);
+ var _job = JObject.Parse(strReturn);
+ var array = new JArray();
+ var d = _job["rtnData"]["list"];
+ foreach (var a in d) array.Add(a);
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYBZ.Items.Add((new CboItemEntity(dr["id"].ToString(), dr["name"].ToString())));
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ ComboBoxEdit comboBox = sender as ComboBoxEdit;
+ if (comboBox != null)
+ {
+ GridView myView = (gcMx1.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+ CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
+ string _val = _itm.Value.ToString();
+ string _txt = _itm.Text.ToString();
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.SetRowCellValue(dataIndex, "daa015LineName", _txt);
+ gvMx1.SetRowCellValue(dataIndex, "daa015", _val);
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 2a711c6..46e8be7 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -509,6 +509,29 @@
txt.Enabled = false;
continue;
}
+ //鑷畾杞﹂棿
+ if (colType is UcLookWorkshop)
+ {
+ var txt = colType as UcLookWorkshop;
+ txt.SetIdOrCode(strVal);
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
+ //鑷畾浜х嚎
+ if (colType is UcLookWorkline)
+ {
+ var txt = colType as UcLookWorkline;
+ txt.SetIdOrCode(strVal);
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
+
if (colType is SimpleButton)
{
var txt = colType as SimpleButton;
@@ -641,6 +664,22 @@
txt.Enabled = !isEdt;
continue;
}
+ //鑷畾杞﹂棿
+ if (ctrl is UcLookWorkshop)
+ {
+ var txt = ctrl as UcLookWorkshop;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
+ //鑷畾浜х嚎
+ if (ctrl is UcLookWorkline)
+ {
+ var txt = ctrl as UcLookWorkline;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
@@ -755,6 +794,26 @@
txt.Enabled = false;
continue;
}
+ //鑷畾涔夎溅闂�
+ if (ctrl is UcLookWorkshop)
+ {
+ var txt = ctrl as UcLookWorkshop;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
+ //鑷畾涔変骇绾�
+ if (ctrl is UcLookWorkline)
+ {
+ var txt = ctrl as UcLookWorkline;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs
index 281a94e..27f59cf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.Designer.cs
@@ -30,10 +30,10 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn5 = 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();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
this.SuspendLayout();
@@ -54,7 +54,7 @@
// searchLookUpEdit1View
//
this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn5,
+ this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
this.gridColumn4});
@@ -62,14 +62,6 @@
this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "浣跨敤缁勭粐";
- this.gridColumn5.FieldName = "fSubsidiary";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 0;
//
// gridColumn2
//
@@ -97,6 +89,14 @@
this.gridColumn4.FieldName = "guid";
this.gridColumn4.Name = "gridColumn4";
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浜х嚎ID";
+ this.gridColumn1.FieldName = "id";
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ //
// UcLookWorkline
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -114,9 +114,9 @@
private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier;
private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
index 7c95a9f..2712f12 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
@@ -21,16 +21,10 @@
{
InitializeComponent();
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
- lookSearchSupplier.EditValueChanged +=
- LookSearchSupplier_EditValueChanged;
+ lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged;
}
public bool IsReadly { get; set; }
- private string _KeyFile = "";
- public string KeyFile
- {
- get { return _KeyFile; }
- set { _KeyFile = value; }
- }
+
/// <summary>
/// 鏀瑰彉浜嬩欢
/// </summary>
@@ -44,6 +38,8 @@
public void getSuppler(string shopGuid)
{
+ if (string.IsNullOrEmpty(shopGuid))
+ return;
var _obj = new
{
guid = shopGuid //涓诲缓
@@ -52,18 +48,15 @@
try
{
var strReturn = UtilityHelper.HttpPost("",
- "MesWorkshopManager/GetModel", json);
+ "SysDepartmentManager/GetModel", json);
var _job = JObject.Parse(strReturn);
var array = new JArray();
var d = _job["rtnData"]["list"];
foreach (var a in d) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
lookSearchSupplier.Properties.DataSource = dt;
lookSearchSupplier.Properties.DisplayMember = "name";
- // lookSearchSupplier.Properties.ValueMember = "suppNo";
- lookSearchSupplier.Properties.ValueMember = KeyFile;
+ lookSearchSupplier.Properties.ValueMember = "id";
}
catch (Exception ex)
{
@@ -76,7 +69,7 @@
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
if (row != null)
{
- string id = row["guid"].ToString();
+ string id = row["id"].ToString();
return id;
}
return "";
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs
index 67f8291..435a237 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.Designer.cs
@@ -31,10 +31,10 @@
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();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
this.SuspendLayout();
@@ -74,25 +74,33 @@
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.FieldName = "workshopNo";
+ this.gridColumn2.FieldName = "departmentcode";
this.gridColumn2.MinWidth = 80;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 80;
//
// gridColumn3
//
this.gridColumn3.Caption = "杞﹂棿鍚嶇О";
- this.gridColumn3.FieldName = "name";
+ this.gridColumn3.FieldName = "departmentname";
this.gridColumn3.MinWidth = 100;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.VisibleIndex = 3;
this.gridColumn3.Width = 100;
//
// gridColumn4
@@ -100,14 +108,6 @@
this.gridColumn4.Caption = "guid";
this.gridColumn4.FieldName = "guid";
this.gridColumn4.Name = "gridColumn4";
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "杞﹂棿ID";
- this.gridColumn1.FieldName = "workshopId";
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
//
// UcLookWorkshop
//
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
index c601720..fd00759 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
@@ -22,20 +22,11 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
+ getSuppler();
}
public bool IsReadly { get; set; }
- private string _KeyFile = "";
-
- public string KeyFile
- {
- get { return _KeyFile; }
- set
- {
- _KeyFile = value;
- getSuppler();
- }
- }
+
/// <summary>
/// 鏀瑰彉浜嬩欢
/// </summary>
@@ -49,16 +40,16 @@
private void getSuppler()
{
- var pgq = new PageQueryModel(1, 999999, "workshop_no", "asc", "", " and is_status=1");
+ var pgq = new PageQueryModel(1, 999999, "a.departmentid", "asc", "", " and 1=1");
var json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn = UtilityHelper.HttpPost("", "MesWorkshopManager/GetListPage", json);
+ var strReturn = UtilityHelper.HttpPost("", "SysDepartmentManager/GetListPage", json);
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
lookSearchSupplier.Properties.DataSource = dt;
- lookSearchSupplier.Properties.DisplayMember = "name";
- lookSearchSupplier.Properties.ValueMember = KeyFile;
+ lookSearchSupplier.Properties.DisplayMember = "departmentname";
+ lookSearchSupplier.Properties.ValueMember = "departmentid";
}
catch (Exception ex)
{
@@ -71,7 +62,7 @@
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
if (row != null)
{
- string id = row["workid"].ToString();
+ string id = row["departmentid"].ToString();
return id;
}
return "";
@@ -81,7 +72,7 @@
var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
if (row != null)
{
- string id = row["workshopNo"].ToString();
+ string id = row["departmentcode"].ToString();
return id;
}
return "";
@@ -99,10 +90,19 @@
lookSearchSupplier.EditValue = null;
return;
}
- if (KeyFile.ToUpper() == "workid".ToUpper())
- lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
- else
- lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
+ lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ }
+
+
+ public string GetGuid()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["guid"].ToString();
+ return id;
+ }
+ return "";
}
}
}
--
Gitblit v1.9.3