From 6db62ddd8db0a54afa15e06bb554950069e3859a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 14 四月 2025 17:19:04 +0800
Subject: [PATCH] fqc
---
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs | 234 ++++++++
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.resx | 0
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.resx | 3
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs | 82 ++
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs | 13
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.resx | 0
DevApp/Gs.DevApp/Gs.DevApp.csproj | 19
DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs | 11
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 1106 +++++++++++++++++++++++++------------
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 105 ++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 143 ++--
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 7
12 files changed, 1,235 insertions(+), 488 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 8518fde..9743459 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -30,24 +30,33 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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();
- 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.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 rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -87,8 +96,6 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
- this.txt_lineId = new Gs.DevApp.UserControl.UcLookWorkline();
this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer();
this.lbGuid = new System.Windows.Forms.Label();
@@ -109,9 +116,8 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_lifnr = new DevExpress.XtraEditors.TextEdit();
this.txt_djType = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_states = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
@@ -120,17 +126,15 @@
this.txt_mrmodeTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
this.txt_zrType = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kbList = new DevExpress.XtraEditors.ButtonEdit();
+ this.txt_lotNo = new DevExpress.XtraEditors.ButtonEdit();
+ this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lineId = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -140,20 +144,29 @@
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -210,6 +223,26 @@
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx14 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx14 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.layoutMxMsg2 = new DevExpress.XtraLayout.LayoutControl();
+ this.txtChouJian = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tabMxPage3 = new DevExpress.XtraTab.XtraTabPage();
this.ucUpFileList1 = new Gs.DevApp.UserControl.UCUpFileList();
this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.picCheckBox = new System.Windows.Forms.PictureBox();
@@ -237,7 +270,6 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
@@ -255,9 +287,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_states.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
@@ -266,17 +297,15 @@
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -286,20 +315,29 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -337,6 +375,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
this.tabMxPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).BeginInit();
+ this.layoutMxMsg2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ this.tabMxPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
@@ -493,7 +541,7 @@
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠岀姸鎬�";
- this.gridColumn5.FieldName = "states";
+ this.gridColumn5.FieldName = "checkStates";
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
@@ -831,8 +879,6 @@
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.txt_itemId);
- this.layoutMx1.Controls.Add(this.txt_lineId);
this.layoutMx1.Controls.Add(this.txt_msg);
this.layoutMx1.Controls.Add(this.txt_suppId);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -853,9 +899,8 @@
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_lifnr);
this.layoutMx1.Controls.Add(this.txt_djType);
- this.layoutMx1.Controls.Add(this.txt_lotNo);
this.layoutMx1.Controls.Add(this.txt_workNo);
- this.layoutMx1.Controls.Add(this.txt_states);
+ this.layoutMx1.Controls.Add(this.txt_checkStates);
this.layoutMx1.Controls.Add(this.txt_epTag);
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_createDate);
@@ -864,6 +909,11 @@
this.layoutMx1.Controls.Add(this.txt_mrmodeTxt);
this.layoutMx1.Controls.Add(this.txt_freceQty);
this.layoutMx1.Controls.Add(this.txt_zrType);
+ this.layoutMx1.Controls.Add(this.txt_kbList);
+ this.layoutMx1.Controls.Add(this.txt_lotNo);
+ this.layoutMx1.Controls.Add(this.txt_lineName);
+ this.layoutMx1.Controls.Add(this.txt_itemId);
+ this.layoutMx1.Controls.Add(this.txt_lineId);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
@@ -875,25 +925,6 @@
this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
- //
- // txt_itemId
- //
- this.txt_itemId.Location = new System.Drawing.Point(84, 99);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_itemId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_itemId.Size = new System.Drawing.Size(254, 24);
- this.txt_itemId.StyleController = this.layoutMx1;
- this.txt_itemId.TabIndex = 824;
- //
- // txt_lineId
- //
- this.txt_lineId.IsReadly = false;
- this.txt_lineId.Location = new System.Drawing.Point(84, 70);
- this.txt_lineId.Name = "txt_lineId";
- this.txt_lineId.Size = new System.Drawing.Size(254, 24);
- this.txt_lineId.TabIndex = 821;
//
// txt_msg
//
@@ -933,7 +964,7 @@
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(84, 215);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 244);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
this.txt_remarks.Size = new System.Drawing.Size(584, 24);
@@ -944,6 +975,8 @@
//
this.txt_fcheckResu.Location = new System.Drawing.Point(744, 128);
this.txt_fcheckResu.Name = "txt_fcheckResu";
+ this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
@@ -951,7 +984,7 @@
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(84, 41);
+ this.txt_releaseNo.Location = new System.Drawing.Point(414, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
@@ -981,7 +1014,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 128);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 157);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
@@ -991,7 +1024,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(84, 186);
+ this.txt_itemModel.Location = new System.Drawing.Point(84, 215);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
@@ -1087,15 +1120,6 @@
this.txt_djType.StyleController = this.layoutMx1;
this.txt_djType.TabIndex = 810;
//
- // txt_lotNo
- //
- this.txt_lotNo.Location = new System.Drawing.Point(414, 12);
- this.txt_lotNo.Name = "txt_lotNo";
- this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
- this.txt_lotNo.StyleController = this.layoutMx1;
- this.txt_lotNo.TabIndex = 815;
- this.txt_lotNo.Tag = "readonly";
- //
// txt_workNo
//
this.txt_workNo.Location = new System.Drawing.Point(1074, 186);
@@ -1105,14 +1129,16 @@
this.txt_workNo.TabIndex = 816;
this.txt_workNo.Tag = "readonly";
//
- // txt_states
+ // txt_checkStates
//
- this.txt_states.Location = new System.Drawing.Point(744, 99);
- this.txt_states.Name = "txt_states";
- this.txt_states.Size = new System.Drawing.Size(254, 24);
- this.txt_states.StyleController = this.layoutMx1;
- this.txt_states.TabIndex = 819;
- this.txt_states.Tag = "readonly";
+ this.txt_checkStates.Location = new System.Drawing.Point(744, 99);
+ this.txt_checkStates.Name = "txt_checkStates";
+ this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
+ this.txt_checkStates.StyleController = this.layoutMx1;
+ this.txt_checkStates.TabIndex = 819;
+ this.txt_checkStates.Tag = "readonly";
//
// txt_epTag
//
@@ -1144,7 +1170,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(84, 157);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 186);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Size = new System.Drawing.Size(254, 24);
this.txt_itemName.StyleController = this.layoutMx1;
@@ -1173,6 +1199,8 @@
//
this.txt_freceQty.Location = new System.Drawing.Point(1074, 99);
this.txt_freceQty.Name = "txt_freceQty";
+ this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 828;
@@ -1186,6 +1214,54 @@
this.txt_zrType.StyleController = this.layoutMx1;
this.txt_zrType.TabIndex = 829;
this.txt_zrType.Tag = "readonly";
+ //
+ // txt_kbList
+ //
+ this.txt_kbList.Location = new System.Drawing.Point(84, 70);
+ this.txt_kbList.Name = "txt_kbList";
+ this.txt_kbList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.txt_kbList.Size = new System.Drawing.Size(254, 24);
+ this.txt_kbList.StyleController = this.layoutMx1;
+ this.txt_kbList.TabIndex = 830;
+ //
+ // txt_lotNo
+ //
+ this.txt_lotNo.EditValue = "";
+ this.txt_lotNo.Location = new System.Drawing.Point(84, 41);
+ this.txt_lotNo.Name = "txt_lotNo";
+ this.txt_lotNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_lotNo.StyleController = this.layoutMx1;
+ this.txt_lotNo.TabIndex = 831;
+ //
+ // txt_lineName
+ //
+ this.txt_lineName.Location = new System.Drawing.Point(84, 99);
+ this.txt_lineName.Name = "txt_lineName";
+ this.txt_lineName.Size = new System.Drawing.Size(254, 24);
+ this.txt_lineName.StyleController = this.layoutMx1;
+ this.txt_lineName.TabIndex = 832;
+ this.txt_lineName.Tag = "readonly";
+ //
+ // txt_itemId
+ //
+ this.txt_itemId.Location = new System.Drawing.Point(84, 128);
+ this.txt_itemId.Name = "txt_itemId";
+ this.txt_itemId.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemId.StyleController = this.layoutMx1;
+ this.txt_itemId.TabIndex = 833;
+ this.txt_itemId.Tag = "readonly";
+ //
+ // txt_lineId
+ //
+ this.txt_lineId.Location = new System.Drawing.Point(414, 215);
+ this.txt_lineId.Name = "txt_lineId";
+ this.txt_lineId.Size = new System.Drawing.Size(254, 24);
+ this.txt_lineId.StyleController = this.layoutMx1;
+ this.txt_lineId.TabIndex = 834;
+ this.txt_lineId.Tag = "readonly";
//
// layoutControlItem17
//
@@ -1215,14 +1291,7 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem23,
- this.layoutControlItem5,
- this.layoutControlItem30,
- this.layoutControlItem4,
- this.layoutControlItem6,
- this.layoutControlItem34,
- this.layoutControlItem18,
this.layoutControlItem16,
this.layoutControlItem15,
this.layoutControlItem14,
@@ -1232,75 +1301,74 @@
this.layoutControlItem25,
this.layoutControlItem29,
this.layoutControlItem27,
- this.layoutControlItem28,
- this.layoutControlItem9,
- this.layoutControlItem22,
- this.layoutControlItem24,
- this.layoutControlItem3,
- this.txt_epTagtxt,
this.layoutControlItem31,
this.layoutControlItem10,
this.layoutControlItem32,
this.layoutControlItem8,
this.layoutControlItem33,
this.layoutControlItem2,
+ this.layoutControlItem35,
this.layoutControlItem12,
- this.layoutControlItem35});
+ this.layoutControlItem6,
+ this.layoutControlItem34,
+ this.layoutControlItem5,
+ this.layoutControlItem1,
+ this.layoutControlItem28,
+ this.txt_itemId1111,
+ this.txt_lineName111,
+ this.txt_boxQty11,
+ this.layoutControlItem9,
+ this.layoutControlItem22,
+ this.layoutControlItem24,
+ this.layoutControlItem3,
+ this.txt_epTagtxt,
+ this.layoutControlItem18,
+ this.layoutControlItem4});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
- 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;
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15});
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition18.Height = 100D;
+ rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition19.Height = 100D;
+ rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition20.Height = 100D;
+ rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16,
+ rowDefinition17,
+ rowDefinition18,
+ rowDefinition19,
+ rowDefinition20});
this.Root.Size = new System.Drawing.Size(1342, 282);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_releaseNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 29);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem23
//
@@ -1310,69 +1378,6 @@
this.layoutControlItem23.Size = new System.Drawing.Size(330, 29);
this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 116);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem5.Text = "浜у搧缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem30
- //
- this.layoutControlItem30.Control = this.txt_lineId;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 58);
- this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem30.Text = "閫夋嫨浜х嚎";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_itemId;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 87);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem4.Text = "閫夋嫨浜у搧";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 174);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem34
- //
- this.layoutControlItem34.Control = this.txt_itemName;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 145);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem34.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem34.Text = "浜у搧鍚嶇О";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_fmanageNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(330, 174);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem18.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem18.Text = "娴佺▼缂栧彿";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
@@ -1476,15 +1481,174 @@
this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem27.TextVisible = false;
//
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_createBy;
+ this.layoutControlItem31.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem31.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fcheckResu;
+ this.layoutControlItem10.Location = new System.Drawing.Point(660, 116);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txt_checkStates;
+ this.layoutControlItem32.Location = new System.Drawing.Point(660, 87);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem32.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fcheckBy;
+ this.layoutControlItem8.Location = new System.Drawing.Point(660, 58);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txt_createDate;
+ this.layoutControlItem33.Location = new System.Drawing.Point(660, 29);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem33.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_fcheckDate;
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 145);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txt_zrType;
+ this.layoutControlItem35.Location = new System.Drawing.Point(990, 232);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem35.Size = new System.Drawing.Size(332, 30);
+ this.layoutControlItem35.Text = "璐ｄ换鍒ゅ畾";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_remarks;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 232);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem12.Size = new System.Drawing.Size(660, 30);
+ this.layoutControlItem12.Text = "澶囨敞璇存槑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_itemModel;
+ this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 203);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.txt_itemName;
+ this.layoutControlItem34.Location = new System.Drawing.Point(0, 174);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem34.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem34.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_itemNo;
+ this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 145);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem5.Text = "浜у搧缂栫爜";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_releaseNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_lotNo;
- this.layoutControlItem28.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 29);
this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem28.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem28.Text = "鐢熶骇宸ュ崟";
+ this.layoutControlItem28.Text = "閫夋嫨宸ュ崟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_itemId1111
+ //
+ this.txt_itemId1111.Control = this.txt_itemId;
+ this.txt_itemId1111.Location = new System.Drawing.Point(0, 116);
+ this.txt_itemId1111.Name = "txt_itemId1111";
+ this.txt_itemId1111.OptionsTableLayoutItem.RowIndex = 4;
+ this.txt_itemId1111.Size = new System.Drawing.Size(330, 29);
+ this.txt_itemId1111.Text = "浜у搧ID";
+ this.txt_itemId1111.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_lineName111
+ //
+ this.txt_lineName111.Control = this.txt_lineName;
+ this.txt_lineName111.Location = new System.Drawing.Point(0, 87);
+ this.txt_lineName111.Name = "txt_lineName111";
+ this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 3;
+ this.txt_lineName111.Size = new System.Drawing.Size(330, 29);
+ this.txt_lineName111.Text = "鐢熶骇绾垮埆";
+ this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_boxQty11
+ //
+ this.txt_boxQty11.Control = this.txt_kbList;
+ this.txt_boxQty11.Location = new System.Drawing.Point(0, 58);
+ this.txt_boxQty11.Name = "txt_boxQty11";
+ this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 2;
+ this.txt_boxQty11.Size = new System.Drawing.Size(330, 29);
+ this.txt_boxQty11.Text = "閫夋嫨绠辩爜";
+ this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
@@ -1541,92 +1705,27 @@
this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem31
+ // layoutControlItem18
//
- this.layoutControlItem31.Control = this.txt_createBy;
- this.layoutControlItem31.Location = new System.Drawing.Point(660, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem31.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem18.Control = this.txt_fmanageNo;
+ this.layoutControlItem18.Location = new System.Drawing.Point(330, 174);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem18.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem18.Text = "娴佺▼缂栧彿";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem10
+ // layoutControlItem4
//
- this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(660, 116);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem32
- //
- this.layoutControlItem32.Control = this.txt_states;
- this.layoutControlItem32.Location = new System.Drawing.Point(660, 87);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem32.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(660, 58);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_createDate;
- this.layoutControlItem33.Location = new System.Drawing.Point(660, 29);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 145);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 203);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 29);
- this.layoutControlItem12.Text = "澶囨敞璇存槑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem35
- //
- this.layoutControlItem35.Control = this.txt_zrType;
- this.layoutControlItem35.Location = new System.Drawing.Point(990, 232);
- this.layoutControlItem35.Name = "layoutControlItem35";
- this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem35.Size = new System.Drawing.Size(332, 30);
- this.layoutControlItem35.Text = "璐ｄ换鍒ゅ畾";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.Control = this.txt_lineId;
+ this.layoutControlItem4.Location = new System.Drawing.Point(330, 203);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem4.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem4.Text = "绾垮埆ID";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
@@ -1638,7 +1737,8 @@
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
- this.tabMxPage2});
+ this.tabMxPage2,
+ this.tabMxPage3});
//
// tabMxPage1
//
@@ -2251,23 +2351,23 @@
this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.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.AutoSize;
- columnDefinition8.Width = 110D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition19.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16,
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19});
+ rowDefinition21.Height = 100D;
+ rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition10});
+ rowDefinition21});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
this.layoutControlGroup1.TextVisible = false;
@@ -2315,16 +2415,255 @@
//
// tabMxPage2
//
- this.tabMxPage2.Controls.Add(this.ucUpFileList1);
+ this.tabMxPage2.Controls.Add(this.gcMx14);
+ this.tabMxPage2.Controls.Add(this.panel1);
this.tabMxPage2.Name = "tabMxPage2";
this.tabMxPage2.Size = new System.Drawing.Size(1340, 362);
- this.tabMxPage2.Text = "闄勪欢淇℃伅";
+ this.tabMxPage2.Text = "浜у搧鏉＄爜鏄庣粏";
+ //
+ // gcMx14
+ //
+ this.gcMx14.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx14.Location = new System.Drawing.Point(0, 47);
+ this.gcMx14.MainView = this.gvMx14;
+ this.gcMx14.Name = "gcMx14";
+ this.gcMx14.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMx14.Size = new System.Drawing.Size(1340, 315);
+ this.gcMx14.TabIndex = 1;
+ this.gcMx14.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx14});
+ //
+ // gvMx14
+ //
+ this.gvMx14.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx14.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx14.Appearance.Row.Options.UseFont = true;
+ this.gvMx14.ColumnPanelRowHeight = 50;
+ this.gvMx14.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx2guid,
+ this.gridColumn12,
+ this.gvMx2itemBarcode,
+ this.gvMx2quantity,
+ this.gridColumn16,
+ this.gvMx2itemSname,
+ this.gridColumn34,
+ this.gridColumn35,
+ this.gridColumn36,
+ this.gridColumn11,
+ this.gridColumn31});
+ this.gvMx14.GridControl = this.gcMx14;
+ this.gvMx14.Name = "gvMx14";
+ this.gvMx14.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx14.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx14.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx2guid
+ //
+ this.gvMx2guid.AppearanceCell.Options.UseFont = true;
+ this.gvMx2guid.Caption = "涓婚敭GUID";
+ this.gvMx2guid.FieldName = "guid";
+ this.gvMx2guid.MinWidth = 50;
+ this.gvMx2guid.Name = "gvMx2guid";
+ this.gvMx2guid.Tag = "query_a.guid";
+ this.gvMx2guid.Width = 94;
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.Caption = "鏄惁鎶芥";
+ this.gridColumn12.FieldName = "isCheck";
+ this.gridColumn12.MaxWidth = 50;
+ this.gridColumn12.MinWidth = 50;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 0;
+ this.gridColumn12.Width = 50;
+ //
+ // gvMx2itemBarcode
+ //
+ this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gvMx2itemBarcode.Caption = "鏉＄爜缂栧彿";
+ this.gvMx2itemBarcode.FieldName = "itemBarcode";
+ this.gvMx2itemBarcode.MinWidth = 50;
+ this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+ this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gvMx2itemBarcode.Visible = true;
+ this.gvMx2itemBarcode.VisibleIndex = 1;
+ this.gvMx2itemBarcode.Width = 94;
+ //
+ // gvMx2quantity
+ //
+ this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
+ this.gvMx2quantity.Caption = "宸ュ崟缂栧彿";
+ this.gvMx2quantity.FieldName = "daa001";
+ this.gvMx2quantity.MinWidth = 50;
+ this.gvMx2quantity.Name = "gvMx2quantity";
+ this.gvMx2quantity.Tag = "query_a.QUANTITY";
+ this.gvMx2quantity.Visible = true;
+ this.gvMx2quantity.VisibleIndex = 2;
+ this.gvMx2quantity.Width = 94;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "浜у搧缂栫爜";
+ this.gridColumn16.FieldName = "itemNo";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 3;
+ this.gridColumn16.Width = 94;
+ //
+ // gvMx2itemSname
+ //
+ this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
+ this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
+ this.gvMx2itemSname.FieldName = "itemName";
+ this.gvMx2itemSname.MinWidth = 50;
+ this.gvMx2itemSname.Name = "gvMx2itemSname";
+ this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
+ this.gvMx2itemSname.Visible = true;
+ this.gvMx2itemSname.VisibleIndex = 4;
+ this.gvMx2itemSname.Width = 94;
+ //
+ // gridColumn34
+ //
+ this.gridColumn34.Caption = "鍗曚綅";
+ this.gridColumn34.FieldName = "dwName";
+ this.gridColumn34.MinWidth = 25;
+ this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.Visible = true;
+ this.gridColumn34.VisibleIndex = 5;
+ this.gridColumn34.Width = 94;
+ //
+ // gridColumn35
+ //
+ this.gridColumn35.Caption = "鏁伴噺";
+ this.gridColumn35.FieldName = "quantity";
+ this.gridColumn35.MinWidth = 25;
+ this.gridColumn35.Name = "gridColumn35";
+ this.gridColumn35.Visible = true;
+ this.gridColumn35.VisibleIndex = 6;
+ this.gridColumn35.Width = 94;
+ //
+ // gridColumn36
+ //
+ this.gridColumn36.Caption = "寰呭叆搴撴暟";
+ this.gridColumn36.FieldName = "wrkQty";
+ this.gridColumn36.MinWidth = 25;
+ this.gridColumn36.Name = "gridColumn36";
+ this.gridColumn36.Visible = true;
+ this.gridColumn36.VisibleIndex = 7;
+ this.gridColumn36.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "宸插叆搴撴暟";
+ this.gridColumn11.FieldName = "rkQty";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 8;
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn31
+ //
+ this.gridColumn31.Caption = "绠卞彿";
+ this.gridColumn31.FieldName = "tbNo";
+ this.gridColumn31.MinWidth = 25;
+ this.gridColumn31.Name = "gridColumn31";
+ this.gridColumn31.Visible = true;
+ this.gridColumn31.VisibleIndex = 9;
+ this.gridColumn31.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.layoutMxMsg2);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(1340, 47);
+ this.panel1.TabIndex = 2;
+ //
+ // layoutMxMsg2
+ //
+ this.layoutMxMsg2.Controls.Add(this.txtChouJian);
+ this.layoutMxMsg2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMxMsg2.Location = new System.Drawing.Point(0, 0);
+ this.layoutMxMsg2.Name = "layoutMxMsg2";
+ this.layoutMxMsg2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 157, 812, 500);
+ this.layoutMxMsg2.Root = this.layoutControlGroup2;
+ this.layoutMxMsg2.Size = new System.Drawing.Size(1340, 47);
+ this.layoutMxMsg2.TabIndex = 0;
+ this.layoutMxMsg2.Text = "layoutControl1";
+ //
+ // txtChouJian
+ //
+ this.txtChouJian.Location = new System.Drawing.Point(121, 4);
+ this.txtChouJian.Name = "txtChouJian";
+ this.txtChouJian.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
+ this.txtChouJian.Properties.Appearance.Options.UseFont = true;
+ this.txtChouJian.Size = new System.Drawing.Size(324, 36);
+ this.txtChouJian.StyleController = this.layoutMxMsg2;
+ this.txtChouJian.TabIndex = 4;
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem30});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "Root";
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
+ columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21.Width = 100D;
+ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition22.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition20,
+ columnDefinition21,
+ columnDefinition22});
+ rowDefinition22.Height = 100D;
+ rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition22});
+ this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 2);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1340, 47);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.txtChouJian;
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.Size = new System.Drawing.Size(445, 43);
+ this.layoutControlItem30.Text = "璇锋壂鎶芥鐨勬潯鐮�";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(105, 18);
+ //
+ // tabMxPage3
+ //
+ this.tabMxPage3.Controls.Add(this.ucUpFileList1);
+ this.tabMxPage3.Name = "tabMxPage3";
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 362);
+ this.tabMxPage3.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
//
this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
this.ucUpFileList1.Name = "ucUpFileList1";
+ this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
this.ucUpFileList1.Size = new System.Drawing.Size(1340, 362);
this.ucUpFileList1.TabIndex = 0;
@@ -2392,7 +2731,6 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
@@ -2410,9 +2748,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lifnr.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_djType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_states.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
@@ -2421,17 +2758,15 @@
((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_zrType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kbList.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -2441,20 +2776,29 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2492,6 +2836,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
this.tabMxPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMxMsg2)).EndInit();
+ this.layoutMxMsg2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txtChouJian.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ this.tabMxPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
@@ -2579,7 +2933,7 @@
private DevExpress.XtraEditors.PanelControl panMsg;
private DevExpress.XtraEditors.SimpleButton btnLoad;
private DevExpress.XtraEditors.TextEdit txtJianYan;
- private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraEditors.TextEdit txt_fmanageNo;
@@ -2615,28 +2969,18 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_djType;
private UserControl.UcLookCustomer txt_suppId;
private UserControl.UcDictionary txt_msg;
- private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraEditors.TextEdit txt_workNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraEditors.TextEdit txt_states;
+ private DevExpress.XtraEditors.TextEdit txt_checkStates;
private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
- private UserControl.UcLookWorkline txt_lineId;
private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraEditors.ButtonEdit txt_itemId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.TextEdit txt_itemName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private UserControl.UCUpFileList ucUpFileList1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraEditors.TextEdit txt_fzrIdTxt;
private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
@@ -2649,19 +2993,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
@@ -2670,5 +3007,46 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails;
private DevExpress.XtraEditors.TextEdit txt_zrType;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraEditors.ButtonEdit txt_kbList;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraEditors.ButtonEdit txt_lotNo;
+ private DevExpress.XtraEditors.TextEdit txt_lineName;
+ private DevExpress.XtraEditors.TextEdit txt_itemId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111;
+ private DevExpress.XtraLayout.LayoutControlItem txt_lineName111;
+ private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraEditors.TextEdit txt_lineId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraGrid.GridControl gcMx14;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx14;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraLayout.LayoutControl layoutMxMsg2;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraEditors.TextEdit txtChouJian;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index fc5edf2..6775bc9 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -51,16 +51,10 @@
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
btnIpt.Click += BtnIpt_Click;
txt_suppId.getSuppler("");
- txt_lineId.getSuppler("");
- txt_itemId.Click += (s, e) =>
+ //閫夋嫨宸ュ崟
+ txt_lotNo.Click += (s, e) =>
{
- string _lineId = txt_lineId.GetId();
- if (string.IsNullOrEmpty(_lineId))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛閫夋嫨浜х嚎锛�");
- return;
- }
- var frm = new SelectFqcItem(_lineId);
+ var frm = new SelectFqcDaa();
frm.UpdateParent += (ss, ee) =>
{
try
@@ -72,6 +66,43 @@
txt_itemName.Text = lst[0].itemName;
txt_itemNo.Text = lst[0].itemNo;
txt_lotNo.Text = lst[0].gdbh;
+ txt_lineName.Text = lst[0].lineName;
+ txt_lineId.Text = lst[0].lineId;
+ txt_checkStates.Text = "W:鏈煡";
+ txt_fcheckResu.Text = "W:鏈煡";
+ txt_freceQty.Text = "W:鏈煡";
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ };
+ //閫夋嫨绠辩爜
+ txt_kbList.Click += (s, e) =>
+ {
+ string _lotNo = txt_lotNo.Text.Trim();
+ if (string.IsNullOrEmpty(_lotNo))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛閫夋嫨宸ュ崟锛�");
+ return;
+ }
+ var frm = new SelectFqcBox(_lotNo);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<string>();
+ lst = ee.StringList;
+ System.Text.StringBuilder sb = new System.Text.StringBuilder();
+ foreach (var item in lst)
+ {
+ if (sb.Length > 0)
+ sb.Append(",");
+ sb.Append(item);
+ };
+ txt_kbList.Text = sb.ToString();
}
catch (Exception ex)
{
@@ -450,14 +481,15 @@
string _txt_fbatchQty = txt_fbatchQty.Text.Trim();//鎶芥鏁伴噺
string _txt_lifnr = txt_lifnr.Text.Trim();//瀹㈡埛璁㈠崟
string _txt_suppId = txt_suppId.GetId();//瀹㈡埛id
- string _txt_lineId = txt_lineId.GetId();//浜х嚎
- string _txt_itemId = txt_itemId.Text.Trim();//浜у搧
+ string _txt_lineId = "";//浜х嚎
+ string _txt_itemId = "";//浜у搧
string _txt_remarks = txt_remarks.Text.Trim();//澶囨敞
string _txt_epTag = txt_epTag.Text.Trim();//鐜繚
string _txt_msg = txt_msg.TextTxt;//寮傚父
string _txt_fmanageNo = txt_fmanageNo.Text.Trim();//娴佺▼缂栧彿
string _txt_lotNo1 = txt_lotNo1.Text.Trim();//閫佹鎵瑰彿
string _txt_lotNo = txt_lotNo.Text.Trim();//鐢熶骇宸ュ崟
+ string _kbList = txt_kbList.Text.Trim();
if (txt_djType.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
@@ -468,18 +500,6 @@
{
Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�");
txt_fbatchQty.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_lineId.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("浜х嚎涓嶈兘涓虹┖锛�");
- txt_lineId.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_itemId.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("浜у搧涓嶈兘涓虹┖锛�");
- txt_itemId.Focus();
return;
}
if (string.IsNullOrEmpty(_txt_lotNo.Trim()))
@@ -504,6 +524,7 @@
lotNo1 = _txt_lotNo1,//閫佹鎵瑰彿
lotNo = _txt_lotNo,//鐢熶骇宸ュ崟
edtType = 0,
+ kbList = _kbList,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -678,6 +699,10 @@
{
if (e.Page.Name == "tabMxPage2")
{
+ getList14();
+ }
+ if (e.Page.Name == "tabMxPage3")
+ {
ucUpFileList1.getFileList();
}
}
@@ -723,9 +748,39 @@
}
}
+ /// <summary>
+ /// 杩欐槸璁板綍琛�
+ /// </summary>
+ private void getList14()
+ {
+ var _obj = new
+ {
+ parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel14", JsonConvert.SerializeObject(_obj));
+ JObject _job = JObject.Parse(strJson);
+ JArray array = new JArray();
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
+ DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ gcMx14.BindingContext = new BindingContext();
+ gcMx14.DataSource = dt;
+ gcMx14.ForceInitialize();
+ gvMx14.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
private void setEable(bool bl)
{
- txtJianYan.ReadOnly = !bl;
+ txtChouJian.ReadOnly=txtJianYan.ReadOnly = !bl;
btnLoad.Enabled = bl;
btnIpt.Text = (bl == true ? "褰曞叆鏍锋湰" : "鏌ョ湅鏍锋湰");
}
@@ -781,7 +836,5 @@
};
frm.ShowDialog();
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.resx b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.resx
index 5160e8b..e7132ea 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.resx
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.resx
@@ -120,4 +120,7 @@
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>25</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
new file mode 100644
index 0000000..9f1d4de
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.Designer.cs
@@ -0,0 +1,234 @@
+锘縩amespace Gs.DevApp.DevFrm.FQC
+{
+ partial class SelectFqcBox
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1034, 542);
+ this.gcMain.TabIndex = 6;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gridColumn1,
+ this.gv_supplierItemCode,
+ this.gv_supplierItemName,
+ this.gridColumn5,
+ this.gridColumn2,
+ this.gridColumn4,
+ this.gridColumn3});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.MultiSelect = true;
+ this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+ this.gv_guid.FieldName = "dabGuid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.OptionsColumn.ReadOnly = true;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鐗╂枡ID";
+ this.gridColumn1.FieldName = "itemId";
+ this.gridColumn1.MinWidth = 80;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Tag = "itemId";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.Width = 94;
+ //
+ // gv_supplierItemCode
+ //
+ this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
+ this.gv_supplierItemCode.FieldName = "itemNo";
+ this.gv_supplierItemCode.MinWidth = 100;
+ this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+ this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+ this.gv_supplierItemCode.Visible = true;
+ this.gv_supplierItemCode.VisibleIndex = 5;
+ this.gv_supplierItemCode.Width = 100;
+ //
+ // gv_supplierItemName
+ //
+ this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
+ this.gv_supplierItemName.FieldName = "itemName";
+ this.gv_supplierItemName.MinWidth = 120;
+ this.gv_supplierItemName.Name = "gv_supplierItemName";
+ this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+ this.gv_supplierItemName.Visible = true;
+ this.gv_supplierItemName.VisibleIndex = 6;
+ this.gv_supplierItemName.Width = 120;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 250;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Tag = "dab005";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.Width = 250;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "宸ュ崟鍙�";
+ this.gridColumn2.FieldName = "dab001";
+ this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "dab001";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鏁伴噺";
+ this.gridColumn4.FieldName = "quantity";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍗℃澘鐮�";
+ this.gridColumn3.FieldName = "itemBarcode";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 94;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(0, 542);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1034, 43);
+ this.panelControl1.TabIndex = 9;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+ this.btnIn.Location = new System.Drawing.Point(938, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // SelectFqcBox
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1034, 585);
+ this.Controls.Add(this.gcMain);
+ this.Controls.Add(this.panelControl1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Name = "SelectFqcBox";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "璇烽�夋嫨椤圭爜";
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs
new file mode 100644
index 0000000..1aa73d8
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.cs
@@ -0,0 +1,82 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.FQC
+{
+ public partial class SelectFqcBox : DevExpress.XtraEditors.XtraForm
+ {
+ private readonly string _webServiceName = "FqcManager/";
+ private string daaNo = "";
+ public SelectFqcBox(string _daaNo)
+ {
+ InitializeComponent();
+ this.daaNo = _daaNo;
+ this.Text = "璇烽�夋嫨銆�"+this.daaNo+"銆戠殑鍗℃澘鐮�";
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ getPageList(1);
+ btnIn.Click += (s, e) =>
+ {
+ var list = new List<string>();
+ int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
+ DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
+ foreach (int idx in rows)
+ {
+ string _guid = dt.Rows[idx]["itemBarcode"].ToString();
+ list.Add(_guid);
+ }
+ UpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { StringList = list });
+ Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _obj = new
+ {
+ currentPage = curPage,
+ everyPageSize = 999999,
+ sortName = "",
+ keyWhere = "",
+ daaNo = this.daaNo
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "SelectFqcBox", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.resx b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.resx
rename to DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcBox.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs
similarity index 96%
rename from DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs
index 7435dad..a28674d 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.Designer.cs
@@ -1,6 +1,6 @@
锘縩amespace Gs.DevApp.DevFrm.FQC
{
- partial class SelectFqcItem
+ partial class SelectFqcDaa
{
/// <summary>
/// Required designer variable.
@@ -90,9 +90,8 @@
//
// gridColumn1
//
- this.gridColumn1.Caption = "浜х嚎";
+ this.gridColumn1.Caption = "鐢熶骇绾垮埆";
this.gridColumn1.FieldName = "lineName";
- this.gridColumn1.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
@@ -103,7 +102,6 @@
//
this.gridColumn2.Caption = "宸ュ崟缂栧彿";
this.gridColumn2.FieldName = "gdbh";
- this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
@@ -152,6 +150,7 @@
//
this.gv_Btn.Caption = "閫夋嫨";
this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gv_Btn.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
this.gv_Btn.MinWidth = 25;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
@@ -169,7 +168,7 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // SelectFqcItem
+ // SelectFqcDaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
@@ -178,9 +177,9 @@
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "SelectFqcItem";
+ this.Name = "SelectFqcDaa";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨宸ュ崟";
+ this.Text = "閫夋嫨绠辩爜";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
similarity index 91%
rename from DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs
rename to DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
index eb88031..05b1ca1 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.cs
@@ -9,14 +9,12 @@
namespace Gs.DevApp.DevFrm.FQC
{
- public partial class SelectFqcItem : DevExpress.XtraEditors.XtraForm
+ public partial class SelectFqcDaa : DevExpress.XtraEditors.XtraForm
{
private readonly string _webServiceName = "FqcManager/";
- string lineId = "";
- public SelectFqcItem(string _lineId)
+ public SelectFqcDaa()
{
InitializeComponent();
- this.lineId = _lineId;
getPageList(1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
}
@@ -33,13 +31,12 @@
everyPageSize = 999999,
sortName = "",
keyWhere = "",
- lineId = this.lineId
};
var json = JsonConvert.SerializeObject(_obj);
try
{
var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "SelectFqcItem", json);
+ _webServiceName + "SelectFqcDaa", json);
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
@@ -86,6 +83,8 @@
itemName = dr["itemName"].ToString(),
itemNo = dr["itemNo"].ToString(),
itemModel = dr["itemModel"].ToString(),
+ lineName= dr["lineName"].ToString(),
+ lineId = dr["lineId"].ToString(),
gdbh = dr["gdbh"].ToString(),
});
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.resx b/DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.resx
similarity index 100%
copy from DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcItem.resx
copy to DevApp/Gs.DevApp/DevFrm/FQC/SelectFqcDaa.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 92822dc..8810187 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -90,7 +90,6 @@
this.gv_cust = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -225,6 +224,8 @@
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx3 = new DevExpress.XtraGrid.GridControl();
this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -265,8 +266,6 @@
this.panMx100 = new System.Windows.Forms.Panel();
this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -358,6 +357,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
@@ -380,8 +381,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
this.panMx100.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -482,7 +481,6 @@
this.gv_cust,
this.gridColumn1,
this.gv_daa015,
- this.gridColumn2,
this.gv_daa009,
this.gv_prepareTime,
this.gv_daa028,
@@ -812,16 +810,6 @@
this.gv_daa015.VisibleIndex = 24;
this.gv_daa015.Width = 94;
//
- // gridColumn2
- //
- this.gridColumn2.Caption = "瀹為檯绾垮埆";
- this.gridColumn2.FieldName = "sjlineName";
- this.gridColumn2.MinWidth = 50;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 25;
- this.gridColumn2.Width = 94;
- //
// gv_daa009
//
this.gv_daa009.AppearanceCell.Options.UseFont = true;
@@ -845,7 +833,7 @@
this.gv_prepareTime.OptionsColumn.AllowEdit = false;
this.gv_prepareTime.Tag = "query_a.prepare_time";
this.gv_prepareTime.Visible = true;
- this.gv_prepareTime.VisibleIndex = 26;
+ this.gv_prepareTime.VisibleIndex = 25;
this.gv_prepareTime.Width = 180;
//
// gv_daa028
@@ -858,7 +846,7 @@
this.gv_daa028.OptionsColumn.AllowEdit = false;
this.gv_daa028.Tag = "query_a.daa028";
this.gv_daa028.Visible = true;
- this.gv_daa028.VisibleIndex = 27;
+ this.gv_daa028.VisibleIndex = 26;
this.gv_daa028.Width = 180;
//
// gv_daa016
@@ -871,7 +859,7 @@
this.gv_daa016.OptionsColumn.AllowEdit = false;
this.gv_daa016.Tag = "query_a.daa016";
this.gv_daa016.Visible = true;
- this.gv_daa016.VisibleIndex = 28;
+ this.gv_daa016.VisibleIndex = 27;
this.gv_daa016.Width = 180;
//
// gv_daa017
@@ -884,7 +872,7 @@
this.gv_daa017.OptionsColumn.AllowEdit = false;
this.gv_daa017.Tag = "query_a.daa017";
this.gv_daa017.Visible = true;
- this.gv_daa017.VisibleIndex = 29;
+ this.gv_daa017.VisibleIndex = 28;
this.gv_daa017.Width = 180;
//
// gv_mesStartProd
@@ -897,7 +885,7 @@
this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 30;
+ this.gv_mesStartProd.VisibleIndex = 29;
this.gv_mesStartProd.Width = 180;
//
// gv_mesEndProd
@@ -910,7 +898,7 @@
this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 31;
+ this.gv_mesEndProd.VisibleIndex = 30;
this.gv_mesEndProd.Width = 180;
//
// gridColumn21
@@ -920,7 +908,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 32;
+ this.gridColumn21.VisibleIndex = 31;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -930,7 +918,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 33;
+ this.gridColumn22.VisibleIndex = 32;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -948,7 +936,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 34;
+ this.gridColumn24.VisibleIndex = 33;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -958,7 +946,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 35;
+ this.gridColumn25.VisibleIndex = 34;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -968,7 +956,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 36;
+ this.gridColumn26.VisibleIndex = 35;
this.gridColumn26.Width = 94;
//
// pageBar1
@@ -1057,7 +1045,7 @@
//
// txt_daa009
//
- this.txt_daa009.Location = new System.Drawing.Point(420, 147);
+ this.txt_daa009.Location = new System.Drawing.Point(420, 152);
this.txt_daa009.Name = "txt_daa009";
this.txt_daa009.Properties.Appearance.Options.UseFont = true;
this.txt_daa009.Size = new System.Drawing.Size(506, 24);
@@ -1067,7 +1055,7 @@
//
// txt_daa013
//
- this.txt_daa013.Location = new System.Drawing.Point(726, 119);
+ this.txt_daa013.Location = new System.Drawing.Point(726, 124);
this.txt_daa013.Name = "txt_daa013";
this.txt_daa013.Properties.Appearance.Options.UseFont = true;
this.txt_daa013.Size = new System.Drawing.Size(200, 24);
@@ -1077,7 +1065,7 @@
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(114, 7);
+ this.txt_daa001.Location = new System.Drawing.Point(114, 12);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
this.txt_daa001.Size = new System.Drawing.Size(200, 24);
@@ -1087,7 +1075,7 @@
//
// textEdit1
//
- this.textEdit1.Location = new System.Drawing.Point(420, 35);
+ this.textEdit1.Location = new System.Drawing.Point(420, 40);
this.textEdit1.Name = "textEdit1";
this.textEdit1.Properties.Appearance.Options.UseFont = true;
this.textEdit1.Size = new System.Drawing.Size(200, 24);
@@ -1097,7 +1085,7 @@
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(726, 7);
+ this.txt_daa008.Location = new System.Drawing.Point(726, 12);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
this.txt_daa008.Size = new System.Drawing.Size(200, 24);
@@ -1107,7 +1095,7 @@
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 63);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24);
@@ -1117,7 +1105,7 @@
//
// txt_daa028
//
- this.txt_daa028.Location = new System.Drawing.Point(420, 63);
+ this.txt_daa028.Location = new System.Drawing.Point(420, 68);
this.txt_daa028.Name = "txt_daa028";
this.txt_daa028.Properties.Appearance.Options.UseFont = true;
this.txt_daa028.Size = new System.Drawing.Size(200, 24);
@@ -1127,7 +1115,7 @@
//
// txt_mesStartProd
//
- this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 35);
+ this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40);
this.txt_mesStartProd.Name = "txt_mesStartProd";
this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24);
@@ -1137,7 +1125,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(114, 35);
+ this.txt_daa014.Location = new System.Drawing.Point(114, 40);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Size = new System.Drawing.Size(200, 24);
@@ -1147,7 +1135,7 @@
//
// txt_daa022Remark
//
- this.txt_daa022Remark.Location = new System.Drawing.Point(420, 7);
+ this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12);
this.txt_daa022Remark.Name = "txt_daa022Remark";
this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24);
@@ -1157,7 +1145,7 @@
//
// txt_daa010
//
- this.txt_daa010.Location = new System.Drawing.Point(726, 35);
+ this.txt_daa010.Location = new System.Drawing.Point(726, 40);
this.txt_daa010.Name = "txt_daa010";
this.txt_daa010.Properties.Appearance.Options.UseFont = true;
this.txt_daa010.Size = new System.Drawing.Size(200, 24);
@@ -1167,7 +1155,7 @@
//
// txt_mesEndProd
//
- this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 63);
+ this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68);
this.txt_mesEndProd.Name = "txt_mesEndProd";
this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24);
@@ -1177,7 +1165,7 @@
//
// txt_daa011
//
- this.txt_daa011.Location = new System.Drawing.Point(726, 63);
+ this.txt_daa011.Location = new System.Drawing.Point(726, 68);
this.txt_daa011.Name = "txt_daa011";
this.txt_daa011.Properties.Appearance.Options.UseFont = true;
this.txt_daa011.Size = new System.Drawing.Size(200, 24);
@@ -1187,7 +1175,7 @@
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(726, 91);
+ this.txt_dptName.Location = new System.Drawing.Point(726, 96);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
this.txt_dptName.Size = new System.Drawing.Size(200, 24);
@@ -1197,7 +1185,7 @@
//
// txt_daa016
//
- this.txt_daa016.Location = new System.Drawing.Point(1032, 91);
+ this.txt_daa016.Location = new System.Drawing.Point(1032, 96);
this.txt_daa016.Name = "txt_daa016";
this.txt_daa016.Properties.Appearance.Options.UseFont = true;
this.txt_daa016.Size = new System.Drawing.Size(202, 24);
@@ -1207,7 +1195,7 @@
//
// txt_daa029
//
- this.txt_daa029.Location = new System.Drawing.Point(114, 91);
+ this.txt_daa029.Location = new System.Drawing.Point(114, 96);
this.txt_daa029.Name = "txt_daa029";
this.txt_daa029.Properties.Appearance.Options.UseFont = true;
this.txt_daa029.Size = new System.Drawing.Size(200, 24);
@@ -1217,7 +1205,7 @@
//
// txt_lineName
//
- this.txt_lineName.Location = new System.Drawing.Point(420, 91);
+ this.txt_lineName.Location = new System.Drawing.Point(420, 96);
this.txt_lineName.Name = "txt_lineName";
this.txt_lineName.Properties.Appearance.Options.UseFont = true;
this.txt_lineName.Size = new System.Drawing.Size(200, 24);
@@ -1227,7 +1215,7 @@
//
// txt_daa017
//
- this.txt_daa017.Location = new System.Drawing.Point(1032, 119);
+ this.txt_daa017.Location = new System.Drawing.Point(1032, 124);
this.txt_daa017.Name = "txt_daa017";
this.txt_daa017.Properties.Appearance.Options.UseFont = true;
this.txt_daa017.Size = new System.Drawing.Size(202, 24);
@@ -1237,7 +1225,7 @@
//
// txt_daa003
//
- this.txt_daa003.Location = new System.Drawing.Point(114, 147);
+ this.txt_daa003.Location = new System.Drawing.Point(114, 152);
this.txt_daa003.Name = "txt_daa003";
this.txt_daa003.Properties.Appearance.Options.UseFont = true;
this.txt_daa003.Size = new System.Drawing.Size(200, 24);
@@ -1247,7 +1235,7 @@
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(1032, 7);
+ this.txt_dwName.Location = new System.Drawing.Point(1032, 12);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Size = new System.Drawing.Size(202, 24);
@@ -1257,7 +1245,7 @@
//
// txt_daa004
//
- this.txt_daa004.Location = new System.Drawing.Point(114, 119);
+ this.txt_daa004.Location = new System.Drawing.Point(114, 124);
this.txt_daa004.Name = "txt_daa004";
this.txt_daa004.Properties.Appearance.Options.UseFont = true;
this.txt_daa004.Size = new System.Drawing.Size(200, 24);
@@ -1267,7 +1255,7 @@
//
// txt_daa015
//
- this.txt_daa015.Location = new System.Drawing.Point(420, 119);
+ this.txt_daa015.Location = new System.Drawing.Point(420, 124);
this.txt_daa015.Name = "txt_daa015";
this.txt_daa015.Size = new System.Drawing.Size(200, 24);
this.txt_daa015.StyleController = this.layoutMx1;
@@ -2429,6 +2417,32 @@
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.layoutControlItem21.Control = this.txt_printRemark;
+ this.layoutControlItem21.Location = new System.Drawing.Point(280, 31);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
+ this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.layoutControlItem24.Control = this.txt_psnQty_1;
+ this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
+ this.layoutControlItem24.Location = new System.Drawing.Point(560, 0);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
+ this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
+ //
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx3);
@@ -2887,32 +2901,6 @@
this.ucBtnPrint100.Size = new System.Drawing.Size(232, 32);
this.ucBtnPrint100.TabIndex = 0;
//
- // layoutControlItem21
- //
- this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
- this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(280, 31);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
- this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- this.layoutControlItem24.Control = this.txt_psnQty_1;
- this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(560, 0);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
- this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
- //
// Frm_Womdaa
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -3013,6 +3001,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
@@ -3035,8 +3025,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
this.panMx100.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
this.ResumeLayout(false);
}
@@ -3071,7 +3059,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_cust;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 58725f4..498f233 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -314,11 +314,17 @@
<Compile Include="DevFrm\FQC\MesFqcExceptional.Designer.cs">
<DependentUpon>MesFqcExceptional.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\FQC\SelectFqcItem.cs">
+ <Compile Include="DevFrm\FQC\SelectFqcBox.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\FQC\SelectFqcItem.Designer.cs">
- <DependentUpon>SelectFqcItem.cs</DependentUpon>
+ <Compile Include="DevFrm\FQC\SelectFqcBox.Designer.cs">
+ <DependentUpon>SelectFqcBox.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcDaa.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\FQC\SelectFqcDaa.Designer.cs">
+ <DependentUpon>SelectFqcDaa.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\IPQC\Frm_ShouJian.cs">
<SubType>Form</SubType>
@@ -1213,8 +1219,11 @@
<EmbeddedResource Include="DevFrm\FQC\MesFqcExceptional.resx">
<DependentUpon>MesFqcExceptional.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\FQC\SelectFqcItem.resx">
- <DependentUpon>SelectFqcItem.cs</DependentUpon>
+ <EmbeddedResource Include="DevFrm\FQC\SelectFqcBox.resx">
+ <DependentUpon>SelectFqcBox.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\FQC\SelectFqcDaa.resx">
+ <DependentUpon>SelectFqcDaa.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\FrmLogin.resx">
<DependentUpon>FrmLogin.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 2043a24..f665fdc 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -726,6 +726,7 @@
var txt = ctrl as ButtonEdit;
txt.Text = "";
txt.Enabled = !isEdt;
+ txt.ReadOnly = isEdt;
continue;
}
//鏂囨湰
@@ -1745,8 +1746,10 @@
if (column.Tag == null || column.Tag.ToString().EndsWith("edit"))
column.OptionsColumn.ReadOnly = false;
else
- //column.OptionsColumn.ReadOnly = true;
- column.OptionsColumn.ReadOnly = isPostSearch;
+ column.OptionsColumn.ReadOnly = true;
+
+ if(isPostSearch==false)
+ column.OptionsColumn.ReadOnly = true;
if (isPostSearch == true)
{
--
Gitblit v1.9.3