From b7b95d84fe541040e5b86168265ecf8f87aaa54a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 26 三月 2025 10:48:38 +0800
Subject: [PATCH] 生产退料
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs | 3
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 219 ++++++++++++++++++---------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 6
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs | 142 +++++++++++++----
DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs | 44 ++++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 65 ++++---
6 files changed, 330 insertions(+), 149 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index ead2e7a..1a7d52a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -136,10 +136,10 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
@@ -206,6 +206,7 @@
//
this.toolBarMenu1.chkParameter = "0,0,0,0,000prc_cgdhd_submit";
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -686,7 +687,9 @@
//
this.txt_createBy.Location = new System.Drawing.Point(708, 12);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(191, 24);
+ this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(191, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 461;
this.txt_createBy.Tag = "readOnly";
@@ -695,7 +698,9 @@
//
this.txt_createDate.Location = new System.Drawing.Point(708, 44);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(191, 24);
+ this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_createDate.Size = new System.Drawing.Size(191, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 462;
this.txt_createDate.Tag = "readOnly";
@@ -704,7 +709,9 @@
//
this.txt_checkUser.Location = new System.Drawing.Point(1005, 12);
this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Size = new System.Drawing.Size(193, 24);
+ this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUser.Size = new System.Drawing.Size(193, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 463;
this.txt_checkUser.Tag = "readOnly";
@@ -713,7 +720,9 @@
//
this.txt_checkDate.Location = new System.Drawing.Point(1005, 44);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(193, 24);
+ this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkDate.Size = new System.Drawing.Size(193, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
@@ -722,7 +731,9 @@
//
this.txt_paperBillNo.Location = new System.Drawing.Point(708, 76);
this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Size = new System.Drawing.Size(191, 24);
+ this.txt_paperBillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_paperBillNo.Size = new System.Drawing.Size(191, 28);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 465;
//
@@ -1341,6 +1352,26 @@
this.gridColumn10.VisibleIndex = 16;
this.gridColumn10.Width = 94;
//
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "閫�l鏂欐椂闂�";
+ this.gridColumn12.FieldName = "returnDate";
+ this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 17;
+ this.gridColumn12.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "閫�鏂欎汉";
+ this.gridColumn13.FieldName = "returnBy";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 18;
+ this.gridColumn13.Width = 94;
+ //
// gvBtnAlawys
//
this.gvBtnAlawys.Caption = "閫�鏂�";
@@ -1361,26 +1392,6 @@
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
- //
- // gridColumn12
- //
- this.gridColumn12.Caption = "閫�l鏂欐椂闂�";
- this.gridColumn12.FieldName = "returnDate";
- this.gridColumn12.MinWidth = 25;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 17;
- this.gridColumn12.Width = 94;
- //
- // gridColumn13
- //
- this.gridColumn13.Caption = "閫�鏂欎汉";
- this.gridColumn13.FieldName = "returnBy";
- this.gridColumn13.MinWidth = 25;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 18;
- this.gridColumn13.Width = 94;
//
// gvMxDel
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
index 861d24d..c5bf444 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.Designer.cs
@@ -36,6 +36,7 @@
DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -79,6 +80,8 @@
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_receivingOrg = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.labl_guid = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -91,8 +94,10 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -108,6 +113,7 @@
this.gvMx2workNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
@@ -130,7 +136,6 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -162,6 +167,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.labl_guid)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -174,8 +181,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage2.SuspendLayout();
@@ -191,6 +200,7 @@
//
this.toolBarMenu1.chkParameter = "";
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -563,7 +573,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1346, 570);
- this.splitMx1.SplitterPosition = 107;
+ this.splitMx1.SplitterPosition = 144;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -581,6 +591,8 @@
this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_fstatus);
this.layoutMx1.Controls.Add(this.txt_guid);
+ this.layoutMx1.Controls.Add(this.txt_depotCode);
+ this.layoutMx1.Controls.Add(this.txt_receivingOrg);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem7,
@@ -589,7 +601,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(531, 330, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1346, 107);
+ this.layoutMx1.Size = new System.Drawing.Size(1346, 144);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -606,7 +618,7 @@
//
// txt_dhgRemark
//
- this.txt_dhgRemark.Location = new System.Drawing.Point(425, 76);
+ this.txt_dhgRemark.Location = new System.Drawing.Point(425, 108);
this.txt_dhgRemark.Name = "txt_dhgRemark";
this.txt_dhgRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_dhgRemark.Properties.Appearance.Options.UseFont = true;
@@ -721,6 +733,22 @@
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 597;
//
+ // txt_depotCode
+ //
+ this.txt_depotCode.Location = new System.Drawing.Point(99, 108);
+ this.txt_depotCode.Name = "txt_depotCode";
+ this.txt_depotCode.Size = new System.Drawing.Size(235, 24);
+ this.txt_depotCode.StyleController = this.layoutMx1;
+ this.txt_depotCode.TabIndex = 598;
+ //
+ // txt_receivingOrg
+ //
+ this.txt_receivingOrg.Location = new System.Drawing.Point(425, 76);
+ this.txt_receivingOrg.Name = "txt_receivingOrg";
+ this.txt_receivingOrg.Size = new System.Drawing.Size(235, 24);
+ this.txt_receivingOrg.StyleController = this.layoutMx1;
+ this.txt_receivingOrg.TabIndex = 599;
+ //
// layoutControlItem7
//
this.layoutControlItem7.Control = this.lbGuid;
@@ -758,8 +786,10 @@
this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
+ this.layoutControlItem12,
+ this.layoutControlItem13,
this.layoutControlItem11,
- this.layoutControlItem12});
+ this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -781,11 +811,14 @@
rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition3.Height = 100D;
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
- rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1325, 116);
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1325, 148);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -880,18 +913,6 @@
this.layoutControlItem10.Text = "浠撳簱鍚嶇О";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_dhgRemark;
- this.layoutControlItem11.Location = new System.Drawing.Point(326, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(652, 32);
- this.layoutControlItem11.Text = "澶囨敞璇存槑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_fstatus;
@@ -904,13 +925,46 @@
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_depotCode;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem13.Text = "浠撳簱缂栧彿";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_dhgRemark;
+ this.layoutControlItem11.Location = new System.Drawing.Point(326, 96);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(652, 32);
+ this.layoutControlItem11.Text = "澶囨敞璇存槑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_receivingOrg;
+ this.layoutControlItem14.Location = new System.Drawing.Point(326, 64);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(326, 32);
+ this.layoutControlItem14.Text = "鏀舵枡缁勭粐";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1346, 451);
+ this.tabMx.Size = new System.Drawing.Size(1346, 414);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage2,
@@ -920,7 +974,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1344, 419);
+ this.tabMxPage2.Size = new System.Drawing.Size(1344, 382);
this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
//
// gcMx1
@@ -929,13 +983,15 @@
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(1344, 419);
+ this.gcMx1.Size = new System.Drawing.Size(1344, 382);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
//
// gvMx1
//
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2guid,
this.gvMx2itemId,
@@ -1080,6 +1136,16 @@
this.gvMx2lineK3id.VisibleIndex = 8;
this.gvMx2lineK3id.Width = 94;
//
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "澶囨敞";
+ this.gridColumn10.FieldName = "dhgRemark";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 9;
+ this.gridColumn10.Width = 94;
+ //
// gridColumn5
//
this.gridColumn5.Caption = "寤虹珛鑰�";
@@ -1104,7 +1170,7 @@
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1344, 419);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1344, 370);
this.xtraTabPage3.Text = "鍏ュ簱鏉＄爜";
//
// gcMx2
@@ -1113,13 +1179,15 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1344, 419);
+ this.gcMx2.Size = new System.Drawing.Size(1344, 370);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
//
// gvMx2
//
+ this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1urgentFlag,
@@ -1342,16 +1410,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn10
- //
- this.gridColumn10.Caption = "澶囨敞";
- this.gridColumn10.FieldName = "dhgRemark";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 9;
- this.gridColumn10.Width = 94;
- //
// Frm_MesInvItemIns
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1393,6 +1451,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_receivingOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.labl_guid)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1405,8 +1465,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage2.ResumeLayout(false);
@@ -1471,7 +1533,6 @@
private DevExpress.XtraEditors.CheckEdit txt_fstatus;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem labl_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
@@ -1515,5 +1576,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraEditors.TextEdit txt_depotCode;
+ private DevExpress.XtraEditors.TextEdit txt_receivingOrg;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
index b5fd926..326bfd9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemIns.cs
@@ -144,7 +144,6 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
@@ -219,6 +218,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -237,6 +237,7 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 1b73e3c..248a3c9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -111,6 +111,9 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -122,6 +125,7 @@
this.gvMx1tld003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld004 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld005 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld006 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1tld009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -152,6 +156,7 @@
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -160,12 +165,12 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -217,6 +222,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -238,9 +246,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -645,7 +650,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 130);
+ this.btnSelect.Location = new System.Drawing.Point(12, 140);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -655,7 +660,7 @@
// txt_tbl023
//
this.txt_tbl023.IsReadly = false;
- this.txt_tbl023.Location = new System.Drawing.Point(84, 34);
+ this.txt_tbl023.Location = new System.Drawing.Point(84, 44);
this.txt_tbl023.Name = "txt_tbl023";
this.txt_tbl023.Size = new System.Drawing.Size(195, 28);
this.txt_tbl023.TabIndex = 462;
@@ -663,7 +668,7 @@
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(84, 98);
+ this.txt_tbl005.Location = new System.Drawing.Point(84, 108);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -679,7 +684,7 @@
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(355, 98);
+ this.txt_tbl006.Location = new System.Drawing.Point(355, 108);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
@@ -690,14 +695,14 @@
// txt_tbl002
//
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 66);
+ this.txt_tbl002.Location = new System.Drawing.Point(84, 76);
this.txt_tbl002.Name = "txt_tbl002";
this.txt_tbl002.Size = new System.Drawing.Size(195, 28);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(355, 66);
+ this.txt_workName.Location = new System.Drawing.Point(355, 76);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_workName.Properties.Appearance.Options.UseFont = true;
@@ -708,7 +713,7 @@
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(897, 34);
+ this.txt_tbl012.Location = new System.Drawing.Point(897, 44);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
@@ -719,7 +724,7 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 2);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
@@ -730,7 +735,7 @@
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(897, 130);
+ this.txt_rwd.Location = new System.Drawing.Point(897, 140);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
@@ -741,7 +746,7 @@
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(897, 2);
+ this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
@@ -752,7 +757,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(355, 2);
+ this.txt_itemName.Location = new System.Drawing.Point(355, 12);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
@@ -763,7 +768,7 @@
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(825, 66);
+ this.txt_tbl013.Location = new System.Drawing.Point(825, 76);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
@@ -773,7 +778,7 @@
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(626, 2);
+ this.txt_tbl009.Location = new System.Drawing.Point(626, 12);
this.txt_tbl009.Name = "txt_tbl009";
this.txt_tbl009.Size = new System.Drawing.Size(195, 24);
this.txt_tbl009.StyleController = this.layoutMx1;
@@ -782,7 +787,7 @@
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(626, 34);
+ this.txt_tbl010.Location = new System.Drawing.Point(626, 44);
this.txt_tbl010.Name = "txt_tbl010";
this.txt_tbl010.Size = new System.Drawing.Size(195, 24);
this.txt_tbl010.StyleController = this.layoutMx1;
@@ -791,7 +796,7 @@
//
// txt_tbl020
//
- this.txt_tbl020.Location = new System.Drawing.Point(554, 66);
+ this.txt_tbl020.Location = new System.Drawing.Point(554, 76);
this.txt_tbl020.Name = "txt_tbl020";
this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑";
this.txt_tbl020.Size = new System.Drawing.Size(267, 24);
@@ -801,7 +806,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(355, 34);
+ this.txt_daa003.Location = new System.Drawing.Point(355, 44);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Size = new System.Drawing.Size(195, 24);
this.txt_daa003.StyleController = this.layoutMx1;
@@ -819,7 +824,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(897, 98);
+ this.txt_daa014.Location = new System.Drawing.Point(897, 108);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Size = new System.Drawing.Size(196, 24);
this.txt_daa014.StyleController = this.layoutMx1;
@@ -1056,6 +1061,40 @@
this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
+ // lab_daa014
+ //
+ this.lab_daa014.Control = this.txt_daa014;
+ this.lab_daa014.Location = new System.Drawing.Point(813, 96);
+ this.lab_daa014.Name = "lab_daa014";
+ this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
+ this.lab_daa014.Size = new System.Drawing.Size(272, 32);
+ this.lab_daa014.Text = "鎶曟枡鍗曞彿";
+ this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_rwd;
+ this.layoutControlItem2.Location = new System.Drawing.Point(813, 128);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem2.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_tbl006;
+ this.layoutControlItem15.Location = new System.Drawing.Point(271, 96);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem15.Text = "澶囨敞璇存槑";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1091,6 +1130,8 @@
//
// gvMx1
//
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1tlid,
this.gridColumn3,
@@ -1099,6 +1140,7 @@
this.gvMx1tld003,
this.gvMx1tld004,
this.gvMx1tld005,
+ this.gridColumn13,
this.gvMx1tld006,
this.gvMx1tld007,
this.gvMx1tld009,
@@ -1199,17 +1241,27 @@
this.gvMx1tld005.VisibleIndex = 4;
this.gvMx1tld005.Width = 94;
//
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "宸查鏁伴噺";
+ this.gridColumn13.FieldName = "ylsl";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 5;
+ this.gridColumn13.Width = 94;
+ //
// gvMx1tld006
//
this.gvMx1tld006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1tld006.AppearanceCell.Options.UseFont = true;
this.gvMx1tld006.Caption = "宸查��鏁伴噺";
- this.gvMx1tld006.FieldName = "tld006";
+ this.gvMx1tld006.FieldName = "ytsl";
this.gvMx1tld006.MinWidth = 50;
this.gvMx1tld006.Name = "gvMx1tld006";
this.gvMx1tld006.Tag = "query_a.tld006";
this.gvMx1tld006.Visible = true;
- this.gvMx1tld006.VisibleIndex = 5;
+ this.gvMx1tld006.VisibleIndex = 6;
this.gvMx1tld006.Width = 94;
//
// gvMx1tld007
@@ -1222,7 +1274,7 @@
this.gvMx1tld007.Name = "gvMx1tld007";
this.gvMx1tld007.Tag = "query_a.tld007";
this.gvMx1tld007.Visible = true;
- this.gvMx1tld007.VisibleIndex = 6;
+ this.gvMx1tld007.VisibleIndex = 7;
this.gvMx1tld007.Width = 94;
//
// gvMx1tld009
@@ -1243,7 +1295,7 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 7;
+ this.gridColumn1.VisibleIndex = 8;
this.gridColumn1.Width = 94;
//
// gridColumn2
@@ -1253,7 +1305,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.VisibleIndex = 9;
this.gridColumn2.Width = 94;
//
// gvMxDel
@@ -1263,7 +1315,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 9;
+ this.gvMxDel.VisibleIndex = 10;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1488,8 +1540,11 @@
//
// gvMx2
//
+ this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
+ this.gridColumn15,
this.gvMx1itemBarcode,
this.gridColumn4,
this.gridColumn9,
@@ -1498,6 +1553,9 @@
this.gridColumn7,
this.gvMx1createBy,
this.gvMx1lotDate,
+ this.gridColumn14,
+ this.gridColumn17,
+ this.gridColumn16,
this.gvBtnAlawys});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
@@ -1516,6 +1574,16 @@
this.gvMx1guid.Tag = "query_a.guid";
this.gvMx1guid.Width = 94;
//
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鏄惁鍏ュ簱";
+ this.gridColumn15.FieldName = "isRk";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 0;
+ this.gridColumn15.Width = 94;
+ //
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1526,7 +1594,7 @@
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
- this.gvMx1itemBarcode.VisibleIndex = 0;
+ this.gvMx1itemBarcode.VisibleIndex = 1;
this.gvMx1itemBarcode.Width = 300;
//
// gridColumn4
@@ -1536,7 +1604,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.VisibleIndex = 2;
this.gridColumn4.Width = 94;
//
// gridColumn9
@@ -1546,7 +1614,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 2;
+ this.gridColumn9.VisibleIndex = 3;
this.gridColumn9.Width = 94;
//
// gridColumn8
@@ -1556,7 +1624,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 3;
+ this.gridColumn8.VisibleIndex = 4;
this.gridColumn8.Width = 94;
//
// gvMx1quantity
@@ -1569,7 +1637,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 4;
+ this.gvMx1quantity.VisibleIndex = 5;
this.gvMx1quantity.Width = 94;
//
// gridColumn7
@@ -1579,7 +1647,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 5;
+ this.gridColumn7.VisibleIndex = 6;
this.gridColumn7.Width = 94;
//
// gvMx1createBy
@@ -1592,7 +1660,7 @@
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
- this.gvMx1createBy.VisibleIndex = 6;
+ this.gvMx1createBy.VisibleIndex = 7;
this.gvMx1createBy.Width = 94;
//
// gvMx1lotDate
@@ -1605,8 +1673,38 @@
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
- this.gvMx1lotDate.VisibleIndex = 7;
+ this.gvMx1lotDate.VisibleIndex = 8;
this.gvMx1lotDate.Width = 94;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "鍏ュ簱浜�";
+ this.gridColumn14.FieldName = "rkUser";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 9;
+ this.gridColumn14.Width = 94;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "鍏ュ簱浣�";
+ this.gridColumn17.FieldName = "rkPositon";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 10;
+ this.gridColumn17.Width = 94;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "鍏ュ簱鏃ユ湡";
+ this.gridColumn16.FieldName = "rkDate";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 11;
+ this.gridColumn16.Width = 94;
//
// gvBtnAlawys
//
@@ -1615,7 +1713,7 @@
this.gvBtnAlawys.MinWidth = 25;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 8;
+ this.gvBtnAlawys.VisibleIndex = 12;
this.gvBtnAlawys.Width = 94;
//
// repositoryItemButtonEdit2
@@ -1639,40 +1737,6 @@
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // lab_daa014
- //
- this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(813, 96);
- this.lab_daa014.Name = "lab_daa014";
- this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 3;
- this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
- this.lab_daa014.Size = new System.Drawing.Size(272, 32);
- this.lab_daa014.Text = "鎶曟枡鍗曞彿";
- this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_rwd;
- this.layoutControlItem2.Location = new System.Drawing.Point(813, 128);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem2.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_tbl006;
- this.layoutControlItem15.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(542, 32);
- this.layoutControlItem15.Text = "澶囨敞璇存槑";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// Frm_MesItemTbl
//
@@ -1735,6 +1799,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1757,9 +1824,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
this.ResumeLayout(false);
}
@@ -1882,5 +1946,10 @@
private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index a7d77aa..f2b47c2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -93,6 +93,7 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
catch (Exception ex)
{
@@ -514,6 +515,7 @@
}
private void getModel(string strGuid)
{
+ gcMx1.DataSource = null;
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -553,6 +555,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -570,6 +573,7 @@
gcMx2.DataSource = dt2;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
@@ -655,7 +659,7 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteBarcode",
+ "VArrivalBarcodeManager/DeleteBarcode",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
index 9443e90..395bd88 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectItemTbl.Designer.cs
@@ -37,6 +37,8 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
@@ -55,7 +57,7 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1034, 422);
+ this.gcMain.Size = new System.Drawing.Size(1034, 542);
this.gcMain.TabIndex = 6;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -75,6 +77,8 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn4,
+ this.gridColumn7,
+ this.gridColumn8,
this.gridColumn3,
this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
@@ -165,7 +169,7 @@
//
// gridColumn4
//
- this.gridColumn4.Caption = "宸插彂鏁伴噺";
+ this.gridColumn4.Caption = "宸查鏁伴噺";
this.gridColumn4.FieldName = "dab007";
this.gridColumn4.MaxWidth = 50;
this.gridColumn4.MinWidth = 50;
@@ -174,6 +178,30 @@
this.gridColumn4.VisibleIndex = 6;
this.gridColumn4.Width = 50;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "宸查��鏁伴噺";
+ this.gridColumn7.FieldName = "ytSl";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 7;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn8.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn8.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn8.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn8.Caption = "鍙��鏁伴噺";
+ this.gridColumn8.FieldName = "ktSl";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 8;
+ this.gridColumn8.Width = 94;
+ //
// gridColumn3
//
this.gridColumn3.Caption = "琛孖D";
@@ -181,7 +209,7 @@
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 7;
+ this.gridColumn3.VisibleIndex = 9;
this.gridColumn3.Width = 94;
//
// gridColumn2
@@ -191,7 +219,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.VisibleIndex = 10;
this.gridColumn2.Width = 94;
//
// panelControl1
@@ -199,7 +227,7 @@
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, 422);
+ this.panelControl1.Location = new System.Drawing.Point(0, 542);
this.panelControl1.Name = "panelControl1";
this.panelControl1.Size = new System.Drawing.Size(1034, 43);
this.panelControl1.TabIndex = 9;
@@ -232,13 +260,13 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1034, 465);
+ this.ClientSize = new System.Drawing.Size(1034, 585);
this.Controls.Add(this.gcMain);
this.Controls.Add(this.panelControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.Name = "SelectItemTbl";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "鐢熶骇閫�鏂欑敵璇烽�夋嫨鐗╂枡";
+ this.Text = "鐢熶骇閫�鏂欑敵璇凤紝鍙樉绀哄彲閫�鏁伴噺澶т簬0鐨�";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
@@ -262,5 +290,7 @@
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
}
}
\ No newline at end of file
--
Gitblit v1.9.3