From 0dcc33644c822962063832bfc5cd4d28118de781 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 26 六月 2025 17:01:56 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 95 +++++------
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 86 ++++++++++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 59 +++---
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 214 ++++++++++++++++++++++---
5 files changed, 342 insertions(+), 116 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index 411b475..e2f75d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -1,6 +1,4 @@
锘縰sing DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
-using DevExpress.XtraLayout.Customization;
using Gs.DevApp.DevFrm.BasicData;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -66,7 +64,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 32ec763..9bb61cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -90,7 +90,6 @@
this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
- this.txt_paperBillNo = new DevExpress.XtraEditors.ButtonEdit();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -106,7 +105,6 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lab_paperBillNo1111 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -149,6 +147,8 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -178,7 +178,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -194,7 +193,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo1111)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -204,6 +202,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -663,17 +663,6 @@
this.txt_guid.TabIndex = 466;
this.txt_guid.Tag = "readOnly";
//
- // txt_paperBillNo
- //
- this.txt_paperBillNo.Location = new System.Drawing.Point(704, 76);
- this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
- this.txt_paperBillNo.StyleController = this.layoutMx1;
- this.txt_paperBillNo.TabIndex = 467;
-
- //
// layoutControlItem18
//
this.layoutControlItem18.Control = this.lbGuid;
@@ -714,7 +703,7 @@
this.layoutControlItem5,
this.layoutControlItem17,
this.layoutControlItem16,
- this.lab_paperBillNo1111});
+ this.layoutControlItem4});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -875,17 +864,6 @@
this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
- //
- // lab_paperBillNo1111
- //
- this.lab_paperBillNo1111.Control = this.txt_paperBillNo;
- this.lab_paperBillNo1111.Location = new System.Drawing.Point(605, 64);
- this.lab_paperBillNo1111.Name = "lab_paperBillNo1111";
- this.lab_paperBillNo1111.OptionsTableLayoutItem.ColumnIndex = 2;
- this.lab_paperBillNo1111.OptionsTableLayoutItem.RowIndex = 2;
- this.lab_paperBillNo1111.Size = new System.Drawing.Size(303, 32);
- this.lab_paperBillNo1111.Text = "閫佽揣鍗曞彿";
- this.lab_paperBillNo1111.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -1383,6 +1361,25 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // txt_paperBillNo
+ //
+ this.txt_paperBillNo.Location = new System.Drawing.Point(704, 76);
+ this.txt_paperBillNo.Name = "txt_paperBillNo";
+ this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
+ this.txt_paperBillNo.StyleController = this.layoutMx1;
+ this.txt_paperBillNo.TabIndex = 467;
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_paperBillNo;
+ this.layoutControlItem4.Location = new System.Drawing.Point(605, 64);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem4.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1422,7 +1419,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1438,7 +1434,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo1111)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1448,6 +1443,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
this.ResumeLayout(false);
}
@@ -1546,7 +1543,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraEditors.ButtonEdit txt_paperBillNo;
- private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo1111;
+ private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 7e9005c..53b7e42 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -84,21 +84,53 @@
{
var lst = new List<string>();
lst = ee.StringList;
- var _obj = lst;
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "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++)
+ string strReturn = "";
+ ReturnModel<DataTable> dt;
+ #region 杩欐槸Srm鏉ョ殑鍗曞瓙
+ if (lst == null)
{
- _oldTable.ImportRow(sourceRows[i]);
+ string strSrmNo = "";
+ List<dynamic> lstSrm = new List<dynamic>();
+ lstSrm = ee.DynamicList;
+ strSrmNo = lstSrm[0].guid;
+ txt_paperBillNo.Text = strSrmNo;
+ var _obj = new
+ {
+ inShdh = strSrmNo,
+ inP1 = "",
+ inP2 = ""
+ };
+ strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectSrmTo", JsonConvert.SerializeObject(_obj));
+ dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _newTable;
+ gcMx1.ForceInitialize();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
}
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = _oldTable;
- gcMx1.ForceInitialize();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
+ #endregion
+ #region 杩欐槸鏅�氱殑鍗�
+ else
+ {
+ txt_paperBillNo.Text = "";
+ var _obj = lst;
+ strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectFormTo", JsonConvert.SerializeObject(_obj));
+ 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();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ }
+ #endregion
}
catch (Exception ex)
{
@@ -107,42 +139,7 @@
};
frm.ShowDialog();
};
- //閫夋嫨srm鏄庣粏
- txt_paperBillNo.ButtonClick += (s, e) =>
- {
- string strSrmNo = "";
- SelectSrm frm = new SelectSrm();
- frm.UpdateParent += (ss, ee) =>
- {
- var lst = new List<dynamic>();
- lst = ee.DynamicList;
- strSrmNo = lst[0].guid;
- txt_paperBillNo.Text = strSrmNo;
- txt_receiveOrgId.SetIdOrCode(lst[0].receiveOrgId);
- txt_suppId.SetIdOrCode(lst[0].suppId);
- var _obj = new
- {
- inShdh = strSrmNo,
- inP1 = "",
- inP2 = ""
- };
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectSrmTo", 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();
- gvMx1.PostEditor();
- gvMx1.UpdateCurrentRow();
- };
- frm.ShowDialog();
- };
+
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index e4516bf..7352f38 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -29,7 +29,14 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ 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.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -49,40 +56,74 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.gridControl2 = new DevExpress.XtraGrid.GridControl();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptSrm = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
this.label1 = new System.Windows.Forms.Label();
this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
- this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.btnIn = new DevExpress.XtraEditors.SimpleButton();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
+ ((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.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptSrm)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
this.panelControl3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
- this.panelControl1.SuspendLayout();
this.SuspendLayout();
//
// panelControl2
//
- this.panelControl2.Controls.Add(this.gcMain);
+ this.panelControl2.Controls.Add(this.xtraTabControl1);
this.panelControl2.Controls.Add(this.panelControl3);
- this.panelControl2.Controls.Add(this.panelControl1);
this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelControl2.Location = new System.Drawing.Point(0, 0);
this.panelControl2.Name = "panelControl2";
this.panelControl2.Size = new System.Drawing.Size(1128, 682);
this.panelControl2.TabIndex = 4;
//
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(2, 40);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1124, 640);
+ this.xtraTabControl1.TabIndex = 7;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.gcMain);
+ this.xtraTabPage1.Controls.Add(this.panelControl1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1122, 608);
+ this.xtraTabPage1.Text = "鏅�氬埌璐у崟";
+ //
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Location = new System.Drawing.Point(2, 40);
+ 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(1124, 597);
+ this.gcMain.Size = new System.Drawing.Size(1122, 565);
this.gcMain.TabIndex = 2;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -325,6 +366,121 @@
this.gridColumn1.VisibleIndex = 14;
this.gridColumn1.Width = 25;
//
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(0, 565);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1122, 43);
+ this.panelControl1.TabIndex = 5;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+ this.btnIn.Location = new System.Drawing.Point(1026, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.gridControl2);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1122, 608);
+ this.xtraTabPage2.Text = "SRM鍒拌揣鍗�";
+ //
+ // gridControl2
+ //
+ this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gridControl2.Location = new System.Drawing.Point(0, 0);
+ this.gridControl2.MainView = this.gridView2;
+ this.gridControl2.Name = "gridControl2";
+ this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.rptSrm});
+ this.gridControl2.Size = new System.Drawing.Size(1122, 608);
+ this.gridControl2.TabIndex = 4;
+ this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView2});
+ //
+ // gridView2
+ //
+ this.gridView2.Appearance.Row.Options.UseFont = true;
+ this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_operationTime,
+ this.gv_operationTable,
+ this.gv_userName,
+ this.gv_Btn});
+ this.gridView2.GridControl = this.gridControl2;
+ this.gridView2.Name = "gridView2";
+ this.gridView2.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView2.OptionsView.ShowAutoFilterRow = true;
+ this.gridView2.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "鏀舵枡缁勭粐";
+ this.gv_operationTime.FieldName = "orgName";
+ this.gv_operationTime.MinWidth = 10;
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Tag = "query_OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 300;
+ //
+ // gv_operationTable
+ //
+ this.gv_operationTable.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTable.Caption = "閫佽揣渚涘簲鍟�";
+ this.gv_operationTable.FieldName = "suppName";
+ this.gv_operationTable.MinWidth = 10;
+ this.gv_operationTable.Name = "gv_operationTable";
+ this.gv_operationTable.OptionsColumn.AllowEdit = false;
+ this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+ this.gv_operationTable.Visible = true;
+ this.gv_operationTable.VisibleIndex = 1;
+ this.gv_operationTable.Width = 100;
+ //
+ // gv_userName
+ //
+ this.gv_userName.AppearanceCell.Options.UseFont = true;
+ this.gv_userName.Caption = "閫佽揣鍗曞彿";
+ this.gv_userName.FieldName = "deliveryNo";
+ this.gv_userName.MinWidth = 10;
+ this.gv_userName.Name = "gv_userName";
+ this.gv_userName.OptionsColumn.AllowEdit = false;
+ this.gv_userName.Tag = "query_USER_NAME";
+ this.gv_userName.Visible = true;
+ this.gv_userName.VisibleIndex = 2;
+ this.gv_userName.Width = 250;
+ //
+ // gv_Btn
+ //
+ this.gv_Btn.Caption = "閫夋嫨";
+ this.gv_Btn.ColumnEdit = this.rptSrm;
+ this.gv_Btn.MinWidth = 25;
+ this.gv_Btn.Name = "gv_Btn";
+ this.gv_Btn.Visible = true;
+ this.gv_Btn.VisibleIndex = 3;
+ this.gv_Btn.Width = 94;
+ //
+ // rptSrm
+ //
+ this.rptSrm.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.rptSrm.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.rptSrm.Name = "rptSrm";
+ this.rptSrm.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.rptSrm.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptSrm_ButtonClick);
+ //
// panelControl3
//
this.panelControl3.Controls.Add(this.label1);
@@ -355,27 +511,6 @@
this.radioGroup1.Size = new System.Drawing.Size(197, 34);
this.radioGroup1.TabIndex = 0;
//
- // panelControl1
- //
- this.panelControl1.Controls.Add(this.btnIn);
- this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(2, 637);
- this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1124, 43);
- this.panelControl1.TabIndex = 5;
- //
- // btnIn
- //
- this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
- this.btnIn.Appearance.Options.UseBackColor = true;
- this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
- this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnIn.Location = new System.Drawing.Point(1028, 2);
- this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(94, 39);
- this.btnIn.TabIndex = 4;
- this.btnIn.Text = "纭畾瀵煎叆";
- //
// SelectCgMx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -391,14 +526,21 @@
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
this.panelControl2.ResumeLayout(false);
+ ((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.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptSrm)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
this.panelControl3.ResumeLayout(false);
this.panelControl3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
- this.panelControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -428,5 +570,15 @@
private DevExpress.XtraEditors.SimpleButton btnIn;
private System.Windows.Forms.Label label1;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraGrid.GridControl gridControl2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptSrm;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 72d4ae2..0d1dc73 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
using System;
@@ -57,6 +58,10 @@
{
getPageList(1);
};
+
+ /////////
+ getPageListSrm(1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView2, null, null, null, "", null, null, false);
}
/// <summary>
@@ -77,8 +82,8 @@
sortName = "",
keyWhere = "",
inBusType = (radioGroup1.SelectedIndex + 1),//1鏄噰璐紝2鏄澶�
- inSupId = this.suppId,
- inReceiveOrgId = this.receiveOrgId,
+ inSupId = this.suppId,//渚涘簲鍟�
+ inReceiveOrgId = this.receiveOrgId,//缁勭粐
};
var json = JsonConvert.SerializeObject(_obj);
try
@@ -97,5 +102,82 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
+ #region SRM鐨勫垪琛ㄥ拰閫夋嫨浜嬩欢
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageListSrm(int curPage)
+ {
+ var _obj = new
+ {
+ currentPage = curPage,
+ everyPageSize = 999999,
+ sortName = "",
+ keyWhere = "",
+ inBusType = (radioGroup1.SelectedIndex + 1),//1鏄噰璐紝2鏄澶�
+ inSupId = this.suppId,//渚涘簲鍟�
+ inReceiveOrgId = this.receiveOrgId,//缁勭粐
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesInvItemArnManager/SelectSrm", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gridControl2.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gridControl2.DataSource = dt;
+ gridControl2.ForceInitialize();
+ gridView2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gridControl2, gridView2);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ private void rptSrm_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gridView2.GetDataRow(rowhandle);
+ var mxGuid = dr["deliveryNo"].ToString();
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ return;
+ }
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ guid = mxGuid,
+ receiveOrgId = dr["receiveOrgId"].ToString(),
+ suppId = dr["suppId"].ToString(),
+ suppName = dr["suppName"].ToString(),
+ });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
+ }
+ }
+ #endregion
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3