From 41c36661d58cd788d5c51326d7fe2da9c248d7c0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 17 四月 2025 08:13:23 +0800
Subject: [PATCH] iqc
---
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.resx | 120 ++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2
DevApp/Gs.DevApp/DevFrm/FrmMain.cs | 21 +
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs | 58 +--
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.Designer.cs | 263 ++++++++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 10
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 45 +-
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.cs | 123 ++++++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 85 ++--
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 326 +++++++++--------
12 files changed, 809 insertions(+), 266 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 09d6be2..2d4703e 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
index a19cc04..8736984 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmMain.cs
@@ -383,6 +383,14 @@
newForm.ControlBox = false;
newForm.Dock = DockStyle.Fill;
newForm.Visible = true;
+ //瀹炵幇瀛愮獥浣撶殑濮旀墭beg
+ EventInfo evt = newForm.GetType().GetEvent("UpdateParent",
+ BindingFlags.NonPublic | BindingFlags.Instance
+ | BindingFlags.Public
+ );
+ if (evt != null)
+ evt.AddEventHandler(newForm, new EventHandler<UpdateParentEventArgs>(UpdateParent_OnChange));
+ //瀹炵幇瀛愮獥浣撶殑濮旀墭end
return newForm;
}
catch (Exception)
@@ -392,6 +400,19 @@
return null;
}
+ //瀹炵幇瀛愮獥浣撶殑濮旀墭beg
+ private void UpdateParent_OnChange(object sender, UpdateParentEventArgs e)
+ {
+ List<string> _val = e.StringList;
+ MsgHelper.ShowError(_val[0]);
+ var tabPageName = _val + "_page";
+ var tabText = ""; //褰撳墠閫夐」鍗￠〉Text鏍囬
+ var newFormName = "Gs.DevApp.DevFrm.Frm_MesInvItemOut_SCLL"; //瀛樿矾寰勶紝绫诲悕
+ Image imgIcon = null;
+ AddTabpage(tab, tabPageName, tabText,
+ newFormName, imgIcon);
+ }
+ //瀹炵幇瀛愮獥浣撶殑濮旀墭end
private int _userOut()
{
var _obj = new
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 176f228..045d8cc 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -1038,17 +1038,23 @@
//
this.txt_fngHandle.Location = new System.Drawing.Point(1059, 124);
this.txt_fngHandle.Name = "txt_fngHandle";
+ this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
this.txt_fngHandle.Size = new System.Drawing.Size(250, 24);
this.txt_fngHandle.StyleController = this.layoutMx1;
this.txt_fngHandle.TabIndex = 812;
+ this.txt_fngHandle.Tag = "readonly";
//
// txt_fmrmode
//
this.txt_fmrmode.Location = new System.Drawing.Point(1059, 152);
this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
this.txt_fmrmode.Size = new System.Drawing.Size(250, 24);
this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 813;
+ this.txt_fmrmode.Tag = "readonly";
//
// layoutControlItem17
//
@@ -2001,7 +2007,7 @@
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1340, 461);
+ this.tabMxPage2.Size = new System.Drawing.Size(1340, 459);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
@@ -2011,7 +2017,7 @@
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1340, 461);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459);
this.ucUpFileList1.TabIndex = 0;
//
// repositoryItemComboBox2
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index acdabf8..7d1a4be 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -89,6 +89,8 @@
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptBtnError = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -196,8 +198,6 @@
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptBtnError = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -208,6 +208,7 @@
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -291,7 +292,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -742,6 +742,24 @@
this.gridColumn33.VisibleIndex = 3;
this.gridColumn33.Width = 94;
//
+ // gridColumn34
+ //
+ this.gridColumn34.Caption = "寮傚父鎶ュ憡";
+ this.gridColumn34.ColumnEdit = this.rptBtnError;
+ this.gridColumn34.MinWidth = 25;
+ this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.Visible = true;
+ this.gridColumn34.VisibleIndex = 27;
+ this.gridColumn34.Width = 94;
+ //
+ // rptBtnError
+ //
+ this.rptBtnError.AutoHeight = false;
+ this.rptBtnError.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.rptBtnError.Name = "rptBtnError";
+ this.rptBtnError.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnError_ButtonClick);
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -841,7 +859,6 @@
"閫�鏂欏苟鎵ｆ"});
this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_fmrmode.Size = new System.Drawing.Size(272, 24);
- this.txt_fmrmode.StyleController = this.layoutMx1;
this.txt_fmrmode.TabIndex = 795;
//
// txt_remarks
@@ -2019,24 +2036,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn34
- //
- this.gridColumn34.Caption = "寮傚父鎶ュ憡";
- this.gridColumn34.ColumnEdit = this.rptBtnError;
- this.gridColumn34.MinWidth = 25;
- this.gridColumn34.Name = "gridColumn34";
- this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 27;
- this.gridColumn34.Width = 94;
- //
- // rptBtnError
- //
- this.rptBtnError.AutoHeight = false;
- this.rptBtnError.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.rptBtnError.Name = "rptBtnError";
- this.rptBtnError.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnError_ButtonClick);
- //
// Frm_MesQaItemsDetect01Check
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2057,6 +2056,7 @@
this.split1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -2140,7 +2140,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index 714619a..c3205b8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -85,17 +85,17 @@
this.txt_dhdNo = new DevExpress.XtraEditors.TextEdit();
this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
- this.txt_qty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.txt_chooseQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_handSuggestion = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_chooseType = new DevExpress.XtraEditors.TextEdit();
- this.txt_handResult = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_chooseGoodQty = new DevExpress.XtraEditors.TextEdit();
this.txt_chooseBadQty = new DevExpress.XtraEditors.TextEdit();
this.txt_workLine = new DevExpress.XtraEditors.TextEdit();
this.txt_jydNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_handResult = new DevExpress.XtraEditors.TextEdit();
+ this.txt_handSuggestion = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -115,10 +115,10 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -141,6 +141,8 @@
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -170,17 +172,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workLine.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_jydNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -200,10 +202,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -220,6 +222,7 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -576,6 +579,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.simpleButton1);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_remark);
this.layoutMx1.Controls.Add(this.txt_createBy);
@@ -587,17 +591,17 @@
this.layoutMx1.Controls.Add(this.txt_dhdNo);
this.layoutMx1.Controls.Add(this.txt_gysNo);
this.layoutMx1.Controls.Add(this.txt_gysName);
- this.layoutMx1.Controls.Add(this.txt_qty);
+ this.layoutMx1.Controls.Add(this.txt_fbatchQty);
this.layoutMx1.Controls.Add(this.txt_chooseQty);
- this.layoutMx1.Controls.Add(this.txt_handSuggestion);
this.layoutMx1.Controls.Add(this.txt_chooseType);
- this.layoutMx1.Controls.Add(this.txt_handResult);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_fBillNo);
this.layoutMx1.Controls.Add(this.txt_chooseGoodQty);
this.layoutMx1.Controls.Add(this.txt_chooseBadQty);
this.layoutMx1.Controls.Add(this.txt_workLine);
this.layoutMx1.Controls.Add(this.txt_jydNo);
+ this.layoutMx1.Controls.Add(this.txt_handResult);
+ this.layoutMx1.Controls.Add(this.txt_handSuggestion);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9,
@@ -621,140 +625,114 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(391, 152);
+ this.txt_remark.Location = new System.Drawing.Point(386, 167);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(445, 24);
+ this.txt_remark.Size = new System.Drawing.Size(435, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(667, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(657, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(169, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(164, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 273;
this.txt_createBy.Tag = "readonly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(667, 40);
+ this.txt_createDate.Location = new System.Drawing.Point(657, 43);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(169, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(164, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 267;
this.txt_createDate.Tag = "readonly";
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(943, 96);
+ this.txt_fType.Location = new System.Drawing.Point(928, 105);
this.txt_fType.Name = "txt_fType";
- this.txt_fType.Size = new System.Drawing.Size(171, 24);
+ this.txt_fType.Size = new System.Drawing.Size(165, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 462;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(391, 68);
+ this.txt_itemNo.Location = new System.Drawing.Point(386, 74);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(169, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(164, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 464;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(667, 68);
+ this.txt_itemName.Location = new System.Drawing.Point(657, 74);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(169, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(164, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 465;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(391, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(386, 105);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(445, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(435, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 466;
//
// txt_dhdNo
//
- this.txt_dhdNo.Location = new System.Drawing.Point(391, 12);
+ this.txt_dhdNo.Location = new System.Drawing.Point(386, 12);
this.txt_dhdNo.Name = "txt_dhdNo";
- this.txt_dhdNo.Size = new System.Drawing.Size(169, 24);
+ this.txt_dhdNo.Size = new System.Drawing.Size(164, 24);
this.txt_dhdNo.StyleController = this.layoutMx1;
this.txt_dhdNo.TabIndex = 467;
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(391, 124);
+ this.txt_gysNo.Location = new System.Drawing.Point(386, 136);
this.txt_gysNo.Name = "txt_gysNo";
- this.txt_gysNo.Size = new System.Drawing.Size(169, 24);
+ this.txt_gysNo.Size = new System.Drawing.Size(164, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 468;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(667, 124);
+ this.txt_gysName.Location = new System.Drawing.Point(657, 136);
this.txt_gysName.Name = "txt_gysName";
- this.txt_gysName.Size = new System.Drawing.Size(169, 24);
+ this.txt_gysName.Size = new System.Drawing.Size(164, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 469;
//
- // txt_qty
+ // txt_fbatchQty
//
- this.txt_qty.Location = new System.Drawing.Point(115, 68);
- this.txt_qty.Name = "txt_qty";
- this.txt_qty.Size = new System.Drawing.Size(169, 24);
- this.txt_qty.StyleController = this.layoutMx1;
- this.txt_qty.TabIndex = 470;
+ this.txt_fbatchQty.Location = new System.Drawing.Point(115, 74);
+ this.txt_fbatchQty.Name = "txt_fbatchQty";
+ this.txt_fbatchQty.Size = new System.Drawing.Size(164, 24);
+ this.txt_fbatchQty.StyleController = this.layoutMx1;
+ this.txt_fbatchQty.TabIndex = 470;
//
// txt_chooseQty
//
- this.txt_chooseQty.Location = new System.Drawing.Point(115, 96);
+ this.txt_chooseQty.Location = new System.Drawing.Point(115, 105);
this.txt_chooseQty.Name = "txt_chooseQty";
- this.txt_chooseQty.Size = new System.Drawing.Size(169, 24);
+ this.txt_chooseQty.Size = new System.Drawing.Size(164, 24);
this.txt_chooseQty.StyleController = this.layoutMx1;
this.txt_chooseQty.TabIndex = 471;
//
- // txt_handSuggestion
- //
- this.txt_handSuggestion.Location = new System.Drawing.Point(943, 40);
- this.txt_handSuggestion.Name = "txt_handSuggestion";
- this.txt_handSuggestion.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_handSuggestion.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "鍔犱弗",
- "鏀惧"});
- this.txt_handSuggestion.Size = new System.Drawing.Size(171, 24);
- this.txt_handSuggestion.StyleController = this.layoutMx1;
- this.txt_handSuggestion.TabIndex = 472;
- //
// txt_chooseType
//
- this.txt_chooseType.Location = new System.Drawing.Point(943, 68);
+ this.txt_chooseType.Location = new System.Drawing.Point(928, 74);
this.txt_chooseType.Name = "txt_chooseType";
- this.txt_chooseType.Size = new System.Drawing.Size(171, 24);
+ this.txt_chooseType.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_chooseType.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_chooseType.Size = new System.Drawing.Size(165, 24);
this.txt_chooseType.StyleController = this.layoutMx1;
this.txt_chooseType.TabIndex = 473;
- //
- // txt_handResult
- //
- this.txt_handResult.Location = new System.Drawing.Point(943, 12);
- this.txt_handResult.Name = "txt_handResult";
- this.txt_handResult.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_handResult.Properties.Items.AddRange(new object[] {
- "-璇烽�夋嫨-",
- "OK",
- "NG"});
- this.txt_handResult.Size = new System.Drawing.Size(171, 24);
- this.txt_handResult.StyleController = this.layoutMx1;
- this.txt_handResult.TabIndex = 474;
//
// txt_guid
//
@@ -768,41 +746,63 @@
//
this.txt_fBillNo.Location = new System.Drawing.Point(115, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
- this.txt_fBillNo.Size = new System.Drawing.Size(169, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(164, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 478;
//
// txt_chooseGoodQty
//
- this.txt_chooseGoodQty.Location = new System.Drawing.Point(115, 124);
+ this.txt_chooseGoodQty.Location = new System.Drawing.Point(115, 136);
this.txt_chooseGoodQty.Name = "txt_chooseGoodQty";
- this.txt_chooseGoodQty.Size = new System.Drawing.Size(169, 24);
+ this.txt_chooseGoodQty.Size = new System.Drawing.Size(164, 24);
this.txt_chooseGoodQty.StyleController = this.layoutMx1;
this.txt_chooseGoodQty.TabIndex = 479;
//
// txt_chooseBadQty
//
- this.txt_chooseBadQty.Location = new System.Drawing.Point(115, 152);
+ this.txt_chooseBadQty.Location = new System.Drawing.Point(115, 167);
this.txt_chooseBadQty.Name = "txt_chooseBadQty";
- this.txt_chooseBadQty.Size = new System.Drawing.Size(169, 24);
+ this.txt_chooseBadQty.Size = new System.Drawing.Size(164, 24);
this.txt_chooseBadQty.StyleController = this.layoutMx1;
this.txt_chooseBadQty.TabIndex = 480;
//
// txt_workLine
//
- this.txt_workLine.Location = new System.Drawing.Point(391, 40);
+ this.txt_workLine.Location = new System.Drawing.Point(386, 43);
this.txt_workLine.Name = "txt_workLine";
- this.txt_workLine.Size = new System.Drawing.Size(169, 24);
+ this.txt_workLine.Size = new System.Drawing.Size(164, 24);
this.txt_workLine.StyleController = this.layoutMx1;
this.txt_workLine.TabIndex = 481;
//
// txt_jydNo
//
- this.txt_jydNo.Location = new System.Drawing.Point(115, 40);
+ this.txt_jydNo.Location = new System.Drawing.Point(115, 43);
this.txt_jydNo.Name = "txt_jydNo";
- this.txt_jydNo.Size = new System.Drawing.Size(169, 24);
+ this.txt_jydNo.Size = new System.Drawing.Size(164, 24);
this.txt_jydNo.StyleController = this.layoutMx1;
this.txt_jydNo.TabIndex = 482;
+ //
+ // txt_handResult
+ //
+ this.txt_handResult.Location = new System.Drawing.Point(928, 12);
+ this.txt_handResult.Name = "txt_handResult";
+ this.txt_handResult.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_handResult.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_handResult.Size = new System.Drawing.Size(165, 24);
+ this.txt_handResult.StyleController = this.layoutMx1;
+ this.txt_handResult.TabIndex = 483;
+ this.txt_handResult.Tag = "readonly";
+ //
+ // txt_handSuggestion
+ //
+ this.txt_handSuggestion.Location = new System.Drawing.Point(928, 43);
+ this.txt_handSuggestion.Name = "txt_handSuggestion";
+ this.txt_handSuggestion.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_handSuggestion.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_handSuggestion.Size = new System.Drawing.Size(165, 24);
+ this.txt_handSuggestion.StyleController = this.layoutMx1;
+ this.txt_handSuggestion.TabIndex = 484;
+ this.txt_handSuggestion.Tag = "readonly";
//
// layoutControlItem9
//
@@ -848,10 +848,11 @@
this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem3,
+ this.layoutControlItem20,
+ this.layoutControlItem1,
this.layoutControlItem21,
this.layoutControlItem19,
- this.layoutControlItem20,
- this.layoutControlItem1});
+ this.layoutControlItem22});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -886,26 +887,26 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1126, 188);
+ this.Root.Size = new System.Drawing.Size(1105, 206);
this.Root.TextVisible = false;
//
// layoutControlItem17
//
- this.layoutControlItem17.Control = this.txt_qty;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem17.Control = this.txt_fbatchQty;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem17.Text = "鏉ユ枡鏁伴噺";
this.layoutControlItem17.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_chooseQty;
- this.layoutControlItem18.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem18.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem18.Text = "閫夊埆鏁伴噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(91, 18);
//
@@ -914,27 +915,27 @@
this.layoutControlItem2.Control = this.txt_fBillNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "寮傚父缂栧彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_chooseGoodQty;
- this.layoutControlItem25.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem25.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem25.Text = "閫夊埆鑹搧鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_chooseBadQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 155);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem26.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem26.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem26.Text = "閫夊埆涓嶈壇鍝佹暟";
this.layoutControlItem26.TextSize = new System.Drawing.Size(91, 18);
//
@@ -942,165 +943,165 @@
//
this.layoutControlItem7.Control = this.txt_remark;
this.layoutControlItem7.CustomizationFormText = "IQC澶囨敞";
- this.layoutControlItem7.Location = new System.Drawing.Point(276, 140);
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 155);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem7.Size = new System.Drawing.Size(552, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
this.layoutControlItem7.Text = "IQC澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_gysNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(276, 112);
+ this.layoutControlItem15.Location = new System.Drawing.Point(271, 124);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_gysName;
- this.layoutControlItem16.Location = new System.Drawing.Point(552, 112);
+ this.layoutControlItem16.Location = new System.Drawing.Point(542, 124);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_itemModel;
- this.layoutControlItem13.Location = new System.Drawing.Point(276, 84);
+ this.layoutControlItem13.Location = new System.Drawing.Point(271, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(552, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(542, 31);
this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem13.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_itemName;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(542, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem12.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(276, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 62);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
this.layoutControlItem11.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_jydNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem6.Text = "妫�楠屽崟鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dhdNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_workLine;
- this.layoutControlItem4.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem4.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "鍒拌揣鍗曞簭鍙�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_createBy;
- this.layoutControlItem5.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "IQC鎻愪氦浜哄憳";
this.layoutControlItem5.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "IQC鎻愪氦鏃ユ湡 ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(91, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_handResult;
- this.layoutControlItem21.Location = new System.Drawing.Point(828, 0);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem21.Size = new System.Drawing.Size(278, 28);
- this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(91, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_handSuggestion;
- this.layoutControlItem19.Location = new System.Drawing.Point(828, 28);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(278, 28);
- this.layoutControlItem19.Text = "澶勭悊缁撴灉";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_chooseType;
- this.layoutControlItem20.Location = new System.Drawing.Point(828, 56);
+ this.layoutControlItem20.Location = new System.Drawing.Point(813, 62);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem20.Text = "閫�鏂欐柟寮�";
this.layoutControlItem20.TextSize = new System.Drawing.Size(91, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fType;
- this.layoutControlItem1.Location = new System.Drawing.Point(828, 84);
+ this.layoutControlItem1.Location = new System.Drawing.Point(813, 93);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem1.Text = "寮傚父绫诲瀷";
this.layoutControlItem1.TextSize = new System.Drawing.Size(91, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_handResult;
+ this.layoutControlItem21.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem21.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(91, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_handSuggestion;
+ this.layoutControlItem19.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem19.Text = "澶勭悊缁撴灉";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(91, 18);
//
// tabMx
//
@@ -1296,7 +1297,6 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// rptJYBZ
//
@@ -1340,6 +1340,27 @@
this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
//
+ // simpleButton1
+ //
+ this.simpleButton1.Location = new System.Drawing.Point(825, 136);
+ this.simpleButton1.Name = "simpleButton1";
+ this.simpleButton1.Size = new System.Drawing.Size(268, 27);
+ this.simpleButton1.StyleController = this.layoutMx1;
+ this.simpleButton1.TabIndex = 485;
+ this.simpleButton1.Text = "simpleButton1";
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.simpleButton1;
+ this.layoutControlItem22.Location = new System.Drawing.Point(813, 124);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem22.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem22.TextVisible = false;
+ //
// MesQcExceptional
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1379,17 +1400,17 @@
((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_qty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workLine.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_jydNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1409,10 +1430,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1429,6 +1450,7 @@
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
this.ResumeLayout(false);
}
@@ -1487,13 +1509,11 @@
private DevExpress.XtraEditors.TextEdit txt_dhdNo;
private DevExpress.XtraEditors.TextEdit txt_gysNo;
private DevExpress.XtraEditors.TextEdit txt_gysName;
- private DevExpress.XtraEditors.TextEdit txt_qty;
+ private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
private DevExpress.XtraEditors.TextEdit txt_chooseQty;
- private DevExpress.XtraEditors.ComboBoxEdit txt_handSuggestion;
private DevExpress.XtraEditors.TextEdit txt_chooseType;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraEditors.ComboBoxEdit txt_handResult;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraEditors.TextEdit txt_fBillNo;
@@ -1526,9 +1546,13 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraEditors.TextEdit txt_handResult;
+ private DevExpress.XtraEditors.TextEdit txt_handSuggestion;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraEditors.SimpleButton simpleButton1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
index 6042af8..5ac946a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.cs
@@ -21,11 +21,10 @@
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -124,18 +123,6 @@
{
_toolCk(1);
}
-
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- _toolCk(0);
- }
-
/// <summary>
///
@@ -256,32 +243,29 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎿嶄綔鍚楋紵"))
return;
- var _obj = new
+ var frm = new MesQcExceptionalShow(rowGuid);
+ frm.UpdateParent += (s, e) =>
{
- guid = rowGuid,
- inFieldValue = _inFieldValue
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "chkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
};
- try
- {
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- {
- getModel(lbGuid.Text.Trim());
- }
- int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
- gridView1.FocusedRowHandle = rowHandle;
- UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
+ frm.ShowDialog();
}
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+ private void simpleButton1_Click(object sender, EventArgs e)
+ {
+ if (UpdateParent != null)
+ {
+ List<string> lst = new List<string>();
+ lst.Add("1");
+ lst.Add("2");
+ UpdateParent?.Invoke(this,
+ new UpdateParentEventArgs { StringList = lst });
+ }
+
+
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.Designer.cs
new file mode 100644
index 0000000..8c226e4
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.Designer.cs
@@ -0,0 +1,263 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class MesQcExceptionalShow
+ {
+ /// <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()
+ {
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = 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();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnEsc = new DevExpress.XtraEditors.SimpleButton();
+ this.btnQuery = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_freceQty1111 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty1111)).BeginInit();
+ this.SuspendLayout();
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.btnEsc);
+ this.panel1.Controls.Add(this.btnQuery);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, 122);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(430, 44);
+ this.panel1.TabIndex = 3;
+ //
+ // btnEsc
+ //
+ this.btnEsc.Appearance.Options.UseFont = true;
+ this.btnEsc.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnEsc.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ this.btnEsc.Location = new System.Drawing.Point(242, 0);
+ this.btnEsc.Name = "btnEsc";
+ this.btnEsc.Size = new System.Drawing.Size(94, 44);
+ this.btnEsc.TabIndex = 1;
+ this.btnEsc.Text = "鍙栨秷淇濆瓨";
+ //
+ // btnQuery
+ //
+ this.btnQuery.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnQuery.Appearance.Options.UseBackColor = true;
+ this.btnQuery.Appearance.Options.UseFont = true;
+ this.btnQuery.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
+ this.btnQuery.Location = new System.Drawing.Point(336, 0);
+ this.btnQuery.Name = "btnQuery";
+ this.btnQuery.Size = new System.Drawing.Size(94, 44);
+ this.btnQuery.TabIndex = 0;
+ this.btnQuery.Text = "纭畾淇濆瓨";
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.txt_freceQty);
+ this.layoutMx1.Controls.Add(this.txt_fngHandle);
+ this.layoutMx1.Controls.Add(this.txt_fmrmode);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(712, 0, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(430, 122);
+ this.layoutMx1.TabIndex = 4;
+ this.layoutMx1.Text = "layoutControl1";
+ //
+ // txt_freceQty
+ //
+ this.txt_freceQty.EditValue = "-璇烽�夋嫨-";
+ this.txt_freceQty.Location = new System.Drawing.Point(84, 12);
+ 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.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_freceQty.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "Y:鍚堟牸",
+ "N:涓嶅悎鏍�"});
+ this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_freceQty.Size = new System.Drawing.Size(334, 24);
+ this.txt_freceQty.StyleController = this.layoutMx1;
+ this.txt_freceQty.TabIndex = 816;
+ //
+ // txt_fngHandle
+ //
+ this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
+ this.txt_fngHandle.Location = new System.Drawing.Point(84, 46);
+ this.txt_fngHandle.Name = "txt_fngHandle";
+ this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_fngHandle.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "閫�璐�",
+ "鐗归噰鐩存帴浣跨敤"});
+ this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_fngHandle.Size = new System.Drawing.Size(334, 24);
+ this.txt_fngHandle.StyleController = this.layoutMx1;
+ this.txt_fngHandle.TabIndex = 793;
+ //
+ // txt_fmrmode
+ //
+ this.txt_fmrmode.EditValue = "-璇烽�夋嫨-";
+ this.txt_fmrmode.Location = new System.Drawing.Point(84, 80);
+ this.txt_fmrmode.Name = "txt_fmrmode";
+ this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+ this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
+ this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_fmrmode.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
+ "閫�鏂欒ˉ鏂�",
+ "閫�鏂欏苟鎵ｆ"});
+ this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_fmrmode.Size = new System.Drawing.Size(334, 24);
+ this.txt_fmrmode.StyleController = this.layoutMx1;
+ this.txt_fmrmode.TabIndex = 795;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem14,
+ this.layoutControlItem15,
+ this.txt_freceQty1111});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1});
+ 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;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(430, 122);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fngHandle;
+ this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem14.CustomizationFormText = "澶勭悊缁撴灉";
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 34);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(410, 34);
+ this.layoutControlItem14.Text = "澶勭悊缁撴灉";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_fmrmode;
+ this.layoutControlItem15.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem15.CustomizationFormText = "澶勭悊鏂瑰紡";
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 68);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(410, 34);
+ this.layoutControlItem15.Text = "澶勭悊鏂瑰紡";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // txt_freceQty1111
+ //
+ this.txt_freceQty1111.Control = this.txt_freceQty;
+ this.txt_freceQty1111.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.txt_freceQty1111.CustomizationFormText = "鍒ゅ畾缁撴灉";
+ this.txt_freceQty1111.Location = new System.Drawing.Point(0, 0);
+ this.txt_freceQty1111.Name = "txt_freceQty1111";
+ this.txt_freceQty1111.Size = new System.Drawing.Size(410, 34);
+ this.txt_freceQty1111.Text = "鍒ゅ畾缁撴灉";
+ this.txt_freceQty1111.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // MesQcExceptionalShow
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(430, 166);
+ this.Controls.Add(this.layoutMx1);
+ this.Controls.Add(this.panel1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "MesQcExceptionalShow";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "OA鍒ゅ畾";
+ this.panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty1111)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.SimpleButton btnEsc;
+ private DevExpress.XtraEditors.SimpleButton btnQuery;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem txt_freceQty1111;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.cs
new file mode 100644
index 0000000..8ee355c
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.cs
@@ -0,0 +1,123 @@
+锘縰sing Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+
+
+namespace Gs.DevApp.DevFrm.QC
+{
+ public partial class MesQcExceptionalShow : DevExpress.XtraEditors.XtraForm
+ {
+
+ string strGuid = "";
+ string _webServiceName = "MesQcExceptionalManager/";
+ public MesQcExceptionalShow(string _strGuid)
+ {
+ InitializeComponent();
+ this.strGuid = _strGuid;
+ btnQuery.Click += BtnQuery_Click;
+ btnEsc.Click += BtnEsc_Click;
+ }
+
+ private void BtnEsc_Click(object sender, EventArgs e)
+ {
+ this.Close();
+ }
+
+ private void BtnQuery_Click(object sender, EventArgs e)
+ {
+ _toolCk(1);
+ }
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+
+ if (txt_freceQty.SelectedIndex <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍒ゅ畾缁撴灉锛�");
+ txt_freceQty.Focus();
+ return;
+ }
+ if (txt_freceQty.SelectedIndex == 1)
+ {
+ if ((txt_fmrmode.SelectedIndex > 0) || txt_fngHandle.SelectedIndex > 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浣犲垽瀹氫簡鍚堟牸锛屽氨涓嶈兘鍐嶉�夋嫨鍏跺畠澶勭悊鏂瑰紡浜嗭紒");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ else
+ {
+ //褰撻�夋嫨涓嶅悎鏍兼椂锛岃濉啓鍘熷洜
+ if (txt_freceQty.SelectedIndex == 2)
+ {
+ if ((txt_fngHandle.SelectedIndex <= 0))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊缁撴灉锛�");
+ txt_fngHandle.Focus();
+ return;
+ }
+ if (txt_fngHandle.SelectedIndex == 1)
+ {
+ if ((txt_fmrmode.SelectedIndex <= 0))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閫�鏂欐柟寮忥紒");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ else
+ {
+ if ((txt_fmrmode.SelectedIndex > 0))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浣犻�夋嫨浜嗙壒閲囦娇鐢紝灏变笉鑳藉啀閫夋嫨閫�鏂欐柟寮忎簡锛�");
+ txt_fmrmode.Focus();
+ return;
+ }
+ }
+ }
+ }
+
+ string _fmrmode = txt_fmrmode.SelectedIndex > 0 ? txt_fmrmode.Text.Trim() : "";
+ string _freceQty = txt_freceQty.SelectedIndex > 0 ? txt_freceQty.Text.Trim() : "";
+ string _fngHandle = txt_fngHandle.SelectedIndex > 0 ? txt_fngHandle.Text.Trim() : "";
+ var _obj = new
+ {
+ guid = strGuid,
+ inFieldValue = _inFieldValue,
+ gs001 = _freceQty,
+ gs002 = _fngHandle,
+ gs003 = _fmrmode,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringSingle = "" });
+ Close();
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.resx b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptionalShow.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 8d8030f..cc1c038 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -245,6 +245,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -257,7 +258,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1231, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -518,7 +520,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -529,6 +531,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1231, 570);
this.splitMx1.SplitterPosition = 175;
this.splitMx1.TabIndex = 0;
@@ -585,50 +588,50 @@
//
// txtDepotsCode
//
- this.txtDepotsCode.Location = new System.Drawing.Point(416, 74);
+ this.txtDepotsCode.Location = new System.Drawing.Point(401, 74);
this.txtDepotsCode.Name = "txtDepotsCode";
this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
this.txtDepotsCode.Properties.Tag = "";
- this.txtDepotsCode.Size = new System.Drawing.Size(197, 24);
+ this.txtDepotsCode.Size = new System.Drawing.Size(212, 24);
this.txtDepotsCode.StyleController = this.layoutMx1;
this.txtDepotsCode.TabIndex = 454;
this.txtDepotsCode.Tag = "readOnly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(416, 105);
+ this.txt_remark.Location = new System.Drawing.Point(401, 105);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(500, 24);
+ this.txt_remark.Size = new System.Drawing.Size(515, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
// txt_receiveOrgId
//
this.txt_receiveOrgId.IsReadly = false;
- this.txt_receiveOrgId.Location = new System.Drawing.Point(114, 43);
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 43);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(196, 24);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(211, 24);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(416, 43);
+ this.txtSupplierCode.Location = new System.Drawing.Point(401, 43);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
- this.txtSupplierCode.Size = new System.Drawing.Size(197, 24);
+ this.txtSupplierCode.Size = new System.Drawing.Size(212, 24);
this.txtSupplierCode.StyleController = this.layoutMx1;
this.txtSupplierCode.TabIndex = 451;
this.txtSupplierCode.Tag = "readOnly";
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+ this.txt_billNo.Location = new System.Drawing.Point(99, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Properties.Tag = "";
- this.txt_billNo.Size = new System.Drawing.Size(196, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(211, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
@@ -636,19 +639,19 @@
// txt_depotsId
//
this.txt_depotsId.IsReadly = false;
- this.txt_depotsId.Location = new System.Drawing.Point(114, 105);
+ this.txt_depotsId.Location = new System.Drawing.Point(99, 105);
this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
this.txt_depotsId.Name = "txt_depotsId";
- this.txt_depotsId.Size = new System.Drawing.Size(196, 24);
+ this.txt_depotsId.Size = new System.Drawing.Size(211, 24);
this.txt_depotsId.TabIndex = 445;
//
// txt_suppId
//
this.txt_suppId.IsReadly = false;
- this.txt_suppId.Location = new System.Drawing.Point(114, 74);
+ this.txt_suppId.Location = new System.Drawing.Point(99, 74);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(196, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(211, 24);
this.txt_suppId.TabIndex = 440;
//
// txt_fstatus
@@ -673,50 +676,50 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(719, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(704, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(197, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(212, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 461;
this.txt_createBy.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(719, 43);
+ this.txt_createDate.Location = new System.Drawing.Point(704, 43);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(197, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(212, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 462;
this.txt_createDate.Tag = "readOnly";
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1022, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(1007, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(212, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 463;
this.txt_checkUser.Tag = "readOnly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1022, 43);
+ this.txt_checkDate.Location = new System.Drawing.Point(1007, 43);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(197, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(212, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(719, 74);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(704, 74);
this.txt_paperBillNo.Name = "txt_paperBillNo";
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(197, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 465;
//
@@ -814,7 +817,7 @@
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem1.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
@@ -823,7 +826,7 @@
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
@@ -833,7 +836,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
@@ -843,7 +846,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(302, 31);
this.layoutControlItem4.Text = "閫夋嫨浠撳簱";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
@@ -866,8 +869,8 @@
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(303, 31);
- this.layoutControlItem11.Text = "寤虹珛浜�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem11.Text = "寤虹珛浜哄憳";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
@@ -878,7 +881,7 @@
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem12.Size = new System.Drawing.Size(303, 31);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
@@ -887,8 +890,8 @@
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem13.Size = new System.Drawing.Size(303, 31);
- this.layoutControlItem13.Text = "鎻愪氦妫�楠屼汉";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
@@ -898,8 +901,8 @@
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem14.Size = new System.Drawing.Size(303, 31);
- this.layoutControlItem14.Text = "鎻愪氦妫�楠屾棩鏈�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
@@ -933,7 +936,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(303, 31);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
@@ -944,7 +947,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem6.Size = new System.Drawing.Size(303, 31);
this.layoutControlItem6.Text = "浠撳簱缂栫爜";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
@@ -956,7 +959,7 @@
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem17.Size = new System.Drawing.Size(606, 31);
this.layoutControlItem17.Text = "澶囨敞淇℃伅";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
// lab_paperBillNo
//
@@ -967,7 +970,7 @@
this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
this.lab_paperBillNo.Size = new System.Drawing.Size(303, 31);
this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
- this.lab_paperBillNo.TextSize = new System.Drawing.Size(90, 18);
+ this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18);
//
// tabMx
//
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index f1da09f..0be3a8a 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -404,17 +404,17 @@
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.Designer.cs">
- <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\MesQcExceptionalShow.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\MesQcExceptionalShow.Designer.cs">
+ <DependentUpon>MesQcExceptionalShow.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\QC\Frm_MesQaMj.cs">
<SubType>Form</SubType>
@@ -1274,12 +1274,12 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01.resx">
<DependentUpon>Frm_MesQaItemsDetect01.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Check.resx">
- <DependentUpon>Frm_MesQaItemsDetect01Check.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.resx">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\MesQcExceptionalShow.resx">
+ <DependentUpon>MesQcExceptionalShow.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaMj.resx">
<DependentUpon>Frm_MesQaMj.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
index ea14450..78c201e 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ProjectFiles</ProjectView>
+ <ProjectView>ShowAllFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
--
Gitblit v1.9.3