From a55730702b0b1b541d6ec40cac4469a2418936d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 20 十二月 2024 18:50:24 +0800
Subject: [PATCH] 工单打印
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 75 ++++++++++++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 266 +++++++++++++++++++++++++++++++-------------
2 files changed, 262 insertions(+), 79 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index fd4671e..d1de26f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -189,7 +189,7 @@
this.txt_daa003 = new DevExpress.XtraEditors.TextEdit();
this.gv_daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_daa002 = new DevExpress.XtraEditors.LabelControl();
- this.txt_daa002 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa029 = new DevExpress.XtraEditors.TextEdit();
this.gv_daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_daa001 = new DevExpress.XtraEditors.LabelControl();
this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
@@ -208,8 +208,10 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline();
this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
@@ -217,8 +219,14 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline();
- this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
+ this.labelControl4 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
+ this.labelControl5 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_daa028 = new DevExpress.XtraEditors.TextEdit();
+ this.lb_tbl013 = new DevExpress.XtraEditors.LabelControl();
+ this.txt_daa022 = new DevExpress.XtraEditors.TextEdit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -237,7 +245,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa005.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa002.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa029.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -248,10 +256,14 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa022.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx2suppId
@@ -1311,7 +1323,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 349);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 445);
this.tabMxPage2.Text = "鏉＄爜鏄庣粏";
//
// gcMx2
@@ -1320,7 +1332,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(1124, 349);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 445);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1771,7 +1783,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 349);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 445);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
@@ -1780,7 +1792,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(1124, 349);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 445);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1987,15 +1999,15 @@
//
this.lb_daa017.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa017.Appearance.Options.UseFont = true;
- this.lb_daa017.Location = new System.Drawing.Point(770, 52);
+ this.lb_daa017.Location = new System.Drawing.Point(762, 116);
this.lb_daa017.Name = "lb_daa017";
- this.lb_daa017.Size = new System.Drawing.Size(90, 21);
+ this.lb_daa017.Size = new System.Drawing.Size(85, 21);
this.lb_daa017.TabIndex = 280;
- this.lb_daa017.Text = "瀹為檯瀹屽伐鏃� ";
+ this.lb_daa017.Text = "瀹為檯瀹屽伐鏃�";
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(864, 48);
+ this.txt_daa017.Location = new System.Drawing.Point(859, 112);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
@@ -2020,15 +2032,15 @@
//
this.lb_daa016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa016.Appearance.Options.UseFont = true;
- this.lb_daa016.Location = new System.Drawing.Point(770, 20);
+ this.lb_daa016.Location = new System.Drawing.Point(762, 86);
this.lb_daa016.Name = "lb_daa016";
- this.lb_daa016.Size = new System.Drawing.Size(90, 21);
+ this.lb_daa016.Size = new System.Drawing.Size(85, 21);
this.lb_daa016.TabIndex = 273;
- this.lb_daa016.Text = "瀹為檯寮�宸ユ棩 ";
+ this.lb_daa016.Text = "瀹為檯寮�宸ユ棩";
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(864, 16);
+ this.txt_daa016.Location = new System.Drawing.Point(859, 82);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
@@ -2119,7 +2131,7 @@
//
this.lb_daa011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa011.Appearance.Options.UseFont = true;
- this.lb_daa011.Location = new System.Drawing.Point(504, 86);
+ this.lb_daa011.Location = new System.Drawing.Point(516, 86);
this.lb_daa011.Name = "lb_daa011";
this.lb_daa011.Size = new System.Drawing.Size(73, 21);
this.lb_daa011.TabIndex = 247;
@@ -2127,7 +2139,7 @@
//
// txt_daa011
//
- this.txt_daa011.Location = new System.Drawing.Point(577, 82);
+ this.txt_daa011.Location = new System.Drawing.Point(589, 82);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
@@ -2152,7 +2164,7 @@
//
this.lb_daa010.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa010.Appearance.Options.UseFont = true;
- this.lb_daa010.Location = new System.Drawing.Point(504, 52);
+ this.lb_daa010.Location = new System.Drawing.Point(516, 52);
this.lb_daa010.Name = "lb_daa010";
this.lb_daa010.Size = new System.Drawing.Size(73, 21);
this.lb_daa010.TabIndex = 243;
@@ -2160,7 +2172,7 @@
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(577, 48);
+ this.txt_daa010.Location = new System.Drawing.Point(589, 48);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
@@ -2185,7 +2197,7 @@
//
this.lb_daa009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa009.Appearance.Options.UseFont = true;
- this.lb_daa009.Location = new System.Drawing.Point(299, 120);
+ this.lb_daa009.Location = new System.Drawing.Point(299, 116);
this.lb_daa009.Name = "lb_daa009";
this.lb_daa009.Size = new System.Drawing.Size(39, 21);
this.lb_daa009.TabIndex = 240;
@@ -2193,7 +2205,7 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(348, 119);
+ this.txt_daa009.Location = new System.Drawing.Point(348, 112);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
@@ -2218,7 +2230,7 @@
//
this.lb_daa008.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa008.Appearance.Options.UseFont = true;
- this.lb_daa008.Location = new System.Drawing.Point(504, 20);
+ this.lb_daa008.Location = new System.Drawing.Point(516, 20);
this.lb_daa008.Name = "lb_daa008";
this.lb_daa008.Size = new System.Drawing.Size(73, 21);
this.lb_daa008.TabIndex = 235;
@@ -2226,7 +2238,7 @@
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(577, 16);
+ this.txt_daa008.Location = new System.Drawing.Point(589, 16);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
@@ -2251,7 +2263,7 @@
//
this.lb_daa005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa005.Appearance.Options.UseFont = true;
- this.lb_daa005.Location = new System.Drawing.Point(538, 123);
+ this.lb_daa005.Location = new System.Drawing.Point(550, 116);
this.lb_daa005.Name = "lb_daa005";
this.lb_daa005.Size = new System.Drawing.Size(39, 21);
this.lb_daa005.TabIndex = 226;
@@ -2259,7 +2271,7 @@
//
// txt_daa005
//
- this.txt_daa005.Location = new System.Drawing.Point(577, 119);
+ this.txt_daa005.Location = new System.Drawing.Point(589, 112);
this.txt_daa005.Name = "txt_daa005";
this.txt_daa005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa005.Properties.Appearance.Options.UseFont = true;
@@ -2284,7 +2296,7 @@
//
this.lb_daa004.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa004.Appearance.Options.UseFont = true;
- this.lb_daa004.Location = new System.Drawing.Point(12, 123);
+ this.lb_daa004.Location = new System.Drawing.Point(12, 116);
this.lb_daa004.Name = "lb_daa004";
this.lb_daa004.Size = new System.Drawing.Size(73, 21);
this.lb_daa004.TabIndex = 222;
@@ -2292,7 +2304,7 @@
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(90, 119);
+ this.txt_daa004.Location = new System.Drawing.Point(90, 112);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
@@ -2350,20 +2362,20 @@
//
this.lb_daa002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa002.Appearance.Options.UseFont = true;
- this.lb_daa002.Location = new System.Drawing.Point(28, 52);
+ this.lb_daa002.Location = new System.Drawing.Point(12, 52);
this.lb_daa002.Name = "lb_daa002";
- this.lb_daa002.Size = new System.Drawing.Size(57, 21);
+ this.lb_daa002.Size = new System.Drawing.Size(68, 21);
this.lb_daa002.TabIndex = 217;
- this.lb_daa002.Text = "浜у搧ID ";
+ this.lb_daa002.Text = "浜у搧缂栫爜";
//
- // txt_daa002
+ // txt_daa029
//
- this.txt_daa002.Location = new System.Drawing.Point(90, 48);
- this.txt_daa002.Name = "txt_daa002";
- this.txt_daa002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_daa002.Properties.Appearance.Options.UseFont = true;
- this.txt_daa002.Size = new System.Drawing.Size(150, 28);
- this.txt_daa002.TabIndex = 217;
+ this.txt_daa029.Location = new System.Drawing.Point(90, 48);
+ this.txt_daa029.Name = "txt_daa029";
+ this.txt_daa029.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_daa029.Properties.Appearance.Options.UseFont = true;
+ this.txt_daa029.Size = new System.Drawing.Size(150, 28);
+ this.txt_daa029.TabIndex = 217;
//
// gv_daa002
//
@@ -2383,11 +2395,11 @@
//
this.lb_daa001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_daa001.Appearance.Options.UseFont = true;
- this.lb_daa001.Location = new System.Drawing.Point(46, 20);
+ this.lb_daa001.Location = new System.Drawing.Point(12, 20);
this.lb_daa001.Name = "lb_daa001";
- this.lb_daa001.Size = new System.Drawing.Size(39, 21);
+ this.lb_daa001.Size = new System.Drawing.Size(73, 21);
this.lb_daa001.TabIndex = 216;
- this.lb_daa001.Text = "鍗曞彿 ";
+ this.lb_daa001.Text = "宸ュ崟鍗曞彿 ";
//
// txt_daa001
//
@@ -2578,10 +2590,10 @@
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 327);
+ this.tabMx.Location = new System.Drawing.Point(0, 231);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 381);
+ this.tabMx.Size = new System.Drawing.Size(1126, 477);
this.tabMx.TabIndex = 2;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -2590,10 +2602,18 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_daa022);
+ this.panel1.Controls.Add(this.lb_tbl013);
+ this.panel1.Controls.Add(this.txt_daa028);
+ this.panel1.Controls.Add(this.labelControl5);
+ this.panel1.Controls.Add(this.labelControl4);
+ this.panel1.Controls.Add(this.txt_mesEndProd);
+ this.panel1.Controls.Add(this.labelControl3);
+ this.panel1.Controls.Add(this.txt_mesStartProd);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Controls.Add(this.txt_sjXt);
this.panel1.Controls.Add(this.labelControl1);
- this.panel1.Controls.Add(this.textEdit1);
+ this.panel1.Controls.Add(this.txt_printRemark);
this.panel1.Controls.Add(this.txt_iCount_1);
this.panel1.Controls.Add(this.labelControl14);
this.panel1.Controls.Add(this.txt_psnQty_1);
@@ -2625,38 +2645,56 @@
this.panel1.Controls.Add(this.lb_daa003);
this.panel1.Controls.Add(this.txt_daa003);
this.panel1.Controls.Add(this.lb_daa002);
- this.panel1.Controls.Add(this.txt_daa002);
+ this.panel1.Controls.Add(this.txt_daa029);
this.panel1.Controls.Add(this.lb_daa001);
this.panel1.Controls.Add(this.txt_daa001);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 327);
+ this.panel1.Size = new System.Drawing.Size(1126, 231);
this.panel1.TabIndex = 1;
+ //
+ // labelControl2
+ //
+ this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl2.Appearance.Options.UseFont = true;
+ this.labelControl2.Location = new System.Drawing.Point(14, 150);
+ this.labelControl2.Name = "labelControl2";
+ this.labelControl2.Size = new System.Drawing.Size(68, 21);
+ this.labelControl2.TabIndex = 335;
+ this.labelControl2.Text = "瀹為檯绾夸綋";
+ //
+ // txt_sjXt
+ //
+ this.txt_sjXt.IsReadly = false;
+ this.txt_sjXt.Location = new System.Drawing.Point(90, 146);
+ this.txt_sjXt.Name = "txt_sjXt";
+ this.txt_sjXt.Size = new System.Drawing.Size(150, 28);
+ this.txt_sjXt.TabIndex = 334;
//
// labelControl1
//
this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl1.Appearance.Options.UseFont = true;
- this.labelControl1.Location = new System.Drawing.Point(786, 86);
+ this.labelControl1.Location = new System.Drawing.Point(11, 192);
this.labelControl1.Name = "labelControl1";
this.labelControl1.Size = new System.Drawing.Size(74, 21);
this.labelControl1.TabIndex = 332;
this.labelControl1.Text = "鎵撳嵃澶囨敞:";
//
- // textEdit1
+ // txt_printRemark
//
- this.textEdit1.Location = new System.Drawing.Point(864, 82);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.textEdit1.Properties.Appearance.Options.UseFont = true;
- this.textEdit1.Size = new System.Drawing.Size(150, 28);
- this.textEdit1.TabIndex = 333;
+ this.txt_printRemark.Location = new System.Drawing.Point(89, 188);
+ this.txt_printRemark.Name = "txt_printRemark";
+ this.txt_printRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
+ this.txt_printRemark.Size = new System.Drawing.Size(150, 28);
+ this.txt_printRemark.TabIndex = 333;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(864, 151);
+ this.txt_iCount_1.Location = new System.Drawing.Point(558, 193);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
@@ -2665,7 +2703,7 @@
//
// labelControl14
//
- this.labelControl14.Location = new System.Drawing.Point(765, 156);
+ this.labelControl14.Location = new System.Drawing.Point(459, 198);
this.labelControl14.Name = "labelControl14";
this.labelControl14.Size = new System.Drawing.Size(95, 18);
this.labelControl14.TabIndex = 330;
@@ -2673,7 +2711,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(864, 119);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(347, 190);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
@@ -2682,7 +2720,7 @@
//
// labelControl12
//
- this.labelControl12.Location = new System.Drawing.Point(765, 124);
+ this.labelControl12.Location = new System.Drawing.Point(248, 195);
this.labelControl12.Name = "labelControl12";
this.labelControl12.Size = new System.Drawing.Size(95, 18);
this.labelControl12.TabIndex = 328;
@@ -2690,7 +2728,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(1002, 126);
+ this.labelControl11.Location = new System.Drawing.Point(707, 193);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -2718,23 +2756,81 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // txt_sjXt
+ // txt_mesStartProd
//
- this.txt_sjXt.IsReadly = false;
- this.txt_sjXt.Location = new System.Drawing.Point(90, 162);
- this.txt_sjXt.Name = "txt_sjXt";
- this.txt_sjXt.Size = new System.Drawing.Size(278, 35);
- this.txt_sjXt.TabIndex = 334;
+ this.txt_mesStartProd.Location = new System.Drawing.Point(859, 16);
+ this.txt_mesStartProd.Name = "txt_mesStartProd";
+ this.txt_mesStartProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
+ this.txt_mesStartProd.Size = new System.Drawing.Size(150, 28);
+ this.txt_mesStartProd.TabIndex = 336;
//
- // labelControl2
+ // labelControl3
//
- this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.labelControl2.Appearance.Options.UseFont = true;
- this.labelControl2.Location = new System.Drawing.Point(14, 162);
- this.labelControl2.Name = "labelControl2";
- this.labelControl2.Size = new System.Drawing.Size(68, 21);
- this.labelControl2.TabIndex = 335;
- this.labelControl2.Text = "瀹為檯绾夸綋";
+ this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl3.Appearance.Options.UseFont = true;
+ this.labelControl3.Location = new System.Drawing.Point(745, 20);
+ this.labelControl3.Name = "labelControl3";
+ this.labelControl3.Size = new System.Drawing.Size(102, 21);
+ this.labelControl3.TabIndex = 337;
+ this.labelControl3.Text = "棰勮寮�宸ユ椂闂�";
+ //
+ // labelControl4
+ //
+ this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl4.Appearance.Options.UseFont = true;
+ this.labelControl4.Location = new System.Drawing.Point(745, 52);
+ this.labelControl4.Name = "labelControl4";
+ this.labelControl4.Size = new System.Drawing.Size(102, 21);
+ this.labelControl4.TabIndex = 339;
+ this.labelControl4.Text = "棰勮瀹屽伐鏃堕棿";
+ //
+ // txt_mesEndProd
+ //
+ this.txt_mesEndProd.Location = new System.Drawing.Point(859, 48);
+ this.txt_mesEndProd.Name = "txt_mesEndProd";
+ this.txt_mesEndProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
+ this.txt_mesEndProd.Size = new System.Drawing.Size(150, 28);
+ this.txt_mesEndProd.TabIndex = 338;
+ //
+ // labelControl5
+ //
+ this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.labelControl5.Appearance.Options.UseFont = true;
+ this.labelControl5.Location = new System.Drawing.Point(779, 150);
+ this.labelControl5.Name = "labelControl5";
+ this.labelControl5.Size = new System.Drawing.Size(68, 21);
+ this.labelControl5.TabIndex = 340;
+ this.labelControl5.Text = "澶囨枡鏃堕棿";
+ //
+ // txt_daa028
+ //
+ this.txt_daa028.Location = new System.Drawing.Point(859, 146);
+ this.txt_daa028.Name = "txt_daa028";
+ this.txt_daa028.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_daa028.Properties.Appearance.Options.UseFont = true;
+ this.txt_daa028.Size = new System.Drawing.Size(150, 28);
+ this.txt_daa028.TabIndex = 341;
+ //
+ // lb_tbl013
+ //
+ this.lb_tbl013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lb_tbl013.Appearance.Options.UseFont = true;
+ this.lb_tbl013.Location = new System.Drawing.Point(516, 150);
+ this.lb_tbl013.Name = "lb_tbl013";
+ this.lb_tbl013.Size = new System.Drawing.Size(68, 21);
+ this.lb_tbl013.TabIndex = 461;
+ this.lb_tbl013.Text = "閫氱煡澶囨枡";
+ //
+ // txt_daa022
+ //
+ this.txt_daa022.Location = new System.Drawing.Point(589, 146);
+ this.txt_daa022.Name = "txt_daa022";
+ this.txt_daa022.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_daa022.Properties.Appearance.Options.UseFont = true;
+ this.txt_daa022.Size = new System.Drawing.Size(150, 28);
+ this.txt_daa022.TabIndex = 462;
//
// Frm_Womdaa
//
@@ -2763,7 +2859,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_daa005.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa002.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa029.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -2775,10 +2871,14 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa022.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -2968,7 +3068,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_daa003;
private DevExpress.XtraEditors.LabelControl lb_daa002;
- private DevExpress.XtraEditors.TextEdit txt_daa002;
+ private DevExpress.XtraEditors.TextEdit txt_daa029;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa002;
private DevExpress.XtraEditors.LabelControl lb_daa001;
@@ -2984,10 +3084,18 @@
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.LabelControl labelControl1;
- private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.TextEdit txt_printRemark;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1Guid;
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraEditors.LabelControl labelControl2;
private UserControl.UcLookWorkline txt_sjXt;
+ private DevExpress.XtraEditors.LabelControl labelControl4;
+ private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
+ private DevExpress.XtraEditors.LabelControl labelControl3;
+ private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
+ private DevExpress.XtraEditors.TextEdit txt_daa028;
+ private DevExpress.XtraEditors.LabelControl labelControl5;
+ private DevExpress.XtraEditors.TextEdit txt_daa022;
+ private DevExpress.XtraEditors.LabelControl lb_tbl013;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index dfc2bc0..c1a178e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -27,6 +27,8 @@
this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
+ toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
+ toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
@@ -41,6 +43,7 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ txt_sjXt.getSuppler("");
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -284,6 +287,22 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array2.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -292,6 +311,20 @@
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ }
+
+ private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ toolBarMenu1.rptParameter = "rpt_daa{}";
+ }
+ private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
+ {
+ _print();
}
@@ -368,5 +401,47 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+
+ private void _print()
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 5);
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ if (rowGuid.Length < 36)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浣犺鎵撳嵃鐨勮锛�");
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ txt_iCount_1.Focus();
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
+ txt_psnQty_1.Focus();
+ this.toolBarMenu1.rptParameter = "return false";
+ return;
+ }
+ this.toolBarMenu1.rptParameter = "rpt_daa{" + ""
+ + "," + txt_printRemark.Text.Trim()
+ + "," + ""
+ + "," + txt_iCount_1.Text.Trim()
+ + "," + txt_psnQty_1.Text.Trim()
+ + "}";
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3