From 0249c31d8a31f1dfb94915915b177ec4a3074d60 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 七月 2025 16:44:44 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs | 33 ++++
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs | 325 ++++++++++++++++++++++++++++-----------------
3 files changed, 237 insertions(+), 125 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 984722f..23164bc 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,9 +28,9 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index 2fcf88b..e96b3f4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -41,6 +41,7 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -74,6 +75,7 @@
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
this.btnZsm = new DevExpress.XtraEditors.SimpleButton();
+ this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -87,6 +89,7 @@
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_daa00111111 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -106,24 +109,28 @@
this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -154,6 +161,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -167,6 +175,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -185,12 +194,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.SuspendLayout();
@@ -449,7 +460,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1363, 570);
- this.splitMx1.SplitterPosition = 123;
+ this.splitMx1.SplitterPosition = 111;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -466,6 +477,7 @@
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_erpCheckBy);
this.layoutMx1.Controls.Add(this.btnZsm);
+ this.layoutMx1.Controls.Add(this.txt_daa001);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem3,
@@ -474,7 +486,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(656, 429, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1363, 123);
+ this.layoutMx1.Size = new System.Drawing.Size(1363, 111);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -491,7 +503,7 @@
this.txt_releaseNo.Location = new System.Drawing.Point(99, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(244, 24);
+ this.txt_releaseNo.Size = new System.Drawing.Size(239, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
//
@@ -505,77 +517,85 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(770, 12);
+ this.txt_itemName.Location = new System.Drawing.Point(759, 12);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(239, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 231;
//
// txt_itemNo2
//
- this.txt_itemNo2.Location = new System.Drawing.Point(434, 12);
+ this.txt_itemNo2.Location = new System.Drawing.Point(429, 12);
this.txt_itemNo2.Name = "txt_itemNo2";
- this.txt_itemNo2.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemNo2.Size = new System.Drawing.Size(239, 24);
this.txt_itemNo2.StyleController = this.layoutMx1;
this.txt_itemNo2.TabIndex = 232;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(770, 46);
+ this.txt_createBy.Location = new System.Drawing.Point(759, 43);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(245, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(239, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 233;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(1106, 46);
+ this.txt_createDate.Location = new System.Drawing.Point(1089, 43);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(245, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(241, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 234;
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(99, 46);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(99, 43);
this.txt_fbatchQty.Name = "txt_fbatchQty";
- this.txt_fbatchQty.Size = new System.Drawing.Size(244, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(239, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 236;
//
// txt_mrmodeTxt
//
- this.txt_mrmodeTxt.Location = new System.Drawing.Point(434, 46);
+ this.txt_mrmodeTxt.Location = new System.Drawing.Point(429, 43);
this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
- this.txt_mrmodeTxt.Size = new System.Drawing.Size(245, 24);
+ this.txt_mrmodeTxt.Size = new System.Drawing.Size(239, 24);
this.txt_mrmodeTxt.StyleController = this.layoutMx1;
this.txt_mrmodeTxt.TabIndex = 237;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(1106, 12);
+ this.txt_itemModel.Location = new System.Drawing.Point(1089, 12);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(245, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(241, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 238;
//
// txt_erpCheckBy
//
- this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 80);
+ this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 74);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(244, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(239, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
// btnZsm
//
this.btnZsm.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insert_16x16;
- this.btnZsm.Location = new System.Drawing.Point(347, 80);
+ this.btnZsm.Location = new System.Drawing.Point(342, 74);
this.btnZsm.Name = "btnZsm";
this.btnZsm.Size = new System.Drawing.Size(116, 27);
this.btnZsm.StyleController = this.layoutMx1;
this.btnZsm.TabIndex = 242;
this.btnZsm.Text = "鐢熸垚杩芥函鐮�";
+ //
+ // txt_daa001
+ //
+ this.txt_daa001.Location = new System.Drawing.Point(759, 74);
+ this.txt_daa001.Name = "txt_daa001";
+ this.txt_daa001.Size = new System.Drawing.Size(239, 24);
+ this.txt_daa001.StyleController = this.layoutMx1;
+ this.txt_daa001.TabIndex = 243;
//
// layoutControlItem3
//
@@ -612,7 +632,8 @@
this.layoutControlItem7,
this.layoutControlItem11,
this.layoutControlItem14,
- this.layoutControlItem8});
+ this.layoutControlItem8,
+ this.txt_daa00111111});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -638,7 +659,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1363, 123);
+ this.Root.Size = new System.Drawing.Size(1342, 113);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -646,107 +667,118 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(335, 34);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo2;
- this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem5.Text = "浜у搧缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemName;
- this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem2.Text = "浜у搧鍚嶇О";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(671, 34);
+ this.layoutControlItem6.Location = new System.Drawing.Point(660, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem6.Text = "寮�鍗曚汉";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 34);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem9.Text = "闇�杩斿伐鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_mrmodeTxt;
- this.layoutControlItem10.Location = new System.Drawing.Point(335, 34);
+ this.layoutControlItem10.Location = new System.Drawing.Point(330, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem10.Text = "杩斿伐宸ュ簭";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(1007, 34);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem7.Text = "寮�鍗曟棩鏈�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(336, 34);
+ this.layoutControlItem11.Size = new System.Drawing.Size(332, 31);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_erpCheckBy;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 68);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(335, 35);
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.btnZsm;
- this.layoutControlItem8.Location = new System.Drawing.Point(335, 68);
+ this.layoutControlItem8.Location = new System.Drawing.Point(330, 62);
this.layoutControlItem8.MaxSize = new System.Drawing.Size(120, 31);
this.layoutControlItem8.MinSize = new System.Drawing.Size(86, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(336, 35);
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 31);
this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem8.Text = "鐢熸垚杩芥函鐮�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
+ //
+ // txt_daa00111111
+ //
+ this.txt_daa00111111.Control = this.txt_daa001;
+ this.txt_daa00111111.Location = new System.Drawing.Point(660, 62);
+ this.txt_daa00111111.Name = "txt_daa00111111";
+ this.txt_daa00111111.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.txt_daa00111111.OptionsTableLayoutItem.RowIndex = 2;
+ this.txt_daa00111111.Size = new System.Drawing.Size(330, 31);
+ this.txt_daa00111111.Text = "宸ュ崟Guid";
+ this.txt_daa00111111.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
@@ -754,7 +786,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1363, 435);
+ this.tabMx.Size = new System.Drawing.Size(1363, 447);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -764,7 +796,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1361, 403);
+ this.tabMxPage1.Size = new System.Drawing.Size(1361, 415);
this.tabMxPage1.Text = "鍗℃澘鏄庣粏";
//
// gcMx1
@@ -773,7 +805,7 @@
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(1361, 403);
+ this.gcMx1.Size = new System.Drawing.Size(1361, 415);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -904,6 +936,7 @@
this.layoutMx100.Controls.Add(this.txt_yQty98);
this.layoutMx100.Controls.Add(this.txt_kQty98);
this.layoutMx100.Controls.Add(this.txt_iCount_98);
+ this.layoutMx100.Controls.Add(this.txt_printRemark98);
this.layoutMx100.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx100.Location = new System.Drawing.Point(0, 0);
this.layoutMx100.Name = "layoutMx100";
@@ -917,11 +950,11 @@
//
this.ucBtnPrint98.allClickKey = null;
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(1084, 12);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(1127, 12);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(265, 32);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(222, 32);
this.ucBtnPrint98.TabIndex = 9;
//
// txt_zQty98
@@ -929,35 +962,43 @@
this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
this.txt_zQty98.Name = "txt_zQty98";
this.txt_zQty98.Properties.ReadOnly = true;
- this.txt_zQty98.Size = new System.Drawing.Size(162, 24);
+ this.txt_zQty98.Size = new System.Drawing.Size(117, 24);
this.txt_zQty98.StyleController = this.layoutMx100;
this.txt_zQty98.TabIndex = 4;
//
// txt_yQty98
//
- this.txt_yQty98.Location = new System.Drawing.Point(382, 12);
+ this.txt_yQty98.Location = new System.Drawing.Point(337, 12);
this.txt_yQty98.Name = "txt_yQty98";
this.txt_yQty98.Properties.ReadOnly = true;
- this.txt_yQty98.Size = new System.Drawing.Size(162, 24);
+ this.txt_yQty98.Size = new System.Drawing.Size(117, 24);
this.txt_yQty98.StyleController = this.layoutMx100;
this.txt_yQty98.TabIndex = 5;
//
// txt_kQty98
//
- this.txt_kQty98.Location = new System.Drawing.Point(650, 12);
+ this.txt_kQty98.Location = new System.Drawing.Point(560, 12);
this.txt_kQty98.Name = "txt_kQty98";
this.txt_kQty98.Properties.ReadOnly = true;
- this.txt_kQty98.Size = new System.Drawing.Size(162, 24);
+ this.txt_kQty98.Size = new System.Drawing.Size(117, 24);
this.txt_kQty98.StyleController = this.layoutMx100;
this.txt_kQty98.TabIndex = 6;
//
// txt_iCount_98
//
- this.txt_iCount_98.Location = new System.Drawing.Point(918, 12);
+ this.txt_iCount_98.Location = new System.Drawing.Point(1006, 12);
this.txt_iCount_98.Name = "txt_iCount_98";
- this.txt_iCount_98.Size = new System.Drawing.Size(162, 24);
+ this.txt_iCount_98.Size = new System.Drawing.Size(117, 24);
this.txt_iCount_98.StyleController = this.layoutMx100;
this.txt_iCount_98.TabIndex = 7;
+ //
+ // txt_printRemark98
+ //
+ this.txt_printRemark98.Location = new System.Drawing.Point(783, 12);
+ this.txt_printRemark98.Name = "txt_printRemark98";
+ this.txt_printRemark98.Size = new System.Drawing.Size(117, 24);
+ this.txt_printRemark98.StyleController = this.layoutMx100;
+ this.txt_printRemark98.TabIndex = 10;
//
// layoutControlGroup1
//
@@ -968,7 +1009,8 @@
this.layoutControlItem43,
this.layoutControlItem44,
this.layoutControlItem45,
- this.layoutControlItem13});
+ this.layoutControlItem13,
+ this.layoutControlItem12});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -981,12 +1023,15 @@
columnDefinition8.Width = 100D;
columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6,
columnDefinition7,
columnDefinition8,
- columnDefinition9});
+ columnDefinition9,
+ columnDefinition10});
rowDefinition4.Height = 100D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
@@ -1001,7 +1046,7 @@
this.layoutControlItem42.CustomizationFormText = "宸ュ崟鎬婚噺";
this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem42.Name = "layoutControlItem42";
- this.layoutControlItem42.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem42.Size = new System.Drawing.Size(223, 36);
this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1010,10 +1055,10 @@
this.layoutControlItem43.Control = this.txt_yQty98;
this.layoutControlItem43.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem43.CustomizationFormText = "宸叉墦鍗版暟";
- this.layoutControlItem43.Location = new System.Drawing.Point(268, 0);
+ this.layoutControlItem43.Location = new System.Drawing.Point(223, 0);
this.layoutControlItem43.Name = "layoutControlItem43";
this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem43.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem43.Size = new System.Drawing.Size(223, 36);
this.layoutControlItem43.Text = "宸叉墦鍗版暟";
this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1022,10 +1067,10 @@
this.layoutControlItem44.Control = this.txt_kQty98;
this.layoutControlItem44.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
- this.layoutControlItem44.Location = new System.Drawing.Point(536, 0);
+ this.layoutControlItem44.Location = new System.Drawing.Point(446, 0);
this.layoutControlItem44.Name = "layoutControlItem44";
this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem44.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem44.Size = new System.Drawing.Size(223, 36);
this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1034,22 +1079,33 @@
this.layoutControlItem45.Control = this.txt_iCount_98;
this.layoutControlItem45.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem45.CustomizationFormText = "鏈鎵撳嵃寮犳暟";
- this.layoutControlItem45.Location = new System.Drawing.Point(804, 0);
+ this.layoutControlItem45.Location = new System.Drawing.Point(892, 0);
this.layoutControlItem45.Name = "layoutControlItem45";
- this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem45.Size = new System.Drawing.Size(268, 36);
+ this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem45.Size = new System.Drawing.Size(223, 36);
this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.ucBtnPrint98;
- this.layoutControlItem13.Location = new System.Drawing.Point(1072, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(1115, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(269, 36);
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 5;
+ this.layoutControlItem13.Size = new System.Drawing.Size(226, 36);
+ this.layoutControlItem13.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_printRemark98;
+ this.layoutControlItem12.Location = new System.Drawing.Point(669, 0);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(223, 36);
+ this.layoutControlItem12.Text = "鎵撳嵃澶囨敞";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// gcMx2
//
@@ -1068,31 +1124,32 @@
this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMx2.ColumnPanelRowHeight = 60;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn13,
+ this.gridColumn4,
this.gridColumn14,
this.gridColumn15,
this.gridColumn16,
this.gridColumn17,
this.gridColumn22,
this.gridColumn47,
- this.gridColumn48,
this.gridColumn12,
- this.gridColumn18});
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn8});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
this.gvMx2.OptionsView.ShowGroupPanel = false;
//
- // gridColumn13
+ // gridColumn4
//
- this.gridColumn13.Caption = "ERP涓ID";
- this.gridColumn13.FieldName = "ebelnK3id";
- this.gridColumn13.MinWidth = 25;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 46;
+ this.gridColumn4.Caption = "鏂扮殑杩芥函鐮�";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 0;
+ this.gridColumn4.Width = 146;
//
// gridColumn14
//
@@ -1111,8 +1168,8 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 2;
- this.gridColumn15.Width = 46;
+ this.gridColumn15.VisibleIndex = 6;
+ this.gridColumn15.Width = 69;
//
// gridColumn16
//
@@ -1121,8 +1178,8 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 3;
- this.gridColumn16.Width = 55;
+ this.gridColumn16.VisibleIndex = 7;
+ this.gridColumn16.Width = 82;
//
// gridColumn17
//
@@ -1133,64 +1190,76 @@
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Tag = "query_a.PRICING_QTY";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 4;
- this.gridColumn17.Width = 25;
+ this.gridColumn17.VisibleIndex = 8;
+ this.gridColumn17.Width = 56;
//
// gridColumn22
//
this.gridColumn22.AppearanceCell.Options.UseFont = true;
- this.gridColumn22.Caption = "鍒拌揣鏁伴噺";
+ this.gridColumn22.Caption = "鏁伴噺";
this.gridColumn22.FieldName = "quantity";
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 5;
- this.gridColumn22.Width = 25;
+ this.gridColumn22.VisibleIndex = 3;
+ this.gridColumn22.Width = 37;
//
// gridColumn47
//
- this.gridColumn47.Caption = "鏀舵枡浜�";
- this.gridColumn47.FieldName = "createBy";
+ this.gridColumn47.Caption = "鏃х殑杩芥函鐮�";
+ this.gridColumn47.FieldName = "barCode";
this.gridColumn47.MinWidth = 25;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 7;
- this.gridColumn47.Width = 43;
- //
- // gridColumn48
- //
- this.gridColumn48.Caption = "鏀舵枡鏃堕棿";
- this.gridColumn48.FieldName = "createDate";
- this.gridColumn48.MinWidth = 25;
- this.gridColumn48.Name = "gridColumn48";
- this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 8;
- this.gridColumn48.Width = 94;
+ this.gridColumn47.VisibleIndex = 1;
+ this.gridColumn47.Width = 67;
//
// gridColumn12
//
- this.gridColumn12.Caption = "鍒拌揣鍗曞彿";
+ this.gridColumn12.Caption = "缁戝畾鏃堕棿";
this.gridColumn12.FieldName = "dhdh";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 1;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.VisibleIndex = 5;
+ this.gridColumn12.Width = 146;
//
- // gridColumn18
+ // gridColumn5
//
- this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn18.Caption = "瀹炴敹鏁伴噺";
- this.gridColumn18.FieldName = "sjQuantity";
- this.gridColumn18.MinWidth = 25;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 6;
- this.gridColumn18.Width = 94;
+ this.gridColumn5.Caption = "缁戝畾浜�";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.Width = 146;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鎵樻澘鐮�";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 2;
+ this.gridColumn6.Width = 142;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鐢熶骇宸ュ崟";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 9;
+ this.gridColumn7.Width = 142;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "绾垮埆";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.Width = 156;
//
// Frm_WomFanGong
//
@@ -1200,7 +1269,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_WomFanGong";
- this.Text = "閲囪喘璁㈠崟";
+ this.Text = "杩斿伐杩芥函鐮�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -1230,6 +1299,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1243,6 +1313,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1261,12 +1332,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.ResumeLayout(false);
@@ -1331,16 +1404,13 @@
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
private DevExpress.XtraEditors.SimpleButton btnZsm;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.SplitContainerControl splitMx98;
@@ -1353,8 +1423,17 @@
private DevExpress.XtraEditors.TextEdit txt_iCount_98;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem44;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
private UserControl.UcBtnPrint ucBtnPrint98;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraEditors.TextEdit txt_daa001;
+ private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
+ private DevExpress.XtraEditors.TextEdit txt_printRemark98;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
index 3b8a6ab..387ee36 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.cs
@@ -67,6 +67,12 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
+
+ //杩欐槸杩芥函鐮�
+ this.ucBtnPrint98.btnPrintClick += (s, e) =>
+ {
+ _print98();
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -253,6 +259,33 @@
}
}
+ /// <summary>
+ /// 杩欐槸杩芥函鐮�
+ /// </summary>
+ private void _print98()
+ {
+ string rowGuid = txt_daa001.Text.Trim();
+ if (rowGuid.Length < 36)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+ this.ucBtnPrint98.rptParameter = "return false";
+ return;
+ }
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_98.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
+ txt_iCount_98.Focus();
+ this.ucBtnPrint98.rptParameter = "return false";
+ return;
+ }
+ this.ucBtnPrint98.rptParameter = "rpt_trace{"
+ + ""
+ + "," + txt_printRemark98.Text.Trim()
+ + "," + ""
+ + "," + txt_iCount_98.Text.Trim()
+ + "," + 1
+ + "}";
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3