From 9878916af28906629dad956b65726167b50834cf Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 22 七月 2025 15:08:27 +0800
Subject: [PATCH] 现场管理
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs | 88 ++++----
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 243 +++++++++++-----------
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 6
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 147 ++++++-------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 10
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs | 20
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 41 ++-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs | 87 +++----
8 files changed, 326 insertions(+), 316 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
index 2c492c0..2ecd22d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.Designer.cs
@@ -62,7 +62,6 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_lineType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_dptId = new Gs.DevApp.UserControl.UcLookDepartment();
this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
this.txt_name = new DevExpress.XtraEditors.TextEdit();
@@ -70,8 +69,8 @@
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
this.txt_isZxbg = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_lineType = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -80,6 +79,7 @@
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -99,15 +99,14 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -116,6 +115,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -286,7 +286,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 6;
+ this.gv_createBy.VisibleIndex = 7;
this.gv_createBy.Width = 63;
//
// gv_createDate
@@ -299,7 +299,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 7;
+ this.gv_createDate.VisibleIndex = 8;
this.gv_createDate.Width = 180;
//
// gv_lastupdateBy
@@ -312,7 +312,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 8;
+ this.gv_lastupdateBy.VisibleIndex = 9;
this.gv_lastupdateBy.Width = 63;
//
// gv_lastupdateDate
@@ -325,24 +325,26 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 9;
+ this.gv_lastupdateDate.VisibleIndex = 10;
this.gv_lastupdateDate.Width = 180;
//
// gv_lineType
//
this.gv_lineType.AppearanceCell.Options.UseFont = true;
- this.gv_lineType.Caption = "绾夸綋绫诲埆";
+ this.gv_lineType.Caption = "寮哄埗姘存";
this.gv_lineType.FieldName = "lineType";
this.gv_lineType.MinWidth = 80;
this.gv_lineType.Name = "gv_lineType";
this.gv_lineType.OptionsColumn.AllowEdit = false;
this.gv_lineType.Tag = "query_a.line_type";
+ this.gv_lineType.Visible = true;
+ this.gv_lineType.VisibleIndex = 6;
this.gv_lineType.Width = 80;
//
// gv_isZxbg
//
this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
- this.gv_isZxbg.Caption = "杩囩珯鏃跺己鍒堕噰闆嗘暟鎹�";
+ this.gv_isZxbg.Caption = "寮哄埗鐢垫";
this.gv_isZxbg.FieldName = "isZxbg";
this.gv_isZxbg.MinWidth = 50;
this.gv_isZxbg.Name = "gv_isZxbg";
@@ -359,7 +361,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.VisibleIndex = 11;
this.gridColumn2.Width = 94;
//
// gridColumn3
@@ -412,7 +414,6 @@
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_lineType);
this.layoutMx1.Controls.Add(this.txt_dptId);
this.layoutMx1.Controls.Add(this.txt_lineNo);
this.layoutMx1.Controls.Add(this.txt_name);
@@ -420,10 +421,10 @@
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
this.layoutMx1.Controls.Add(this.txt_isZxbg);
+ this.layoutMx1.Controls.Add(this.txt_lineType);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem9,
- this.layoutControlItem7});
+ this.layoutControlItem9});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
@@ -440,20 +441,6 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
- //
- // txt_lineType
- //
- this.txt_lineType.Location = new System.Drawing.Point(636, 107);
- this.txt_lineType.Name = "txt_lineType";
- this.txt_lineType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_lineType.Properties.Items.AddRange(new object[] {
- "鎵嬪伐绾�",
- "鑷姩绾�"});
- this.txt_lineType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_lineType.Size = new System.Drawing.Size(200, 24);
- this.txt_lineType.StyleController = this.layoutMx1;
- this.txt_lineType.TabIndex = 245;
//
// txt_dptId
//
@@ -515,10 +502,19 @@
//
this.txt_isZxbg.Location = new System.Drawing.Point(12, 107);
this.txt_isZxbg.Name = "txt_isZxbg";
- this.txt_isZxbg.Properties.Caption = "杩囩珯鏃跺己鍒堕噰闆嗘暟鎹�";
+ this.txt_isZxbg.Properties.Caption = "杩囩珯鏃跺己鍒剁數妫�";
this.txt_isZxbg.Size = new System.Drawing.Size(272, 24);
this.txt_isZxbg.StyleController = this.layoutMx1;
this.txt_isZxbg.TabIndex = 246;
+ //
+ // txt_lineType
+ //
+ this.txt_lineType.Location = new System.Drawing.Point(288, 107);
+ this.txt_lineType.Name = "txt_lineType";
+ this.txt_lineType.Properties.Caption = "杩囩珯鏃跺己鍒舵按妫�";
+ this.txt_lineType.Size = new System.Drawing.Size(272, 24);
+ this.txt_lineType.StyleController = this.layoutMx1;
+ this.txt_lineType.TabIndex = 247;
//
// layoutControlItem9
//
@@ -532,17 +528,6 @@
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
//
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_lineType;
- this.layoutControlItem7.Location = new System.Drawing.Point(552, 95);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
- this.layoutControlItem7.Text = "绾夸綋绫诲埆";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -554,7 +539,8 @@
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem4,
- this.layoutControlItem8});
+ this.layoutControlItem8,
+ this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -658,6 +644,17 @@
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
//
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_lineType;
+ this.layoutControlItem10.Location = new System.Drawing.Point(276, 95);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem10.TextVisible = false;
+ //
// Frm_MesWorkshopLine
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -685,15 +682,14 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isZxbg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -702,6 +698,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
this.ResumeLayout(false);
}
@@ -726,7 +723,6 @@
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
- private DevExpress.XtraEditors.ComboBoxEdit txt_lineType;
private UserControl.UcLookDepartment txt_dptId;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
@@ -748,6 +744,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraEditors.CheckEdit txt_lineType;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index 480861a..34fefd9 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -227,8 +227,8 @@
Name = txt_name.Text.Trim(),
LineNo = txt_lineNo.Text.Trim(),
Remark = txt_remark.Text.Trim(),
- LineType = txt_lineType.Text.Trim(),
- isZxbg = txt_isZxbg.Checked
+ LineType = txt_lineType.Checked.ToString(),//杩囩珯鏃跺己鍒舵按妫�
+ isZxbg = txt_isZxbg.Checked //杩囩珯鏃跺己鍒剁數妫�
};
try
{
@@ -311,7 +311,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -329,11 +329,11 @@
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index b2d18c1..54ea4a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -541,7 +541,8 @@
case 2:
strMsg = "鎵瑰噯";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
@@ -738,6 +739,9 @@
,"1.50---(AQL_0_150)"
,"2.00---(AQL_0_200)"
,"2.50---(AQL_0_250)"
+ ,"4.00---(AQL_0_400)"
+ ,"6.50---(AQL_0_650)"
+ ,"10.00---(AQL_1_000)"
});
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index 03b9a8c..1df7602 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -29,16 +29,16 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
@@ -73,12 +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.layoutControlItem18 = 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();
@@ -177,12 +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.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -280,142 +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.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(328, 24);
+ 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.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(126, 24);
+ 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;
//
@@ -443,10 +443,10 @@
//
// txt_dianJianPath
//
- this.txt_dianJianPath.Location = new System.Drawing.Point(286, 152);
+ 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(126, 24);
+ this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
this.txt_dianJianPath.StyleController = this.layoutMx1;
this.txt_dianJianPath.TabIndex = 21;
//
@@ -467,46 +467,46 @@
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem5,
- this.layoutControlItem6,
+ this.layShuiJian,
this.layoutControlItem16,
this.layoutControlItem17,
this.layoutControlItem13,
this.layoutControlItem11,
- this.layoutControlItem18});
+ this.layDianJian});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7,
- rowDefinition8,
- rowDefinition9,
- rowDefinition10,
- rowDefinition11,
- rowDefinition12});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
this.Root.Size = new System.Drawing.Size(828, 191);
this.Root.TextVisible = false;
//
@@ -517,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
//
@@ -527,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
//
@@ -538,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
//
@@ -549,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
//
@@ -559,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
//
@@ -570,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
//
@@ -581,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
//
@@ -591,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
//
@@ -602,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
//
@@ -612,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
//
@@ -623,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
//
@@ -635,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
//
@@ -682,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
//
@@ -698,18 +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);
//
- // layoutControlItem18
+ // layDianJian
//
- this.layoutControlItem18.Control = this.txt_dianJianPath;
- this.layoutControlItem18.Location = new System.Drawing.Point(202, 140);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(202, 31);
- this.layoutControlItem18.Text = "鐢垫璺緞";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+ 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
//
@@ -830,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
@@ -847,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
//
@@ -1350,12 +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.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1444,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;
@@ -1471,7 +1472,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraEditors.TextEdit txt_dianJianPath;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layDianJian;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index e5d074d..5b5cde9 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -1,4 +1,5 @@
锘縰sing DevExpress.XtraGrid.Columns;
+using DevExpress.XtraLayout.Utils;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -33,15 +34,23 @@
public Frm_Work01(string _fGx, string _fBc, string _strinOther)
{
InitializeComponent();
+ gvMx1.IndicatorWidth = 60;
+ gvMx1.CustomDrawRowIndicator += (s, e) =>
+ {
+ if (e.Info.IsRowIndicator && e.RowHandle >= 0)
+ e.Info.DisplayText = (e.RowHandle + 1).ToString();
+ };
txt_gx.Text = _fGx;
txt_bc.Text = _fBc;
txt_dianJianPath.Text = _strinOther;
dianJianPath = _strinOther;
this.Text = "宸ュ簭閲囬泦銆�" + _fGx + " - " + _fBc + "銆�";
+ label8.Text = _fGx + "鏁伴噺";
addColumn();
txt_barCode.KeyDown += (s, e) =>
{
- if (e.KeyCode == Keys.Enter) { addModel(goodTag); };
+ if (e.KeyCode == Keys.Enter) { addModel(goodTag); }
+ ;
};
btnGood.Click += (s, e) =>
{
@@ -49,6 +58,13 @@
};
btnBad.Click += (s, e) =>
{
+ string _barCode = txt_barCode.Text.Trim();
+ if (string.IsNullOrEmpty(_barCode))
+ {
+ Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
+ vm.Show();
+ return;
+ }
UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'");
frm.UpdateParent += (ss, ee) =>
{
@@ -169,7 +185,6 @@
// _obj.t012 = SJJG;杩欎釜寰呯‘瀹�
return _obj;
}
-
if (txt_gx.Text.Trim() == fGxZhongJian)
{
return _obj;
@@ -192,12 +207,6 @@
return;
}
dynamic _obj = getObj(_barCode, _checkResult, _badDescription);
- //if (_obj == null)
- //{
- // Toast vm = new Toast(-1, "~璇诲彇鏁版嵁澶辫触锛岃妫�鏌ヨ澶噡");
- // vm.Show();
- // return;
- //}
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
@@ -257,7 +266,8 @@
{
Toast vm = new Toast((goodTag == "鈭�" ? 1 : -1), _msg);
vm.Show();
- };
+ }
+ ;
}
else
{
@@ -277,6 +287,17 @@
/// </summary>
public void addColumn()
{
+ //鍙湁鐢垫鎵嶆樉绀�
+ if (txt_gx.Text.Trim() == fGxDianJian)
+ layDianJian.Visibility = LayoutVisibility.Always;
+ else
+ layDianJian.Visibility = LayoutVisibility.Never;
+ //鍙湁姘存鎵嶆樉绀�
+ if (txt_gx.Text.Trim() == fGxShouJian)
+ layShuiJian.Visibility = LayoutVisibility.Always;
+ else
+ layShuiJian.Visibility = LayoutVisibility.Never;
+
List<dynamic> _lst = new List<dynamic>();
if (txt_gx.Text.Trim() == fGxDianJian)
{
@@ -329,7 +350,6 @@
kejian = true,
visibleIndex = 1,
});
-
_lst.Add(new
{
ziduan = "t011",
@@ -396,7 +416,6 @@
kejian = true,
visibleIndex = 1,
});
-
_lst.Add(new
{
ziduan = "t010",
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
index 71e2ccd..cfb3238 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
@@ -76,6 +76,7 @@
this.txt_isTbm = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -86,10 +87,9 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -123,6 +123,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isTbm.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
@@ -133,7 +134,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
this.SuspendLayout();
@@ -425,7 +425,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 173;
+ this.splitMx1.SplitterPosition = 106;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -453,7 +453,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(465, 377, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 173);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 106);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -467,7 +467,7 @@
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(84, 114);
+ this.txt_description.Location = new System.Drawing.Point(84, 69);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
this.txt_description.Size = new System.Drawing.Size(200, 24);
@@ -476,7 +476,7 @@
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(912, 63);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(912, 40);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
this.txt_lastUpdateDate.Properties.Appearance.Options.UseFont = true;
this.txt_lastUpdateDate.Size = new System.Drawing.Size(202, 24);
@@ -486,7 +486,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(360, 114);
+ this.txt_remark.Location = new System.Drawing.Point(360, 69);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Size = new System.Drawing.Size(200, 24);
@@ -524,7 +524,7 @@
//
// txt_processName
//
- this.txt_processName.Location = new System.Drawing.Point(84, 63);
+ this.txt_processName.Location = new System.Drawing.Point(84, 40);
this.txt_processName.Name = "txt_processName";
this.txt_processName.Properties.Appearance.Options.UseFont = true;
this.txt_processName.Size = new System.Drawing.Size(200, 24);
@@ -533,7 +533,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(636, 63);
+ this.txt_createDate.Location = new System.Drawing.Point(636, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(200, 24);
@@ -561,7 +561,7 @@
//
// txt_isStatus
//
- this.txt_isStatus.Location = new System.Drawing.Point(564, 114);
+ this.txt_isStatus.Location = new System.Drawing.Point(564, 69);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Properties.Caption = "浣跨敤鐘舵��";
this.txt_isStatus.Size = new System.Drawing.Size(272, 24);
@@ -570,7 +570,7 @@
//
// txt_isZsm
//
- this.txt_isZsm.Location = new System.Drawing.Point(288, 63);
+ this.txt_isZsm.Location = new System.Drawing.Point(288, 40);
this.txt_isZsm.Name = "txt_isZsm";
this.txt_isZsm.Properties.Caption = "鏄惁鍙嶈拷婧爜";
this.txt_isZsm.Size = new System.Drawing.Size(272, 24);
@@ -608,6 +608,18 @@
this.layoutControlItem1.Size = new System.Drawing.Size(278, 35);
this.layoutControlItem1.Text = "涓婚敭GUID";
this.layoutControlItem1.TextSize = new System.Drawing.Size(124, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_isTbm;
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 102);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem14.Text = "鏄惁鍙嶆墭鏉跨爜";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
//
// Root
//
@@ -650,17 +662,17 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1126, 173);
+ this.Root.Size = new System.Drawing.Size(1126, 106);
this.Root.TextVisible = false;
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 51);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 28);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem3.Text = "寤虹珛鏃堕棿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -670,7 +682,7 @@
this.layoutControlItem6.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem6.Text = "寤虹珛浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
@@ -681,28 +693,28 @@
this.layoutControlItem7.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(278, 51);
+ this.layoutControlItem7.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem7.Text = "鏇存柊浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_lastUpdateDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(828, 51);
+ this.layoutControlItem8.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(278, 51);
+ this.layoutControlItem8.Size = new System.Drawing.Size(278, 29);
this.layoutControlItem8.Text = "鏇存柊鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_description;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 102);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 57);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem10.Text = "宸ュ簭鎻忚堪";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
@@ -712,7 +724,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "鏄惁杩斿伐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false;
@@ -722,63 +734,51 @@
this.layoutControlItem4.Control = this.txt_processNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem4.Text = "宸ュ簭浠ｇ爜";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_processName;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 51);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem9.Text = "宸ュ簭鍚嶇О";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_isZsm;
- this.layoutControlItem13.Location = new System.Drawing.Point(276, 51);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem13.Text = "鏄惁鍙嶈拷婧爜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
//
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_isTbm;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 102);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 51);
- this.layoutControlItem14.Text = "鏄惁鍙嶆墭鏉跨爜";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
- //
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_remark;
- this.layoutControlItem11.Location = new System.Drawing.Point(276, 102);
+ this.layoutControlItem11.Location = new System.Drawing.Point(276, 57);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem11.Text = "宸ュ簭澶囨敞";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_isStatus;
- this.layoutControlItem5.Location = new System.Drawing.Point(552, 102);
+ this.layoutControlItem5.Location = new System.Drawing.Point(552, 57);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 51);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem5.Text = "鐘舵��";
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
@@ -825,6 +825,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_isTbm.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
@@ -835,7 +836,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
this.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
index 863ce17..fb467b3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
@@ -13,7 +13,9 @@
/// pc鍙渶瑕佽繃绔�
/// </summary>
private string isPc = "鎶曞叆,鐢垫,姘存,缁堟";
- //鐢垫鍙栧�艰矾寰�
+ /// <summary>
+ /// 鐢垫鍙栧�艰矾寰勶紝鐩墠閮芥槸瀛樼‖鐩�
+ /// </summary>
string dianJianPath = "";
public Frm_WorkStart()
{
@@ -27,13 +29,13 @@
if (txt_bc.SelectedIndex <= 0)
{
txt_bc.Focus();
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨鐝锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鐝锛�");
return;
}
if (txt_gx.SelectedIndex <= 0)
{
txt_gx.Focus();
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇烽�夋嫨宸ュ簭锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨宸ュ簭锛�");
return;
}
string fGx = txt_gx.Text.Trim();
@@ -47,18 +49,16 @@
return;
}
}
-
- Frm_Work01 frm = new Frm_Work01(fGx, fBc,dianJianPath);
+ Frm_Work01 frm = new Frm_Work01(fGx, fBc, dianJianPath);
frm.ShowDialog();
}
/// <summary>
- /// 鍏堣鍙栫數妫�閰嶇疆
+ /// 鍏堣鍙栫數妫�鐨勫瓨鍌ㄨ矾寰�
/// </summary>
/// <returns></returns>
private bool getConfigDianJian()
{
- //杩欐槸鐢垫鏁版嵁鐨勮矾寰�
string _where = " and 1=1 and defect_code='1008'";
var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
var json = JsonConvert.SerializeObject(pgq);
@@ -83,13 +83,13 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
return false;
}
}
/// <summary>
- /// 璇诲彇宸ュ簭涓嬫媺
+ /// 璇诲彇宸ュ簭涓嬫媺,鍚屾椂閰嶅isPc
/// </summary>
private void _getListJyxm()
{
@@ -111,7 +111,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index 4a953eb..b3ad3dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -122,7 +122,6 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -196,7 +195,6 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -372,7 +370,6 @@
//
// splitMx1.Panel1
//
- this.splitMx1.Panel1.Controls.Add(this.panelControl1);
this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
this.splitMx1.Panel1.Text = "Panel1";
//
@@ -382,7 +379,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(775, 632);
- this.splitMx1.SplitterPosition = 362;
+ this.splitMx1.SplitterPosition = 177;
this.splitMx1.TabIndex = 1;
//
// layoutMx1
@@ -409,6 +406,7 @@
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_isCheck);
this.layoutMx1.Controls.Add(this.btnCopy);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem24,
this.layoutControlItem2,
@@ -418,7 +416,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(168, 334, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(708, 159);
+ this.layoutMx1.Size = new System.Drawing.Size(775, 177);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -433,20 +431,20 @@
//
// txt_fMaxWeight
//
- this.txt_fMaxWeight.Location = new System.Drawing.Point(498, 12);
+ this.txt_fMaxWeight.Location = new System.Drawing.Point(537, 12);
this.txt_fMaxWeight.Name = "txt_fMaxWeight";
this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMaxWeight.Size = new System.Drawing.Size(62, 24);
+ this.txt_fMaxWeight.Size = new System.Drawing.Size(75, 24);
this.txt_fMaxWeight.StyleController = this.layoutMx1;
this.txt_fMaxWeight.TabIndex = 378;
this.txt_fMaxWeight.Tag = "fissueType";
//
// txt_fMinWeight
//
- this.txt_fMinWeight.Location = new System.Drawing.Point(498, 43);
+ this.txt_fMinWeight.Location = new System.Drawing.Point(537, 43);
this.txt_fMinWeight.Name = "txt_fMinWeight";
this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMinWeight.Size = new System.Drawing.Size(62, 24);
+ this.txt_fMinWeight.Size = new System.Drawing.Size(75, 24);
this.txt_fMinWeight.StyleController = this.layoutMx1;
this.txt_fMinWeight.TabIndex = 370;
this.txt_fMinWeight.Tag = "finishRate";
@@ -456,7 +454,7 @@
this.txt_itemName.Location = new System.Drawing.Point(84, 74);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(200, 27);
+ this.txt_itemName.Size = new System.Drawing.Size(226, 27);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 216;
this.txt_itemName.Tag = "readonly";
@@ -476,27 +474,27 @@
this.txt_itemNo.Location = new System.Drawing.Point(84, 43);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(226, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 213;
this.txt_itemNo.Tag = "readonly";
//
// txt_fSumPeople
//
- this.txt_fSumPeople.Location = new System.Drawing.Point(360, 74);
+ this.txt_fSumPeople.Location = new System.Drawing.Point(386, 74);
this.txt_fSumPeople.Name = "txt_fSumPeople";
this.txt_fSumPeople.Properties.Appearance.Options.UseFont = true;
- this.txt_fSumPeople.Size = new System.Drawing.Size(62, 24);
+ this.txt_fSumPeople.Size = new System.Drawing.Size(75, 24);
this.txt_fSumPeople.StyleController = this.layoutMx1;
this.txt_fSumPeople.TabIndex = 231;
this.txt_fSumPeople.Tag = "itemVersion";
//
// txt_fCapacity
//
- this.txt_fCapacity.Location = new System.Drawing.Point(498, 74);
+ this.txt_fCapacity.Location = new System.Drawing.Point(537, 74);
this.txt_fCapacity.Name = "txt_fCapacity";
this.txt_fCapacity.Properties.Appearance.Options.UseFont = true;
- this.txt_fCapacity.Size = new System.Drawing.Size(62, 24);
+ this.txt_fCapacity.Size = new System.Drawing.Size(75, 24);
this.txt_fCapacity.StyleController = this.layoutMx1;
this.txt_fCapacity.TabIndex = 319;
this.txt_fCapacity.Tag = "bomNo";
@@ -506,7 +504,7 @@
this.txt_remark.Location = new System.Drawing.Point(84, 105);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(200, 24);
+ this.txt_remark.Size = new System.Drawing.Size(226, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 258;
this.txt_remark.Tag = "lowLimt";
@@ -514,7 +512,7 @@
// txt_fJingDu
//
this.txt_fJingDu.EditValue = "PSC娴�";
- this.txt_fJingDu.Location = new System.Drawing.Point(360, 43);
+ this.txt_fJingDu.Location = new System.Drawing.Point(386, 43);
this.txt_fJingDu.Name = "txt_fJingDu";
this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -522,20 +520,20 @@
"PCS娴�",
"LOT娴�"});
this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fJingDu.Size = new System.Drawing.Size(62, 24);
+ this.txt_fJingDu.Size = new System.Drawing.Size(75, 24);
this.txt_fJingDu.StyleController = this.layoutMx1;
this.txt_fJingDu.TabIndex = 413;
//
// txt_fBegDate
//
this.txt_fBegDate.EditValue = null;
- this.txt_fBegDate.Location = new System.Drawing.Point(360, 105);
+ this.txt_fBegDate.Location = new System.Drawing.Point(386, 105);
this.txt_fBegDate.Name = "txt_fBegDate";
this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBegDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fBegDate.Size = new System.Drawing.Size(200, 24);
+ this.txt_fBegDate.Size = new System.Drawing.Size(226, 24);
this.txt_fBegDate.StyleController = this.layoutMx1;
this.txt_fBegDate.TabIndex = 414;
//
@@ -556,7 +554,7 @@
//
this.txt_orgName.Location = new System.Drawing.Point(84, 12);
this.txt_orgName.Name = "txt_orgName";
- this.txt_orgName.Size = new System.Drawing.Size(200, 24);
+ this.txt_orgName.Size = new System.Drawing.Size(226, 24);
this.txt_orgName.StyleController = this.layoutMx1;
this.txt_orgName.TabIndex = 417;
this.txt_orgName.Tag = "readonly";
@@ -564,7 +562,7 @@
// txt_fType
//
this.txt_fType.EditValue = "F-閲忎骇";
- this.txt_fType.Location = new System.Drawing.Point(360, 12);
+ this.txt_fType.Location = new System.Drawing.Point(386, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -572,7 +570,7 @@
"F-閲忎骇",
"S-璇曚綔"});
this.txt_fType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fType.Size = new System.Drawing.Size(62, 24);
+ this.txt_fType.Size = new System.Drawing.Size(75, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 418;
//
@@ -598,46 +596,46 @@
//
// txt_lastUpdateBy
//
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(636, 12);
+ this.txt_lastUpdateBy.Location = new System.Drawing.Point(688, 12);
this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
- this.txt_lastUpdateBy.Size = new System.Drawing.Size(62, 24);
+ this.txt_lastUpdateBy.Size = new System.Drawing.Size(75, 24);
this.txt_lastUpdateBy.StyleController = this.layoutMx1;
this.txt_lastUpdateBy.TabIndex = 421;
this.txt_lastUpdateBy.Tag = "readonly";
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(636, 43);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(688, 43);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
- this.txt_lastUpdateDate.Size = new System.Drawing.Size(62, 24);
+ this.txt_lastUpdateDate.Size = new System.Drawing.Size(75, 24);
this.txt_lastUpdateDate.StyleController = this.layoutMx1;
this.txt_lastUpdateDate.TabIndex = 422;
this.txt_lastUpdateDate.Tag = "readonly";
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(636, 74);
+ this.txt_checkBy.Location = new System.Drawing.Point(688, 74);
this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Size = new System.Drawing.Size(62, 24);
+ this.txt_checkBy.Size = new System.Drawing.Size(75, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
this.txt_checkBy.TabIndex = 423;
this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(636, 105);
+ this.txt_checkDate.Location = new System.Drawing.Point(688, 105);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(62, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(75, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 424;
this.txt_checkDate.Tag = "readonly";
//
// txt_isCheck
//
- this.txt_isCheck.Location = new System.Drawing.Point(564, 136);
+ this.txt_isCheck.Location = new System.Drawing.Point(616, 136);
this.txt_isCheck.Name = "txt_isCheck";
this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_isCheck.Size = new System.Drawing.Size(134, 24);
+ this.txt_isCheck.Size = new System.Drawing.Size(147, 24);
this.txt_isCheck.StyleController = this.layoutMx1;
this.txt_isCheck.TabIndex = 425;
this.txt_isCheck.Tag = "readonly";
@@ -647,9 +645,9 @@
this.btnCopy.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
this.btnCopy.Appearance.Options.UseBackColor = true;
this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16;
- this.btnCopy.Location = new System.Drawing.Point(150, 136);
+ this.btnCopy.Location = new System.Drawing.Point(163, 136);
this.btnCopy.Name = "btnCopy";
- this.btnCopy.Size = new System.Drawing.Size(134, 27);
+ this.btnCopy.Size = new System.Drawing.Size(147, 27);
this.btnCopy.StyleController = this.layoutMx1;
this.btnCopy.TabIndex = 426;
this.btnCopy.Text = "澶嶅埗鍒板叾瀹冧骇鍝�";
@@ -757,7 +755,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(710, 175);
+ this.Root.Size = new System.Drawing.Size(775, 177);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -767,7 +765,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -778,7 +776,7 @@
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -788,7 +786,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem14.Text = "浣跨敤缁勭粐";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
@@ -796,53 +794,53 @@
//
this.layoutControlItem20.Control = this.txt_lastUpdateBy;
this.layoutControlItem20.CustomizationFormText = "鏇存柊浜哄憳";
- this.layoutControlItem20.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(604, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem20.Text = "鏇存柊浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fType;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(302, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem6.Text = "鐢熶骇绫诲瀷";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fJingDu;
- this.layoutControlItem3.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem3.Location = new System.Drawing.Point(302, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem3.Text = "绠＄悊绮惧害";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fSumPeople;
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem7.Location = new System.Drawing.Point(302, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem7.Text = "鎬诲畾鍛�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_isCheck;
- this.layoutControlItem25.Location = new System.Drawing.Point(552, 124);
+ this.layoutControlItem25.Location = new System.Drawing.Point(604, 124);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(151, 33);
this.layoutControlItem25.Text = "瀹℃牳鐘舵��";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -850,43 +848,43 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fMaxWeight;
- this.layoutControlItem18.Location = new System.Drawing.Point(414, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(453, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem18.Text = "閲嶉噺涓婇檺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_fMinWeight;
- this.layoutControlItem19.Location = new System.Drawing.Point(414, 31);
+ this.layoutControlItem19.Location = new System.Drawing.Point(453, 31);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem19.Text = "閲嶉噺涓嬮檺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_checkDate;
- this.layoutControlItem23.Location = new System.Drawing.Point(552, 93);
+ this.layoutControlItem23.Location = new System.Drawing.Point(604, 93);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem23.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkBy;
- this.layoutControlItem22.Location = new System.Drawing.Point(552, 62);
+ this.layoutControlItem22.Location = new System.Drawing.Point(604, 62);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem22.Text = "瀹℃牳浜哄憳";
this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
@@ -894,23 +892,23 @@
//
this.layoutControlItem8.Control = this.txt_fCapacity;
this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘(PCS?H)";
- this.layoutControlItem8.Location = new System.Drawing.Point(414, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(453, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem8.Text = "鏍囧噯浜ц兘";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_fBegDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(276, 93);
+ this.layoutControlItem4.Location = new System.Drawing.Point(302, 93);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -921,7 +919,7 @@
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem12.Text = "娴佺▼鎻忚堪";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
@@ -933,7 +931,7 @@
this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(151, 33);
this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem15.Text = "閫夋嫨宸ュ簭";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
@@ -942,11 +940,11 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.btnCopy;
- this.layoutControlItem10.Location = new System.Drawing.Point(138, 124);
+ this.layoutControlItem10.Location = new System.Drawing.Point(151, 124);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(151, 33);
this.layoutControlItem10.Text = "澶嶅埗";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -954,11 +952,11 @@
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_lastUpdateDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem21.Location = new System.Drawing.Point(604, 31);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(138, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(151, 31);
this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
//
@@ -968,7 +966,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(775, 258);
+ this.tabMx.Size = new System.Drawing.Size(775, 443);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -977,7 +975,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(773, 226);
+ this.tabMxPage1.Size = new System.Drawing.Size(773, 411);
this.tabMxPage1.Text = "宸ュ簭淇℃伅";
//
// gcMx1
@@ -994,7 +992,7 @@
this.repositoryItemComboBox1,
this.repositoryItemComboBox2,
this.rptGx});
- this.gcMx1.Size = new System.Drawing.Size(773, 226);
+ this.gcMx1.Size = new System.Drawing.Size(773, 411);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1205,13 +1203,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // panelControl1
- //
- this.panelControl1.Location = new System.Drawing.Point(84, 194);
- this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(200, 100);
- this.panelControl1.TabIndex = 1;
- //
// Frm_WorkTechnique
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1295,7 +1286,6 @@
((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.ResumeLayout(false);
}
@@ -1377,6 +1367,5 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraEditors.PanelControl panelControl1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3