From 1544b9ba3902d93a3d701db3656227cc3b46dce8 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 01 八月 2025 14:45:09 +0800
Subject: [PATCH] 过站bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 242 +++++++++++++++++++++++++++++++----------------
1 files changed, 159 insertions(+), 83 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index 4ec4dfb..1df7602 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -59,6 +59,7 @@
this.txt_sjDate = new DevExpress.XtraEditors.TextEdit();
this.btnGood = new DevExpress.XtraEditors.SimpleButton();
this.btnBad = new DevExpress.XtraEditors.SimpleButton();
+ this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -72,11 +73,12 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layShuiJian = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -112,6 +114,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -128,8 +131,9 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -159,6 +163,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -172,11 +177,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -262,6 +268,7 @@
this.layoutMx1.Controls.Add(this.txt_sjDate);
this.layoutMx1.Controls.Add(this.btnGood);
this.layoutMx1.Controls.Add(this.btnBad);
+ this.layoutMx1.Controls.Add(this.txt_dianJianPath);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
@@ -273,134 +280,142 @@
//
// txt_gdbh
//
- this.txt_gdbh.Location = new System.Drawing.Point(84, 12);
+ this.txt_gdbh.Location = new System.Drawing.Point(111, 12);
this.txt_gdbh.Name = "txt_gdbh";
this.txt_gdbh.Properties.ReadOnly = true;
- this.txt_gdbh.Size = new System.Drawing.Size(126, 24);
+ this.txt_gdbh.Size = new System.Drawing.Size(99, 24);
this.txt_gdbh.StyleController = this.layoutMx1;
this.txt_gdbh.TabIndex = 4;
//
// txt_gx
//
- this.txt_gx.Location = new System.Drawing.Point(84, 40);
+ this.txt_gx.Location = new System.Drawing.Point(111, 40);
this.txt_gx.Name = "txt_gx";
this.txt_gx.Properties.ReadOnly = true;
- this.txt_gx.Size = new System.Drawing.Size(126, 24);
+ this.txt_gx.Size = new System.Drawing.Size(99, 24);
this.txt_gx.StyleController = this.layoutMx1;
this.txt_gx.TabIndex = 5;
//
// txt_collectBy
//
- this.txt_collectBy.Location = new System.Drawing.Point(84, 68);
+ this.txt_collectBy.Location = new System.Drawing.Point(111, 68);
this.txt_collectBy.Name = "txt_collectBy";
this.txt_collectBy.Properties.ReadOnly = true;
- this.txt_collectBy.Size = new System.Drawing.Size(126, 24);
+ this.txt_collectBy.Size = new System.Drawing.Size(99, 24);
this.txt_collectBy.StyleController = this.layoutMx1;
this.txt_collectBy.TabIndex = 6;
//
// txt_barCode
//
- this.txt_barCode.Location = new System.Drawing.Point(84, 96);
+ this.txt_barCode.Location = new System.Drawing.Point(111, 96);
this.txt_barCode.Name = "txt_barCode";
- this.txt_barCode.Size = new System.Drawing.Size(328, 24);
+ this.txt_barCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
+ this.txt_barCode.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
+ this.txt_barCode.Properties.Appearance.Options.UseFont = true;
+ this.txt_barCode.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_barCode.Size = new System.Drawing.Size(301, 24);
this.txt_barCode.StyleController = this.layoutMx1;
this.txt_barCode.TabIndex = 1;
//
// txt_currentBarCode
//
- this.txt_currentBarCode.Location = new System.Drawing.Point(84, 124);
+ this.txt_currentBarCode.Location = new System.Drawing.Point(111, 124);
this.txt_currentBarCode.Name = "txt_currentBarCode";
this.txt_currentBarCode.Properties.ReadOnly = true;
- this.txt_currentBarCode.Size = new System.Drawing.Size(328, 24);
+ this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24);
this.txt_currentBarCode.StyleController = this.layoutMx1;
this.txt_currentBarCode.TabIndex = 8;
//
// txt_gwm
//
- this.txt_gwm.Location = new System.Drawing.Point(84, 152);
+ this.txt_gwm.Location = new System.Drawing.Point(111, 152);
this.txt_gwm.Name = "txt_gwm";
- this.txt_gwm.Size = new System.Drawing.Size(126, 24);
+ this.txt_gwm.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
+ this.txt_gwm.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
+ this.txt_gwm.Properties.Appearance.Options.UseFont = true;
+ this.txt_gwm.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_gwm.Size = new System.Drawing.Size(99, 24);
this.txt_gwm.StyleController = this.layoutMx1;
this.txt_gwm.TabIndex = 9;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(286, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(313, 12);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.ReadOnly = true;
- this.txt_itemNo.Size = new System.Drawing.Size(126, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(99, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 10;
//
// txt_bc
//
- this.txt_bc.Location = new System.Drawing.Point(286, 40);
+ this.txt_bc.Location = new System.Drawing.Point(313, 40);
this.txt_bc.Name = "txt_bc";
this.txt_bc.Properties.ReadOnly = true;
- this.txt_bc.Size = new System.Drawing.Size(126, 24);
+ this.txt_bc.Size = new System.Drawing.Size(99, 24);
this.txt_bc.StyleController = this.layoutMx1;
this.txt_bc.TabIndex = 11;
//
// txt_gw
//
- this.txt_gw.Location = new System.Drawing.Point(286, 68);
+ this.txt_gw.Location = new System.Drawing.Point(313, 68);
this.txt_gw.Name = "txt_gw";
this.txt_gw.Properties.ReadOnly = true;
- this.txt_gw.Size = new System.Drawing.Size(126, 24);
+ this.txt_gw.Size = new System.Drawing.Size(99, 24);
this.txt_gw.StyleController = this.layoutMx1;
this.txt_gw.TabIndex = 12;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(488, 12);
+ this.txt_itemName.Location = new System.Drawing.Point(515, 12);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.ReadOnly = true;
- this.txt_itemName.Size = new System.Drawing.Size(126, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(99, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 13;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(690, 12);
+ this.txt_itemModel.Location = new System.Drawing.Point(717, 12);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.ReadOnly = true;
- this.txt_itemModel.Size = new System.Drawing.Size(126, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(99, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 14;
//
// txt_sbNo
//
- this.txt_sbNo.Location = new System.Drawing.Point(488, 68);
+ this.txt_sbNo.Location = new System.Drawing.Point(515, 68);
this.txt_sbNo.Name = "txt_sbNo";
this.txt_sbNo.Properties.ReadOnly = true;
- this.txt_sbNo.Size = new System.Drawing.Size(126, 24);
+ this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
this.txt_sbNo.StyleController = this.layoutMx1;
this.txt_sbNo.TabIndex = 15;
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(488, 40);
+ this.txt_sjXt.Location = new System.Drawing.Point(515, 40);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
- this.txt_sjXt.Size = new System.Drawing.Size(126, 24);
+ this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
this.txt_sjXt.StyleController = this.layoutMx1;
this.txt_sjXt.TabIndex = 16;
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(690, 40);
+ this.txt_yjDate.Location = new System.Drawing.Point(717, 40);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
- this.txt_yjDate.Size = new System.Drawing.Size(126, 24);
+ this.txt_yjDate.Size = new System.Drawing.Size(99, 24);
this.txt_yjDate.StyleController = this.layoutMx1;
this.txt_yjDate.TabIndex = 17;
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(690, 68);
+ this.txt_sjDate.Location = new System.Drawing.Point(717, 68);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
- this.txt_sjDate.Size = new System.Drawing.Size(126, 24);
+ this.txt_sjDate.Size = new System.Drawing.Size(99, 24);
this.txt_sjDate.StyleController = this.layoutMx1;
this.txt_sjDate.TabIndex = 18;
//
@@ -426,6 +441,15 @@
this.btnBad.TabIndex = 20;
this.btnBad.Text = "涓嶈壇鍝�";
//
+ // txt_dianJianPath
+ //
+ this.txt_dianJianPath.Location = new System.Drawing.Point(313, 152);
+ this.txt_dianJianPath.Name = "txt_dianJianPath";
+ this.txt_dianJianPath.Properties.ReadOnly = true;
+ this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
+ this.txt_dianJianPath.StyleController = this.layoutMx1;
+ this.txt_dianJianPath.TabIndex = 21;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -443,11 +467,12 @@
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem5,
- this.layoutControlItem6,
+ this.layShuiJian,
this.layoutControlItem16,
this.layoutControlItem17,
this.layoutControlItem13,
- this.layoutControlItem11});
+ this.layoutControlItem11,
+ this.layDianJian});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -492,7 +517,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem2
//
@@ -502,7 +527,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem2.Text = "褰撳墠宸ュ簭";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem3
//
@@ -513,7 +538,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem4
//
@@ -524,7 +549,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(404, 28);
this.layoutControlItem4.Text = "鎵拷婧爜";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem7
//
@@ -534,7 +559,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem7.Text = "浜у搧缂栫爜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem8
//
@@ -545,7 +570,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem8.Text = "鐝";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem9
//
@@ -556,7 +581,7 @@
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem9.Text = "宸ヤ綅";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem10
//
@@ -566,7 +591,7 @@
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem12
//
@@ -577,7 +602,7 @@
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem12.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem12.Text = "璁惧缂栫爜";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem14
//
@@ -587,8 +612,8 @@
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem14.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem14.Text = "璁″垝鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem15
//
@@ -598,8 +623,8 @@
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem15.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem15.Text = "瀹為檯鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem15.Text = "Mes瀹為檯寮�宸�";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem5
//
@@ -610,17 +635,17 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem5.Size = new System.Drawing.Size(404, 28);
this.layoutControlItem5.Text = "褰撳墠鏉$爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
//
- // layoutControlItem6
+ // layShuiJian
//
- this.layoutControlItem6.Control = this.txt_gwm;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 140);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem6.Size = new System.Drawing.Size(202, 31);
- this.layoutControlItem6.Text = "鎵伐浣嶇爜";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layShuiJian.Control = this.txt_gwm;
+ this.layShuiJian.Location = new System.Drawing.Point(0, 140);
+ this.layShuiJian.Name = "layShuiJian";
+ this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layShuiJian.Size = new System.Drawing.Size(202, 31);
+ this.layShuiJian.Text = "鎵伐浣嶇爜";
+ this.layShuiJian.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem16
//
@@ -657,13 +682,14 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_sjXt;
+ this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
this.layoutControlItem13.Location = new System.Drawing.Point(404, 28);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem13.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem13.Text = "绾垮埆";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem11
//
@@ -673,7 +699,18 @@
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.Size = new System.Drawing.Size(202, 28);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layDianJian
+ //
+ this.layDianJian.Control = this.txt_dianJianPath;
+ this.layDianJian.Location = new System.Drawing.Point(202, 140);
+ this.layDianJian.Name = "layDianJian";
+ this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layDianJian.Size = new System.Drawing.Size(202, 31);
+ this.layDianJian.Text = "鐢垫璺緞";
+ this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
//
// simpleButton7
//
@@ -794,9 +831,9 @@
this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.panel4.Controls.Add(this.lbSum2);
this.panel4.Controls.Add(this.label8);
- this.panel4.Location = new System.Drawing.Point(151, 7);
+ this.panel4.Location = new System.Drawing.Point(143, 7);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(99, 71);
+ this.panel4.Size = new System.Drawing.Size(110, 71);
this.panel4.TabIndex = 2;
//
// lbSum2
@@ -811,11 +848,11 @@
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(18, 10);
+ this.label8.Location = new System.Drawing.Point(1, 10);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(68, 18);
+ this.label8.Size = new System.Drawing.Size(107, 18);
this.label8.TabIndex = 0;
- this.label8.Text = "鎶曞叆鏁伴噺";
+ this.label8.Text = "G001:鎶曞叆鏁伴噺";
//
// panel1
//
@@ -891,7 +928,8 @@
this.gridColumn1,
this.gridColumn4,
this.gridColumn14,
- this.gridColumn15});
+ this.gridColumn15,
+ this.gridColumn24});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -970,6 +1008,7 @@
this.gridColumn3.FieldName = "quantity";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 6;
this.gridColumn3.Width = 94;
@@ -992,18 +1031,18 @@
this.gridColumn2.FieldName = "processNo";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 7;
this.gridColumn2.Width = 94;
//
// gridColumn1
//
- this.gridColumn1.Caption = "澶囨敞";
- this.gridColumn1.FieldName = "remark";
+ this.gridColumn1.Caption = "涓嶈壇鎻忚堪";
+ this.gridColumn1.FieldName = "badDescription";
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 8;
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
this.gridColumn1.Width = 94;
//
// gridColumn4
@@ -1012,29 +1051,43 @@
this.gridColumn4.FieldName = "checkResult";
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.VisibleIndex = 8;
this.gridColumn4.Width = 94;
//
// gridColumn14
//
this.gridColumn14.Caption = "涓婃姤浜�";
- this.gridColumn14.FieldName = "collectByName";
+ this.gridColumn14.FieldName = "createBy";
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 10;
+ this.gridColumn14.VisibleIndex = 9;
this.gridColumn14.Width = 94;
//
// gridColumn15
//
- this.gridColumn15.Caption = "涓婃姤鏃堕棿";
+ this.gridColumn15.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
this.gridColumn15.FieldName = "createDate";
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 11;
+ this.gridColumn15.VisibleIndex = 10;
this.gridColumn15.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn24.FieldName = "barCodeStatusTxt";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.OptionsColumn.ReadOnly = true;
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.Width = 94;
//
// tabMxPage2
//
@@ -1071,7 +1124,8 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn22,
- this.gridColumn23});
+ this.gridColumn23,
+ this.gridColumn25});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1150,6 +1204,7 @@
this.gridColumn16.FieldName = "quantity";
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.OptionsColumn.ReadOnly = true;
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 6;
this.gridColumn16.Width = 94;
@@ -1172,16 +1227,18 @@
this.gridColumn18.FieldName = "processNo";
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.OptionsColumn.ReadOnly = true;
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 7;
this.gridColumn18.Width = 94;
//
// gridColumn19
//
- this.gridColumn19.Caption = "澶囨敞";
- this.gridColumn19.FieldName = "remark";
+ this.gridColumn19.Caption = "涓嶈壇鎻忚堪";
+ this.gridColumn19.FieldName = "badDescription";
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.OptionsColumn.ReadOnly = true;
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 8;
this.gridColumn19.Width = 94;
@@ -1192,6 +1249,7 @@
this.gridColumn20.FieldName = "checkResult";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 9;
this.gridColumn20.Width = 94;
@@ -1199,9 +1257,10 @@
// gridColumn21
//
this.gridColumn21.Caption = "涓婃姤浜�";
- this.gridColumn21.FieldName = "collectByName";
+ this.gridColumn21.FieldName = "createBy";
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 10;
this.gridColumn21.Width = 94;
@@ -1212,6 +1271,7 @@
this.gridColumn22.FieldName = "createDate";
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 11;
this.gridColumn22.Width = 94;
@@ -1222,9 +1282,19 @@
this.gridColumn23.FieldName = "badReson";
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 12;
+ this.gridColumn23.OptionsColumn.ReadOnly = true;
this.gridColumn23.Width = 94;
+ //
+ // gridColumn25
+ //
+ this.gridColumn25.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn25.FieldName = "barCodeStatus";
+ this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.OptionsColumn.ReadOnly = true;
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 12;
+ this.gridColumn25.Width = 94;
//
// Frm_Work01
//
@@ -1267,6 +1337,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_yjDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_sjDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1280,11 +1351,12 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1373,7 +1445,7 @@
private DevExpress.XtraEditors.SimpleButton simpleButton3;
private DevExpress.XtraEditors.ProgressBarControl prog1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layShuiJian;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
@@ -1399,5 +1471,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraEditors.TextEdit txt_dianJianPath;
+ private DevExpress.XtraLayout.LayoutControlItem layDianJian;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
}
}
\ No newline at end of file
--
Gitblit v1.9.3