From 58cb06f3c4d6d89cad0043ac04dfab504e2cd7f6 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:38 +0800
Subject: [PATCH] 打印
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 31 +++-
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 9 +
DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs | 13 +
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 208 +++++++++++++++++-----------------
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs | 4
DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 80 ++++++------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 2
8 files changed, 189 insertions(+), 159 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
index 3a0f6e3..253d349 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.Designer.cs
@@ -37,6 +37,7 @@
this.tooLoading = new System.Windows.Forms.ToolStripStatusLabel();
this.toolZhiChi = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTime = new System.Windows.Forms.ToolStripStatusLabel();
+ this.toolVersion = new System.Windows.Forms.ToolStripStatusLabel();
this.fluentDesignFormControl1 = new DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl();
this.barMy = new DevExpress.XtraBars.BarSubItem();
this.barExit = new DevExpress.XtraBars.BarButtonItem();
@@ -86,7 +87,8 @@
this.strp1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tooLoading,
this.toolZhiChi,
- this.toolTime});
+ this.toolTime,
+ this.toolVersion});
this.strp1.Location = new System.Drawing.Point(0, 701);
this.strp1.Name = "strp1";
this.strp1.Size = new System.Drawing.Size(1022, 26);
@@ -113,6 +115,13 @@
this.toolTime.Name = "toolTime";
this.toolTime.Size = new System.Drawing.Size(89, 20);
this.toolTime.Text = "鐧诲綍鏃堕棿";
+ //
+ // toolVersion
+ //
+ this.toolVersion.Image = global::Gs.DevApp.Properties.Resources.editrangepermission_16x16;
+ this.toolVersion.Name = "toolVersion";
+ this.toolVersion.Size = new System.Drawing.Size(89, 20);
+ this.toolVersion.Text = "鐗堟湰淇℃伅";
//
// fluentDesignFormControl1
//
@@ -190,7 +199,6 @@
this.barOrg.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.usergroup_16x161;
this.barOrg.Name = "barOrg";
this.barOrg.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
- this.barOrg.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
// repositoryItemCheckedComboBoxEdit1
//
@@ -301,5 +309,6 @@
private System.Windows.Forms.ToolStripStatusLabel toolZhiChi;
private DevExpress.XtraBars.BarEditItem barOrg;
private DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit repositoryItemCheckedComboBoxEdit1;
+ private System.Windows.Forms.ToolStripStatusLabel toolVersion;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index c20dd77..3aee6c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -95,6 +95,13 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
};
+
+ #region 鍔犱笂搴曢儴鎻愰啋
+ string _webApiUrl = ConfigurationManager.AppSettings["WebApiUrl"];
+ string _autoUpdate = (ConfigurationManager.AppSettings["IsAutoUpdater"]);
+ string _version = ConfigurationManager.AppSettings["Version"];
+ toolVersion.Text = "褰撳墠鐗堟湰:" + _version + "锛屾湇鍔″湴鍧�:" + _webApiUrl;
+ #endregion
}
/// <summary>
/// 鏄剧ず鍙抽敭鑿滃崟
@@ -172,7 +179,7 @@
/// </summary>
private void getTree()
{
- toolTime.Text = "鐧诲綍鏃堕棿" + LoginInfoModel.CurrentUser.LoginTime;
+ toolTime.Text = "鐧诲綍鏃堕棿:" + LoginInfoModel.CurrentUser.LoginTime;
var _obj = new
{
userGuid = LoginInfoModel.CurrentUser.LoginUserGuid,
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
index ad1a9d5..6a11fa5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/CKTmkc.cs
@@ -108,7 +108,6 @@
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
-
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index 1fe8703..3539b41 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -86,6 +86,7 @@
this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -400,7 +401,8 @@
this.gridColumn38,
this.gridColumn39,
this.gridColumn30,
- this.gridColumn34});
+ this.gridColumn34,
+ this.gridColumn19});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -428,7 +430,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "org.fnamber";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 13;
+ this.gridColumn8.VisibleIndex = 14;
this.gridColumn8.Width = 200;
//
// gv_caa001
@@ -566,7 +568,7 @@
this.gv_caa010.OptionsColumn.AllowEdit = false;
this.gv_caa010.Tag = "query_a.CAA010";
this.gv_caa010.Visible = true;
- this.gv_caa010.VisibleIndex = 14;
+ this.gv_caa010.VisibleIndex = 15;
this.gv_caa010.Width = 180;
//
// gv_caa011
@@ -579,7 +581,7 @@
this.gv_caa011.OptionsColumn.AllowEdit = false;
this.gv_caa011.Tag = "query_a.CAA011";
this.gv_caa011.Visible = true;
- this.gv_caa011.VisibleIndex = 15;
+ this.gv_caa011.VisibleIndex = 16;
this.gv_caa011.Width = 180;
//
// gv_saleOrderNo
@@ -624,7 +626,7 @@
this.gv_caa016.OptionsColumn.AllowEdit = false;
this.gv_caa016.Tag = "query_a.CAA016";
this.gv_caa016.Visible = true;
- this.gv_caa016.VisibleIndex = 16;
+ this.gv_caa016.VisibleIndex = 17;
this.gv_caa016.Width = 100;
//
// gridColumn7
@@ -684,7 +686,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 17;
+ this.gridColumn23.VisibleIndex = 18;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -734,7 +736,7 @@
this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 18;
+ this.gridColumn31.VisibleIndex = 19;
this.gridColumn31.Width = 94;
//
// gridColumn32
@@ -784,7 +786,7 @@
this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 19;
+ this.gridColumn38.VisibleIndex = 20;
this.gridColumn38.Width = 94;
//
// gridColumn39
@@ -802,7 +804,7 @@
this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 20;
+ this.gridColumn30.VisibleIndex = 21;
this.gridColumn30.Width = 94;
//
// gridColumn34
@@ -812,6 +814,16 @@
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "浜у搧瑙勬牸";
+ this.gridColumn19.FieldName = "itemModel";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 13;
+ this.gridColumn19.Width = 94;
//
// pageBar1
//
@@ -2264,5 +2276,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 781ccf8..f66ae88 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -1870,7 +1870,7 @@
this.gvMx1dab004.Name = "gvMx1dab004";
this.gvMx1dab004.Tag = "query_a.dab004";
this.gvMx1dab004.Visible = true;
- this.gvMx1dab004.VisibleIndex = 3;
+ this.gvMx1dab004.VisibleIndex = 4;
this.gvMx1dab004.Width = 89;
//
// gvMx1dab005
@@ -1882,7 +1882,7 @@
this.gvMx1dab005.Name = "gvMx1dab005";
this.gvMx1dab005.Tag = "query_a.dab005";
this.gvMx1dab005.Visible = true;
- this.gvMx1dab005.VisibleIndex = 4;
+ this.gvMx1dab005.VisibleIndex = 5;
this.gvMx1dab005.Width = 89;
//
// gvMx1dab006
@@ -2132,7 +2132,7 @@
this.gridColumn58.MinWidth = 25;
this.gridColumn58.Name = "gridColumn58";
this.gridColumn58.Visible = true;
- this.gridColumn58.VisibleIndex = 5;
+ this.gridColumn58.VisibleIndex = 3;
this.gridColumn58.Width = 94;
//
// xtraTabPage6
@@ -2600,11 +2600,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(654, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(662, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(317, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(321, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -2613,16 +2613,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2647,7 +2647,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2655,7 +2655,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2663,16 +2663,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(973, 10);
+ this.radOut.Location = new System.Drawing.Point(985, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2681,7 +2681,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(321, 32);
+ this.radOut.Size = new System.Drawing.Size(325, 32);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2689,29 +2689,29 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2719,11 +2719,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(420, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(424, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2734,7 +2734,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(234, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2744,7 +2744,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(230, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(234, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2772,7 +2772,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 323D;
+ columnDefinition11.Width = 328D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2786,7 +2786,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2794,21 +2794,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2818,12 +2818,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2836,18 +2836,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2857,21 +2857,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2881,7 +2881,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 2c9d410..a503c6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -91,6 +91,9 @@
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -160,9 +163,6 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -201,6 +201,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -244,9 +247,6 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -362,7 +362,7 @@
//
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "鎬ユ枡";
- this.gv_urgentFlag.FieldName = "urgentFlag";
+ this.gv_urgentFlag.FieldName = "urgentFlagTxt";
this.gv_urgentFlag.MaxWidth = 50;
this.gv_urgentFlag.MinWidth = 50;
this.gv_urgentFlag.Name = "gv_urgentFlag";
@@ -593,25 +593,25 @@
this.txt_gysNo.Location = new System.Drawing.Point(114, 40);
this.txt_gysNo.Name = "txt_gysNo";
this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
- this.txt_gysNo.Size = new System.Drawing.Size(219, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 467;
//
// txt_barcodeProgress
//
- this.txt_barcodeProgress.Location = new System.Drawing.Point(765, 68);
+ this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 68);
this.txt_barcodeProgress.Name = "txt_barcodeProgress";
this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
- this.txt_barcodeProgress.Size = new System.Drawing.Size(220, 24);
+ this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
this.txt_barcodeProgress.StyleController = this.layoutMx1;
this.txt_barcodeProgress.TabIndex = 342;
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(439, 12);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(220, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 463;
//
@@ -620,25 +620,25 @@
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(219, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(225, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(439, 40);
+ this.txt_gysName.Location = new System.Drawing.Point(445, 40);
this.txt_gysName.Name = "txt_gysName";
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(220, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(225, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 459;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(765, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(776, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(220, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(225, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 217;
//
@@ -647,34 +647,34 @@
this.txt_remark.Location = new System.Drawing.Point(114, 68);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(545, 24);
+ this.txt_remark.Size = new System.Drawing.Size(556, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(765, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(776, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(220, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(225, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 252;
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(989, 12);
+ this.txt_fType.Location = new System.Drawing.Point(1005, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(322, 24);
+ this.txt_fType.Size = new System.Drawing.Size(327, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 469;
//
// txt_urgentFlag
//
- this.txt_urgentFlag.Location = new System.Drawing.Point(989, 40);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 40);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
- this.txt_urgentFlag.Size = new System.Drawing.Size(322, 24);
+ this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
this.txt_urgentFlag.StyleController = this.layoutMx1;
this.txt_urgentFlag.TabIndex = 470;
//
@@ -730,7 +730,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1323, 104);
+ this.Root.Size = new System.Drawing.Size(1344, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -738,27 +738,27 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_paperBillNo;
- this.layoutControlItem4.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createBy;
- this.layoutControlItem7.Location = new System.Drawing.Point(651, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -766,21 +766,21 @@
//
this.layoutControlItem8.Control = this.txt_createDate;
this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.Location = new System.Drawing.Point(651, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(662, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fType;
- this.layoutControlItem10.Location = new System.Drawing.Point(977, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -788,11 +788,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_urgentFlag;
- this.layoutControlItem11.Location = new System.Drawing.Point(977, 28);
+ this.layoutControlItem11.Location = new System.Drawing.Point(993, 28);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -800,13 +800,45 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(651, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(662, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(326, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(331, 28);
this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_gysName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(331, 28);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_gysNo;
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(331, 28);
+ this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remark;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(662, 28);
+ this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -876,10 +908,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 89);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 35);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -926,7 +958,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition4});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 35);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -934,7 +966,7 @@
this.layoutControlItem26.Control = this.txt_iCount_1;
this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(168, 35);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -944,7 +976,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem27.Size = new System.Drawing.Size(168, 35);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -962,11 +994,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 48);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(340, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(340, 39);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
@@ -980,13 +1012,13 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(340, 32);
+ this.radOut.Size = new System.Drawing.Size(340, 38);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 50);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
@@ -1008,7 +1040,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 50);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1018,7 +1050,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 89);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1050,7 +1082,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 50);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1110,7 +1142,7 @@
rowDefinition5,
rowDefinition6,
rowDefinition7});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 136);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -1118,28 +1150,28 @@
this.layoutControlItem15.Control = this.txtWlid;
this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txtWlmc;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txtWlgg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 77);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(680, 39);
this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1149,18 +1181,18 @@
this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_yQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem19.Location = new System.Drawing.Point(340, 38);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem19.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1170,18 +1202,18 @@
this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_psnQty_1;
- this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(680, 38);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1192,7 +1224,7 @@
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 38);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1200,12 +1232,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem23.Location = new System.Drawing.Point(1020, 38);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1213,11 +1245,11 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem25.Location = new System.Drawing.Point(680, 77);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 39);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1466,7 +1498,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1342, 386);
+ this.tabMxPage2.Size = new System.Drawing.Size(1342, 423);
this.tabMxPage2.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
@@ -1475,7 +1507,7 @@
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(1342, 386);
+ this.gcMx2.Size = new System.Drawing.Size(1342, 423);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1643,38 +1675,6 @@
this.gridColumn24.VisibleIndex = 11;
this.gridColumn24.Width = 94;
//
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_gysName;
- this.layoutControlItem2.Location = new System.Drawing.Point(325, 28);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(326, 28);
- this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_gysNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 28);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
- this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remark;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 56);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(651, 28);
- this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
- //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1722,6 +1722,9 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1765,9 +1768,6 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index a442040..84c1b3a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -114,7 +114,7 @@
{
gcMain1.DataSource = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and cgOrg.fid in");
+ _sbSqlWhere.Append(" and org.fid in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
index c1afe79..0ce8265 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
@@ -150,7 +150,9 @@
{
gcMain.DataSource = null;
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), "workTechnique");
+
+ // var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), "workTechnique");
+ var pgq = new PageQueryModel(curPage, 5000, "item_no", "asc", "", _sbSqlWhere.ToString(), "workTechnique");
var json = JsonConvert.SerializeObject(pgq);
try
{
--
Gitblit v1.9.3