From 9d87e32808597c5bb3e83c1275ff87bff11827d7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 23 十二月 2024 16:49:16 +0800
Subject: [PATCH] 委外
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 184 ++-----
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs | 455 +++++++------------
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs | 4
DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs | 450 +++++++++++++++++++
DevApp/Gs.DevApp/UserControl/SelectWwPc.resx | 120 +++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/UserControl/SelectWwPc.cs | 103 ++++
7 files changed, 923 insertions(+), 402 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index bfd5efa..aa11f7d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -511,6 +511,10 @@
}
}
+ /// <summary>
+ /// 鏍规嵁杞﹂棿璇讳骇绾�
+ /// </summary>
+ /// <param name="workGuid"></param>
private void _getListJybz(string workGuid)
{
if (string.IsNullOrEmpty(workGuid))
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
index a0413df..cc5e1ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -29,28 +29,23 @@
/// </summary>
private void InitializeComponent()
{
+ 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_WwPc));
this.gvMx1rwdGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1pcGuid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1departId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa013 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1pcTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1scheduleOrder = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1miCn = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1pcSh = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1pcId = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1wgUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1wgTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1blUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1blTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1blState = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1mesEndProd = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+ this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1unit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1eid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,8 +54,9 @@
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.lb_departId = new DevExpress.XtraEditors.LabelControl();
- this.txt_departId = new DevExpress.XtraEditors.TextEdit();
+ this.gvMxRemark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gv_departId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_wwDd = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_shState = new DevExpress.XtraEditors.LabelControl();
@@ -86,15 +82,19 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shTime.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).BeginInit();
@@ -119,9 +119,8 @@
this.gvMx1rwdGuid.FieldName = "rwdGuid";
this.gvMx1rwdGuid.MinWidth = 50;
this.gvMx1rwdGuid.Name = "gvMx1rwdGuid";
+ this.gvMx1rwdGuid.OptionsColumn.AllowEdit = false;
this.gvMx1rwdGuid.Tag = "query_a.rwdGuid";
- this.gvMx1rwdGuid.Visible = true;
- this.gvMx1rwdGuid.VisibleIndex = 25;
this.gvMx1rwdGuid.Width = 94;
//
// gvMx1pcGuid
@@ -132,49 +131,9 @@
this.gvMx1pcGuid.FieldName = "pcGuid";
this.gvMx1pcGuid.MinWidth = 50;
this.gvMx1pcGuid.Name = "gvMx1pcGuid";
+ this.gvMx1pcGuid.OptionsColumn.AllowEdit = false;
this.gvMx1pcGuid.Tag = "query_a.pcGuid";
- this.gvMx1pcGuid.Visible = true;
- this.gvMx1pcGuid.VisibleIndex = 24;
this.gvMx1pcGuid.Width = 94;
- //
- // gvMx1departId
- //
- this.gvMx1departId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1departId.AppearanceCell.Options.UseFont = true;
- this.gvMx1departId.Caption = "棰嗘枡閮ㄩ棬id ";
- this.gvMx1departId.FieldName = "departId";
- this.gvMx1departId.MinWidth = 50;
- this.gvMx1departId.Name = "gvMx1departId";
- this.gvMx1departId.Tag = "query_a.depart_id";
- this.gvMx1departId.Visible = true;
- this.gvMx1departId.VisibleIndex = 23;
- this.gvMx1departId.Width = 94;
- //
- // gvMx1daa013
- //
- this.gvMx1daa013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa013.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa013.Caption = "daa013 ";
- this.gvMx1daa013.FieldName = "daa013";
- this.gvMx1daa013.MinWidth = 50;
- this.gvMx1daa013.Name = "gvMx1daa013";
- this.gvMx1daa013.Tag = "query_a.daa013";
- this.gvMx1daa013.Visible = true;
- this.gvMx1daa013.VisibleIndex = 22;
- this.gvMx1daa013.Width = 94;
- //
- // gvMx1pcTime
- //
- this.gvMx1pcTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1pcTime.AppearanceCell.Options.UseFont = true;
- this.gvMx1pcTime.Caption = "鎺掍骇鏃堕棿 ";
- this.gvMx1pcTime.FieldName = "pcTime";
- this.gvMx1pcTime.MinWidth = 50;
- this.gvMx1pcTime.Name = "gvMx1pcTime";
- this.gvMx1pcTime.Tag = "query_a.pc_time";
- this.gvMx1pcTime.Visible = true;
- this.gvMx1pcTime.VisibleIndex = 21;
- this.gvMx1pcTime.Width = 94;
//
// gvMx1scheduleOrder
//
@@ -184,166 +143,82 @@
this.gvMx1scheduleOrder.FieldName = "scheduleOrder";
this.gvMx1scheduleOrder.MinWidth = 50;
this.gvMx1scheduleOrder.Name = "gvMx1scheduleOrder";
+ this.gvMx1scheduleOrder.OptionsColumn.AllowEdit = false;
this.gvMx1scheduleOrder.Tag = "query_a.schedule_order";
this.gvMx1scheduleOrder.Visible = true;
- this.gvMx1scheduleOrder.VisibleIndex = 20;
+ this.gvMx1scheduleOrder.VisibleIndex = 9;
this.gvMx1scheduleOrder.Width = 94;
- //
- // gvMx1miCn
- //
- this.gvMx1miCn.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1miCn.AppearanceCell.Options.UseFont = true;
- this.gvMx1miCn.Caption = "鍒嗛挓浜ц兘 ";
- this.gvMx1miCn.FieldName = "miCn";
- this.gvMx1miCn.MinWidth = 50;
- this.gvMx1miCn.Name = "gvMx1miCn";
- this.gvMx1miCn.Tag = "query_a.mi_cn";
- this.gvMx1miCn.Visible = true;
- this.gvMx1miCn.VisibleIndex = 19;
- this.gvMx1miCn.Width = 94;
- //
- // gvMx1pcSh
- //
- this.gvMx1pcSh.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1pcSh.AppearanceCell.Options.UseFont = true;
- this.gvMx1pcSh.Caption = "鎺掍骇瀹℃牳 ";
- this.gvMx1pcSh.FieldName = "pcSh";
- this.gvMx1pcSh.MinWidth = 50;
- this.gvMx1pcSh.Name = "gvMx1pcSh";
- this.gvMx1pcSh.Tag = "query_a.pc_sh";
- this.gvMx1pcSh.Visible = true;
- this.gvMx1pcSh.VisibleIndex = 18;
- this.gvMx1pcSh.Width = 94;
- //
- // gvMx1pcId
- //
- this.gvMx1pcId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1pcId.AppearanceCell.Options.UseFont = true;
- this.gvMx1pcId.Caption = "鎺掍骇id ";
- this.gvMx1pcId.FieldName = "pcId";
- this.gvMx1pcId.MinWidth = 50;
- this.gvMx1pcId.Name = "gvMx1pcId";
- this.gvMx1pcId.Tag = "query_a.pc_id";
- this.gvMx1pcId.Visible = true;
- this.gvMx1pcId.VisibleIndex = 17;
- this.gvMx1pcId.Width = 94;
- //
- // gvMx1wgUser
- //
- this.gvMx1wgUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1wgUser.AppearanceCell.Options.UseFont = true;
- this.gvMx1wgUser.Caption = "瀹屽伐浜� ";
- this.gvMx1wgUser.FieldName = "wgUser";
- this.gvMx1wgUser.MinWidth = 50;
- this.gvMx1wgUser.Name = "gvMx1wgUser";
- this.gvMx1wgUser.Tag = "query_a.wg_user";
- this.gvMx1wgUser.Visible = true;
- this.gvMx1wgUser.VisibleIndex = 16;
- this.gvMx1wgUser.Width = 94;
- //
- // gvMx1wgTime
- //
- this.gvMx1wgTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1wgTime.AppearanceCell.Options.UseFont = true;
- this.gvMx1wgTime.Caption = "瀹屽伐鏃堕棿 ";
- this.gvMx1wgTime.FieldName = "wgTime";
- this.gvMx1wgTime.MinWidth = 50;
- this.gvMx1wgTime.Name = "gvMx1wgTime";
- this.gvMx1wgTime.Tag = "query_a.wg_time";
- this.gvMx1wgTime.Visible = true;
- this.gvMx1wgTime.VisibleIndex = 15;
- this.gvMx1wgTime.Width = 94;
- //
- // gvMx1daa018
- //
- this.gvMx1daa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa018.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa018.Caption = "宸ュ崟鐘舵�� ";
- this.gvMx1daa018.FieldName = "daa018";
- this.gvMx1daa018.MinWidth = 50;
- this.gvMx1daa018.Name = "gvMx1daa018";
- this.gvMx1daa018.Tag = "query_a.daa018";
- this.gvMx1daa018.Visible = true;
- this.gvMx1daa018.VisibleIndex = 14;
- this.gvMx1daa018.Width = 94;
- //
- // gvMx1blUser
- //
- this.gvMx1blUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1blUser.AppearanceCell.Options.UseFont = true;
- this.gvMx1blUser.Caption = "澶囨枡浜� ";
- this.gvMx1blUser.FieldName = "blUser";
- this.gvMx1blUser.MinWidth = 50;
- this.gvMx1blUser.Name = "gvMx1blUser";
- this.gvMx1blUser.Tag = "query_a.bl_user";
- this.gvMx1blUser.Visible = true;
- this.gvMx1blUser.VisibleIndex = 13;
- this.gvMx1blUser.Width = 94;
- //
- // gvMx1blTime
- //
- this.gvMx1blTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1blTime.AppearanceCell.Options.UseFont = true;
- this.gvMx1blTime.Caption = "澶囨枡鏃堕棿 ";
- this.gvMx1blTime.FieldName = "blTime";
- this.gvMx1blTime.MinWidth = 50;
- this.gvMx1blTime.Name = "gvMx1blTime";
- this.gvMx1blTime.Tag = "query_a.bl_time";
- this.gvMx1blTime.Visible = true;
- this.gvMx1blTime.VisibleIndex = 12;
- this.gvMx1blTime.Width = 94;
- //
- // gvMx1blState
- //
- this.gvMx1blState.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1blState.AppearanceCell.Options.UseFont = true;
- this.gvMx1blState.Caption = "澶囨枡鐘舵�� ";
- this.gvMx1blState.FieldName = "blState";
- this.gvMx1blState.MinWidth = 50;
- this.gvMx1blState.Name = "gvMx1blState";
- this.gvMx1blState.Tag = "query_a.bl_state";
- this.gvMx1blState.Visible = true;
- this.gvMx1blState.VisibleIndex = 11;
- this.gvMx1blState.Width = 94;
//
// gvMx1mesEndProd
//
this.gvMx1mesEndProd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1mesEndProd.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1mesEndProd.AppearanceCell.Options.UseFont = true;
+ this.gvMx1mesEndProd.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1mesEndProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1mesEndProd.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1mesEndProd.Caption = "棰勮瀹屽伐鏃堕棿 ";
+ this.gvMx1mesEndProd.ColumnEdit = this.repositoryItemDateEdit2;
this.gvMx1mesEndProd.FieldName = "mesEndProd";
- this.gvMx1mesEndProd.MinWidth = 50;
+ this.gvMx1mesEndProd.MinWidth = 180;
this.gvMx1mesEndProd.Name = "gvMx1mesEndProd";
this.gvMx1mesEndProd.Tag = "query_a.mes_end_prod";
this.gvMx1mesEndProd.Visible = true;
- this.gvMx1mesEndProd.VisibleIndex = 10;
- this.gvMx1mesEndProd.Width = 94;
+ this.gvMx1mesEndProd.VisibleIndex = 7;
+ this.gvMx1mesEndProd.Width = 180;
+ //
+ // repositoryItemDateEdit2
+ //
+ this.repositoryItemDateEdit2.AutoHeight = false;
+ this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
//
// gvMx1mesStartProd
//
this.gvMx1mesStartProd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1mesStartProd.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1mesStartProd.AppearanceCell.Options.UseFont = true;
+ this.gvMx1mesStartProd.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1mesStartProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1mesStartProd.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1mesStartProd.Caption = "棰勮寮�宸ユ椂闂� ";
+ this.gvMx1mesStartProd.ColumnEdit = this.repositoryItemDateEdit1;
this.gvMx1mesStartProd.FieldName = "mesStartProd";
- this.gvMx1mesStartProd.MinWidth = 50;
+ this.gvMx1mesStartProd.MinWidth = 180;
this.gvMx1mesStartProd.Name = "gvMx1mesStartProd";
this.gvMx1mesStartProd.Tag = "query_a.mes_start_prod";
this.gvMx1mesStartProd.Visible = true;
- this.gvMx1mesStartProd.VisibleIndex = 9;
- this.gvMx1mesStartProd.Width = 94;
+ this.gvMx1mesStartProd.VisibleIndex = 6;
+ this.gvMx1mesStartProd.Width = 180;
//
- // gvMx1daa011
+ // repositoryItemDateEdit1
//
- this.gvMx1daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa011.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa011.Caption = "鐢熶骇鏁� ";
- this.gvMx1daa011.FieldName = "daa011";
- this.gvMx1daa011.MinWidth = 50;
- this.gvMx1daa011.Name = "gvMx1daa011";
- this.gvMx1daa011.Tag = "query_a.daa011";
- this.gvMx1daa011.Visible = true;
- this.gvMx1daa011.VisibleIndex = 8;
- this.gvMx1daa011.Width = 94;
+ this.repositoryItemDateEdit1.AutoHeight = false;
+ this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+ //
+ // gvMx1daa008
+ //
+ this.gvMx1daa008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa008.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa008.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1daa008.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMx1daa008.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMx1daa008.Caption = "鏈鎺掍骇鏁�";
+ this.gvMx1daa008.FieldName = "daa008";
+ this.gvMx1daa008.MinWidth = 50;
+ this.gvMx1daa008.Name = "gvMx1daa008";
+ this.gvMx1daa008.Tag = "yz_quantity_0";
+ this.gvMx1daa008.Visible = true;
+ this.gvMx1daa008.VisibleIndex = 5;
+ this.gvMx1daa008.Width = 94;
//
// gvMx1daa014
//
@@ -353,9 +228,10 @@
this.gvMx1daa014.FieldName = "daa014";
this.gvMx1daa014.MinWidth = 50;
this.gvMx1daa014.Name = "gvMx1daa014";
+ this.gvMx1daa014.OptionsColumn.AllowEdit = false;
this.gvMx1daa014.Tag = "query_a.daa014";
this.gvMx1daa014.Visible = true;
- this.gvMx1daa014.VisibleIndex = 7;
+ this.gvMx1daa014.VisibleIndex = 4;
this.gvMx1daa014.Width = 94;
//
// gvMx1unit
@@ -366,23 +242,25 @@
this.gvMx1unit.FieldName = "unit";
this.gvMx1unit.MinWidth = 50;
this.gvMx1unit.Name = "gvMx1unit";
+ this.gvMx1unit.OptionsColumn.AllowEdit = false;
this.gvMx1unit.Tag = "query_a.unit";
this.gvMx1unit.Visible = true;
- this.gvMx1unit.VisibleIndex = 6;
+ this.gvMx1unit.VisibleIndex = 3;
this.gvMx1unit.Width = 94;
//
- // gvMx1daa008
+ // gvMx1daa011
//
- this.gvMx1daa008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
- this.gvMx1daa008.Caption = "宸ュ崟鏁伴噺 ";
- this.gvMx1daa008.FieldName = "daa008";
- this.gvMx1daa008.MinWidth = 50;
- this.gvMx1daa008.Name = "gvMx1daa008";
- this.gvMx1daa008.Tag = "query_a.daa008";
- this.gvMx1daa008.Visible = true;
- this.gvMx1daa008.VisibleIndex = 5;
- this.gvMx1daa008.Width = 94;
+ this.gvMx1daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1daa011.AppearanceCell.Options.UseFont = true;
+ this.gvMx1daa011.Caption = "宸ュ崟鏁伴噺 ";
+ this.gvMx1daa011.FieldName = "daa011";
+ this.gvMx1daa011.MinWidth = 50;
+ this.gvMx1daa011.Name = "gvMx1daa011";
+ this.gvMx1daa011.OptionsColumn.AllowEdit = false;
+ this.gvMx1daa011.Tag = "query_a.daa008";
+ this.gvMx1daa011.Visible = true;
+ this.gvMx1daa011.VisibleIndex = 2;
+ this.gvMx1daa011.Width = 94;
//
// gvMx1daa003
//
@@ -392,9 +270,10 @@
this.gvMx1daa003.FieldName = "daa003";
this.gvMx1daa003.MinWidth = 50;
this.gvMx1daa003.Name = "gvMx1daa003";
+ this.gvMx1daa003.OptionsColumn.AllowEdit = false;
this.gvMx1daa003.Tag = "query_a.daa003";
this.gvMx1daa003.Visible = true;
- this.gvMx1daa003.VisibleIndex = 4;
+ this.gvMx1daa003.VisibleIndex = 1;
this.gvMx1daa003.Width = 94;
//
// gvMx1daa001
@@ -405,9 +284,10 @@
this.gvMx1daa001.FieldName = "daa001";
this.gvMx1daa001.MinWidth = 50;
this.gvMx1daa001.Name = "gvMx1daa001";
+ this.gvMx1daa001.OptionsColumn.AllowEdit = false;
this.gvMx1daa001.Tag = "query_a.daa001";
this.gvMx1daa001.Visible = true;
- this.gvMx1daa001.VisibleIndex = 3;
+ this.gvMx1daa001.VisibleIndex = 0;
this.gvMx1daa001.Width = 94;
//
// gvMx1eid
@@ -418,9 +298,8 @@
this.gvMx1eid.FieldName = "eid";
this.gvMx1eid.MinWidth = 50;
this.gvMx1eid.Name = "gvMx1eid";
+ this.gvMx1eid.OptionsColumn.AllowEdit = false;
this.gvMx1eid.Tag = "query_a.eid";
- this.gvMx1eid.Visible = true;
- this.gvMx1eid.VisibleIndex = 2;
this.gvMx1eid.Width = 94;
//
// gvMx1erpid
@@ -431,9 +310,8 @@
this.gvMx1erpid.FieldName = "erpid";
this.gvMx1erpid.MinWidth = 50;
this.gvMx1erpid.Name = "gvMx1erpid";
+ this.gvMx1erpid.OptionsColumn.AllowEdit = false;
this.gvMx1erpid.Tag = "query_a.erpid";
- this.gvMx1erpid.Visible = true;
- this.gvMx1erpid.VisibleIndex = 1;
this.gvMx1erpid.Width = 94;
//
// gvMx1id
@@ -444,16 +322,15 @@
this.gvMx1id.FieldName = "id";
this.gvMx1id.MinWidth = 50;
this.gvMx1id.Name = "gvMx1id";
+ this.gvMx1id.OptionsColumn.AllowEdit = false;
this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Visible = true;
- this.gvMx1id.VisibleIndex = 0;
this.gvMx1id.Width = 94;
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 414);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 441);
this.tabMxPage1.Text = "濮斿浠诲姟鍗曟槑缁�";
//
// gcMx1
@@ -462,40 +339,37 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 414);
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemDateEdit1,
+ this.repositoryItemDateEdit2});
+ this.gcMx1.Size = new System.Drawing.Size(1124, 441);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
+ this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1id,
this.gvMx1erpid,
this.gvMx1eid,
this.gvMx1daa001,
this.gvMx1daa003,
- this.gvMx1daa008,
+ this.gvMx1daa011,
this.gvMx1unit,
this.gvMx1daa014,
- this.gvMx1daa011,
+ this.gvMx1daa008,
this.gvMx1mesStartProd,
this.gvMx1mesEndProd,
- this.gvMx1blState,
- this.gvMx1blTime,
- this.gvMx1blUser,
- this.gvMx1daa018,
- this.gvMx1wgTime,
- this.gvMx1wgUser,
- this.gvMx1pcId,
- this.gvMx1pcSh,
- this.gvMx1miCn,
+ this.gvMxRemark,
this.gvMx1scheduleOrder,
- this.gvMx1pcTime,
- this.gvMx1daa013,
- this.gvMx1departId,
this.gvMx1pcGuid,
- this.gvMx1rwdGuid});
+ this.gvMx1rwdGuid,
+ this.gvMxDel});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -503,24 +377,40 @@
this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
- // lb_departId
+ // gvMxRemark
//
- this.lb_departId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_departId.Appearance.Options.UseFont = true;
- this.lb_departId.Location = new System.Drawing.Point(12, 54);
- this.lb_departId.Name = "lb_departId";
- this.lb_departId.Size = new System.Drawing.Size(68, 21);
- this.lb_departId.TabIndex = 228;
- this.lb_departId.Text = "棰嗘枡閮ㄩ棬";
+ this.gvMxRemark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gvMxRemark.AppearanceCell.Options.UseForeColor = true;
+ this.gvMxRemark.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gvMxRemark.AppearanceHeader.Options.UseForeColor = true;
+ this.gvMxRemark.Caption = "澶囨敞";
+ this.gvMxRemark.FieldName = "remark";
+ this.gvMxRemark.MinWidth = 100;
+ this.gvMxRemark.Name = "gvMxRemark";
+ this.gvMxRemark.Visible = true;
+ this.gvMxRemark.VisibleIndex = 8;
+ this.gvMxRemark.Width = 100;
//
- // txt_departId
+ // gvMxDel
//
- this.txt_departId.Location = new System.Drawing.Point(86, 50);
- this.txt_departId.Name = "txt_departId";
- this.txt_departId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_departId.Properties.Appearance.Options.UseFont = true;
- this.txt_departId.Size = new System.Drawing.Size(150, 28);
- this.txt_departId.TabIndex = 228;
+ this.gvMxDel.Caption = "绉诲嚭";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 10;
+ this.gvMxDel.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ 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, 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);
//
// gv_departId
//
@@ -554,7 +444,7 @@
//
this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shState.Appearance.Options.UseFont = true;
- this.lb_shState.Location = new System.Drawing.Point(245, 88);
+ this.lb_shState.Location = new System.Drawing.Point(494, 59);
this.lb_shState.Name = "lb_shState";
this.lb_shState.Size = new System.Drawing.Size(68, 21);
this.lb_shState.TabIndex = 222;
@@ -578,7 +468,7 @@
//
this.lb_shTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_shTime.Appearance.Options.UseFont = true;
- this.lb_shTime.Location = new System.Drawing.Point(245, 54);
+ this.lb_shTime.Location = new System.Drawing.Point(245, 59);
this.lb_shTime.Name = "lb_shTime";
this.lb_shTime.Size = new System.Drawing.Size(68, 21);
this.lb_shTime.TabIndex = 219;
@@ -586,7 +476,8 @@
//
// txt_shTime
//
- this.txt_shTime.Location = new System.Drawing.Point(322, 50);
+ this.txt_shTime.Enabled = false;
+ this.txt_shTime.Location = new System.Drawing.Point(322, 55);
this.txt_shTime.Name = "txt_shTime";
this.txt_shTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_shTime.Properties.Appearance.Options.UseFont = true;
@@ -619,6 +510,7 @@
//
// txt_shBy
//
+ this.txt_shBy.Enabled = false;
this.txt_shBy.Location = new System.Drawing.Point(322, 16);
this.txt_shBy.Name = "txt_shBy";
this.txt_shBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -680,6 +572,7 @@
//
// txt_hNo
//
+ this.txt_hNo.Enabled = false;
this.txt_hNo.Location = new System.Drawing.Point(86, 16);
this.txt_hNo.Name = "txt_hNo";
this.txt_hNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -807,10 +700,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 124);
+ this.tabMx.Location = new System.Drawing.Point(0, 97);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 446);
+ this.tabMx.Size = new System.Drawing.Size(1126, 473);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -822,8 +715,6 @@
this.panel1.Controls.Add(this.txt_shState);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_departId);
- this.panel1.Controls.Add(this.txt_departId);
this.panel1.Controls.Add(this.lb_shState);
this.panel1.Controls.Add(this.lb_shTime);
this.panel1.Controls.Add(this.txt_shTime);
@@ -835,12 +726,22 @@
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, 124);
+ this.panel1.Size = new System.Drawing.Size(1126, 97);
this.panel1.TabIndex = 1;
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(86, 55);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(128, 29);
+ this.btnSelect.TabIndex = 457;
+ this.btnSelect.Text = "閫夊彇鐢熸垚鎶曟枡鍗�";
//
// txt_shState
//
- this.txt_shState.Location = new System.Drawing.Point(319, 86);
+ this.txt_shState.Enabled = false;
+ this.txt_shState.Location = new System.Drawing.Point(568, 57);
this.txt_shState.Name = "txt_shState";
this.txt_shState.Properties.Caption = "";
this.txt_shState.Size = new System.Drawing.Size(94, 24);
@@ -876,15 +777,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // btnSelect
- //
- this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 84);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(128, 29);
- this.btnSelect.TabIndex = 457;
- this.btnSelect.Text = "閫夊彇鐢熸垚鎶曟枡鍗�";
- //
// Frm_WwPc
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -894,10 +786,14 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_WwPc";
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_departId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shTime.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).EndInit();
@@ -932,25 +828,13 @@
//BQCreateConrolObejct
private DevExpress.XtraGrid.Columns.GridColumn gvMx1rwdGuid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcGuid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1departId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa013;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcTime;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1scheduleOrder;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1miCn;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcSh;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcId;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1wgUser;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1wgTime;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa018;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1blUser;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1blTime;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1blState;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1mesEndProd;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1mesStartProd;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1unit;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa001;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1eid;
@@ -959,8 +843,6 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraEditors.LabelControl lb_departId;
- private DevExpress.XtraEditors.TextEdit txt_departId;
private DevExpress.XtraGrid.Columns.GridColumn gv_departId;
private DevExpress.XtraGrid.Columns.GridColumn gv_wwDd;
@@ -984,5 +866,10 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraEditors.CheckEdit txt_shState;
private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxRemark;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 4bc0234..c85610e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -1,7 +1,3 @@
-using DevExpress.RichEdit.Export;
-using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
-using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -46,50 +42,40 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
- //txt_pba013.EditChanged += (s, e) =>
- //{
- // string workGuid = this.txt_pba013.GetGuid();
- // _getListJybz(workGuid);
- //};
////閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
- //btnSelect.Click += (s, e) =>
- //{
- // if (string.IsNullOrEmpty(this.txt_pba013.GetId()))
- // {
- // Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨杞﹂棿锛屾墠鑳介�夋嫨浠诲姟鍗曪紒");
- // return;
- // }
- // var frm = new SelectWompba(this.txt_pba013.Text);
- // //璧嬪�肩粰鏄庣粏琛�
- // frm.UpdateParent += (ss, ee) =>
- // {
- // try
- // {
- // var lst = new List<string>();
- // lst = ee.StringList;
- // var _obj = lst;
- // var strReturn = UtilityHelper.HttpPost("",
- // "WompbaManager/SelectPbaToView",
- // JsonConvert.SerializeObject(_obj));
- // var dt = UtilityHelper.ReturnToList(strReturn);
- // DataTable _newTable = dt.rtnData;
- // DataTable _oldTable = (DataTable)gcMx1.DataSource;
- // DataRow[] sourceRows = _newTable.Select();
- // for (int i = 0; i < sourceRows.Length; i++)
- // {
- // _oldTable.ImportRow(sourceRows[i]);
- // }
- // gcMx1.BindingContext = new BindingContext();
- // gcMx1.DataSource = _oldTable;
- // gcMx1.ForceInitialize();
- // }
- // catch (Exception ex)
- // {
- // MessageBox.Show(ex.Message);
- // }
- // };
- // frm.ShowDialog();
- //};
+ btnSelect.Click += (s, e) =>
+ {
+ var frm = new SelectWwPc("");
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<string>();
+ lst = ee.StringList;
+ var _obj = lst;
+ var strReturn = UtilityHelper.HttpPost("",
+ "WWPCManager/SelectFormTo",
+ JsonConvert.SerializeObject(_obj));
+ var dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _oldTable;
+ gcMx1.ForceInitialize();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -266,25 +252,17 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- //string workId = txt_pba013.GetId();
- //if (string.IsNullOrEmpty(workId.Trim()))
- //{
- // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨杞﹂棿锛�");
- // txt_pba013.Focus();
- // return;
- //}
- //var _obj = new
- //{
- // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- // bz = txt_pba009.Text.Trim(),
- // cjId = workId,
- // list = new List<dynamic>(),
- //};
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ bz = "",
+ list = new List<dynamic>(),
+ };
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
- MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏄庣粏锛�");
return;
}
for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -292,13 +270,7 @@
var row = gvMx1.GetDataRow(i);
if (row != null)
{
- Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
- //string _LineId = row["daa015"].ToString();
- //if (string.IsNullOrEmpty(_LineId))
- //{
- // MsgHelper.ShowError("浜х嚎缂栫爜涓嶈兘涓虹┖锛�");
- // return;
- //}
+ Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
string _Pcsl = row["daa008"].ToString();
if (string.IsNullOrEmpty(_Pcsl))
{
@@ -311,64 +283,36 @@
MsgHelper.ShowError("棰勮寮�宸ユ椂闂翠笉鑳戒负绌猴紒");
return;
}
- //string _prepareTime = row["prepareTime"].ToString();
- //if (string.IsNullOrEmpty(_prepareTime))
- //{
- // MsgHelper.ShowError("棰勮澶囨枡鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
- //string _planPersonnel = row["planPersonnel"].ToString();
- //if (string.IsNullOrEmpty(_planPersonnel))
- //{
- // MsgHelper.ShowError("璁″垝浜烘暟锛�");
- // return;
- //}
- //string _changeLinetime = row["changeLinetime"].ToString();
- //if (string.IsNullOrEmpty(_changeLinetime))
- //{
- // MsgHelper.ShowError("鎹㈢嚎鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
string _mesEndProd = row["mesEndProd"].ToString();
if (string.IsNullOrEmpty(_mesEndProd))
{
MsgHelper.ShowError("棰勮瀹屽伐鏃堕棿涓嶈兘涓虹┖锛�");
return;
}
- //string _restTime = row["restTime"].ToString();
- //if (string.IsNullOrEmpty(_prepareTime))
- //{
- // MsgHelper.ShowError("浼戞伅鏃堕棿涓嶈兘涓虹┖锛�");
- // return;
- //}
- //_obj.list.Add(new
- //{
- // Guid = _guid,
- // AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
- // LineId = row["daa015"].ToString(),//浜х嚎id
- // Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
- // Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
- // Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
- // Bz = row["daa009"].ToString(),//澶囨敞
- // Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
- // Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
- // Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
- //});
+ _obj.list.Add(new
+ {
+ Guid = _guid,
+ AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["rwdGuid"].ToString()),//鐩稿綋浜巆aaGuid
+ Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
+ Bz = row["remark"].ToString(),//澶囨敞
+ Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
+ Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
+ });
}
}
try
{
- //string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- //ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- //ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- //if (_rtn.rtnCode > 0)
- //{
- // lbGuid.Text = _rtn.rtnData;
- // toolBarMenu1.isSetBtn = true;
- // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- // gvList.Add(gvMx1);
- // UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
- //}
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ {
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+ }
}
catch (Exception ex)
{
@@ -476,7 +420,6 @@
}
-
/// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
@@ -529,5 +472,10 @@
}
}
+
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 3fe86d3..dd9b7b1 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -659,6 +659,12 @@
<Compile Include="UserControl\SelectWompba.Designer.cs">
<DependentUpon>SelectWompba.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\SelectWwPc.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\SelectWwPc.Designer.cs">
+ <DependentUpon>SelectWwPc.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\ShowFile.cs">
<SubType>Form</SubType>
</Compile>
@@ -1035,6 +1041,9 @@
<EmbeddedResource Include="UserControl\SelectWompba.resx">
<DependentUpon>SelectWompba.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\SelectWwPc.resx">
+ <DependentUpon>SelectWwPc.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\ShowFile.resx">
<DependentUpon>ShowFile.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs
new file mode 100644
index 0000000..8504bd1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs
@@ -0,0 +1,450 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class SelectWwPc
+ {
+ /// <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()
+ {
+ 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_chk = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ 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();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ 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.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(920, 514);
+ this.xtraTabControl1.TabIndex = 5;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.panelControl1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(918, 482);
+ 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(918, 439);
+ this.gcMain.TabIndex = 1;
+ 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_chk,
+ this.gv_guid,
+ this.gridColumn2,
+ this.gv_ebelnK3id,
+ this.gridColumn12,
+ this.gv_billNo,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn1,
+ this.gv_supplierItemCode,
+ this.gv_supplierItemName,
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn8,
+ this.gridColumn7,
+ this.gridColumn9,
+ this.gv_purchaseUnit,
+ this.gv_inventoryUnit,
+ this.gv_remarks});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_chk
+ //
+ this.gv_chk.Caption = "閫夋嫨";
+ this.gv_chk.FieldName = "gvChk";
+ this.gv_chk.MinWidth = 60;
+ this.gv_chk.Name = "gv_chk";
+ this.gv_chk.Visible = true;
+ this.gv_chk.VisibleIndex = 0;
+ this.gv_chk.Width = 94;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.OptionsColumn.ReadOnly = true;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "ErpId";
+ this.gridColumn2.FieldName = "erpId";
+ this.gridColumn2.MinWidth = 80;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 94;
+ //
+ // gv_ebelnK3id
+ //
+ this.gv_ebelnK3id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_ebelnK3id.AppearanceCell.Options.UseFont = true;
+ this.gv_ebelnK3id.Caption = "浠诲姟鍗曞彿";
+ this.gv_ebelnK3id.FieldName = "orderNo";
+ this.gv_ebelnK3id.MinWidth = 100;
+ this.gv_ebelnK3id.Name = "gv_ebelnK3id";
+ this.gv_ebelnK3id.OptionsColumn.AllowEdit = false;
+ this.gv_ebelnK3id.OptionsColumn.ReadOnly = true;
+ this.gv_ebelnK3id.Tag = "query_a.EBELN_K3ID";
+ this.gv_ebelnK3id.Visible = true;
+ this.gv_ebelnK3id.VisibleIndex = 2;
+ this.gv_ebelnK3id.Width = 100;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "宸ュ崟鎬绘暟";
+ this.gridColumn12.FieldName = "workOrderQty";
+ this.gridColumn12.MinWidth = 80;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 3;
+ this.gridColumn12.Width = 94;
+ //
+ // gv_billNo
+ //
+ this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_billNo.AppearanceCell.Options.UseFont = true;
+ this.gv_billNo.Caption = "鏈帓鏁伴噺";
+ this.gv_billNo.FieldName = "caa012";
+ this.gv_billNo.MinWidth = 80;
+ this.gv_billNo.Name = "gv_billNo";
+ this.gv_billNo.OptionsColumn.AllowEdit = false;
+ this.gv_billNo.OptionsColumn.ReadOnly = true;
+ this.gv_billNo.Tag = "query_a.BILL_NO";
+ this.gv_billNo.Visible = true;
+ this.gv_billNo.VisibleIndex = 4;
+ this.gv_billNo.Width = 110;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "浠诲姟鍗曞彿";
+ this.gridColumn3.FieldName = "caa020";
+ this.gridColumn3.MinWidth = 125;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 125;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn4.FieldName = "caa001";
+ this.gridColumn4.MinWidth = 120;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
+ 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
+ //
+ this.gv_supplierItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
+ this.gv_supplierItemCode.FieldName = "wlbm";
+ this.gv_supplierItemCode.MinWidth = 100;
+ this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+ this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+ this.gv_supplierItemCode.Visible = true;
+ this.gv_supplierItemCode.VisibleIndex = 8;
+ this.gv_supplierItemCode.Width = 100;
+ //
+ // gv_supplierItemName
+ //
+ this.gv_supplierItemName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
+ this.gv_supplierItemName.FieldName = "wlmc";
+ this.gv_supplierItemName.MinWidth = 120;
+ this.gv_supplierItemName.Name = "gv_supplierItemName";
+ this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+ this.gv_supplierItemName.Visible = true;
+ this.gv_supplierItemName.VisibleIndex = 9;
+ this.gv_supplierItemName.Width = 120;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "wlgg";
+ this.gridColumn5.MinWidth = 250;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.Width = 250;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍗曚綅";
+ this.gridColumn6.FieldName = "dwName";
+ this.gridColumn6.MinWidth = 100;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 11;
+ this.gridColumn6.Width = 100;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "棰勮寮�鏃堕棿";
+ this.gridColumn8.FieldName = "caa010";
+ this.gridColumn8.MinWidth = 100;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.OptionsColumn.ReadOnly = true;
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 12;
+ this.gridColumn8.Width = 100;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "棰勮瀹屽伐鏃堕棿";
+ this.gridColumn7.FieldName = "caa011";
+ this.gridColumn7.MinWidth = 100;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.Width = 100;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "澶囨敞";
+ this.gridColumn9.FieldName = "caa016";
+ this.gridColumn9.MinWidth = 100;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 14;
+ this.gridColumn9.Width = 100;
+ //
+ // gv_purchaseUnit
+ //
+ 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.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.Width = 100;
+ //
+ // gv_inventoryUnit
+ //
+ 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.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.Width = 100;
+ //
+ // gv_remarks
+ //
+ this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_remarks.AppearanceCell.Options.UseFont = true;
+ this.gv_remarks.Caption = "閿�鍞崟鍙�";
+ this.gv_remarks.FieldName = "caa015";
+ this.gv_remarks.MinWidth = 100;
+ this.gv_remarks.Name = "gv_remarks";
+ this.gv_remarks.OptionsColumn.AllowEdit = false;
+ this.gv_remarks.OptionsColumn.ReadOnly = true;
+ this.gv_remarks.Tag = "query_a.REMARKS";
+ this.gv_remarks.Visible = true;
+ this.gv_remarks.VisibleIndex = 17;
+ this.gv_remarks.Width = 100;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Controls.Add(this.pageBar1);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(0, 439);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(918, 43);
+ this.panelControl1.TabIndex = 4;
+ //
+ // btnIn
+ //
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+ this.btnIn.Location = new System.Drawing.Point(2, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
+ this.pageBar1.Location = new System.Drawing.Point(-68, 2);
+ 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(984, 39);
+ this.pageBar1.TabIndex = 3;
+ this.pageBar1.TotalPages = 0;
+ //
+ // SelectWwPc
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(920, 514);
+ this.Controls.Add(this.xtraTabControl1);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectWwPc";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "SelectWwPc";
+ ((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();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ 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;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private UserControls.Data.UcPageBar pageBar1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWwPc.cs b/DevApp/Gs.DevApp/UserControl/SelectWwPc.cs
new file mode 100644
index 0000000..b04dc44
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectWwPc.cs
@@ -0,0 +1,103 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class SelectWwPc : DevExpress.XtraEditors.XtraForm
+ {
+ private readonly List<FilterEntity> _filterList =
+ new List<FilterEntity>();
+ private readonly string _webServiceName = "WWPCManager/";
+ private string lineId = "";
+ public SelectWwPc(string _lineId)
+ {
+ InitializeComponent();
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ getPageList(1, UtilityHelper.GetPageSize());
+ gridView1.IndicatorWidth = 50;
+ gridView1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
+ btnIn.Click += (s, e) =>
+ {
+ var list = new List<string>();
+ for (var i = 0; i < gridView1.DataRowCount; i++)
+ {
+ var checkBox = gridView1.GetRowCellDisplayText(i, "gvChk");
+ if (checkBox == "Checked")
+ {
+ var _guid = gridView1.GetRowCellValue(i, "guid")
+ .ToString();
+ list.Add(_guid);
+ }
+ }
+ UpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { StringList = list });
+ Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage, pageSize);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage, int pageSize)
+ {
+ var _obj = new
+ {
+ currentPage = curPage,
+ everyPageSize = pageSize,
+ sortName = "",
+ keyWhere = "",
+ inBusType = "CG",
+ lineId = this.lineId
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "SelectForm", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ var dddd = dd.rtnData.pages; //鎬婚〉
+ pageBar1.TotalPages = dddd;
+ pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
+ pageBar1.CurrentPage = curPage; //褰撳墠椤�
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWwPc.resx b/DevApp/Gs.DevApp/UserControl/SelectWwPc.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/SelectWwPc.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
--
Gitblit v1.9.3