From 3c4abaeaffd0a25641312d6124c6414940d9ed04 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 11 四月 2025 08:06:56 +0800
Subject: [PATCH] qc
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs | 51 ++-
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 6
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 31 +-
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 568 ++++++++++++++++++++-----------------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 177 +++++++----
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 5
8 files changed, 480 insertions(+), 368 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/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 89fe56a..3d5513b 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -30,20 +30,20 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- 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.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -77,6 +77,8 @@
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -101,27 +103,29 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_checkStates = new DevExpress.XtraEditors.TextEdit();
this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_cgdNo = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -181,8 +185,6 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -222,27 +224,29 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -556,8 +560,6 @@
this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
- this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 13;
this.gv_fcovertQty.Width = 60;
//
// gv_remarks
@@ -570,7 +572,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 14;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -583,7 +585,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 15;
+ this.gv_fcheckBy.VisibleIndex = 14;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -596,7 +598,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 17;
+ this.gv_fcheckDate.VisibleIndex = 16;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -609,7 +611,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 16;
+ this.gv_createBy.VisibleIndex = 15;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -619,7 +621,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 18;
+ this.gridColumn15.VisibleIndex = 17;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -632,7 +634,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 19;
+ this.gv_lastupdateBy.VisibleIndex = 18;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -645,7 +647,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 20;
+ this.gv_lastupdateDate.VisibleIndex = 19;
this.gv_lastupdateDate.Width = 120;
//
// gv_fngHandle
@@ -658,7 +660,7 @@
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 21;
+ this.gv_fngHandle.VisibleIndex = 20;
this.gv_fngHandle.Width = 100;
//
// bandedGridColumn1
@@ -669,7 +671,7 @@
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 22;
+ this.bandedGridColumn1.VisibleIndex = 21;
this.bandedGridColumn1.Width = 250;
//
// gridColumn18
@@ -679,7 +681,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 23;
+ this.gridColumn18.VisibleIndex = 22;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -689,7 +691,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 24;
+ this.gridColumn19.VisibleIndex = 23;
this.gridColumn19.Width = 94;
//
// gridColumn17
@@ -707,7 +709,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 25;
+ this.gridColumn23.VisibleIndex = 24;
this.gridColumn23.Width = 94;
//
// gridColumn30
@@ -717,6 +719,28 @@
this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn5.FieldName = "checkStates";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
+ this.gridColumn6.FieldName = "freceQty";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 4;
+ this.gridColumn6.Width = 94;
//
// pageBar1
//
@@ -779,6 +803,7 @@
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_checkStates);
this.layoutMx1.Controls.Add(this.txt_freceQty);
+ this.layoutMx1.Controls.Add(this.txt_cgdNo);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
@@ -803,9 +828,9 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(744, 68);
+ this.txt_suppName.Location = new System.Drawing.Point(409, 96);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(254, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(249, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 801;
this.txt_suppName.Tag = "readonly";
@@ -815,15 +840,17 @@
this.txt_remarks.Location = new System.Drawing.Point(84, 124);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(584, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(574, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(414, 96);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(734, 96);
this.txt_fcheckResu.Name = "txt_fcheckResu";
- this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
+ 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(249, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
@@ -833,7 +860,7 @@
this.txt_itemName.Location = new System.Drawing.Point(84, 40);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(249, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 800;
this.txt_itemName.Tag = "readonly";
@@ -843,27 +870,27 @@
this.txt_releaseNo.Location = new System.Drawing.Point(84, 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);
+ this.txt_releaseNo.Size = new System.Drawing.Size(249, 24);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(414, 12);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(734, 12);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(744, 12);
+ this.txt_lotNo.Location = new System.Drawing.Point(409, 12);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
@@ -873,7 +900,7 @@
this.txt_itemNo.Location = new System.Drawing.Point(84, 68);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
@@ -882,7 +909,7 @@
//
this.txt_itemModel.Location = new System.Drawing.Point(84, 96);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
@@ -898,57 +925,57 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(414, 40);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(734, 40);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(744, 40);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(409, 68);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "readonly";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 40);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 40);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 804;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 68);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 68);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 805;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
+ this.txt_fsubmit.Location = new System.Drawing.Point(987, 12);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(1074, 96);
+ this.txt_slOrg.Location = new System.Drawing.Point(1059, 96);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(256, 24);
+ this.txt_slOrg.Size = new System.Drawing.Size(250, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 807;
this.txt_slOrg.Tag = "readonly";
@@ -964,21 +991,34 @@
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(414, 68);
+ this.txt_checkStates.Location = new System.Drawing.Point(734, 68);
this.txt_checkStates.Name = "txt_checkStates";
- this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
+ 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(249, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(744, 96);
+ this.txt_freceQty.Location = new System.Drawing.Point(734, 124);
this.txt_freceQty.Name = "txt_freceQty";
- this.txt_freceQty.Size = new System.Drawing.Size(254, 24);
+ 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(249, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 810;
this.txt_freceQty.Tag = "readonly";
+ //
+ // txt_cgdNo
+ //
+ this.txt_cgdNo.Location = new System.Drawing.Point(409, 40);
+ this.txt_cgdNo.Name = "txt_cgdNo";
+ this.txt_cgdNo.Size = new System.Drawing.Size(249, 24);
+ this.txt_cgdNo.StyleController = this.layoutMx1;
+ this.txt_cgdNo.TabIndex = 811;
+ this.txt_cgdNo.Tag = "readonly";
//
// layoutControlItem17
//
@@ -1019,54 +1059,55 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
- this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem6,
- this.layoutControlItem8,
- this.layoutControlItem9,
- this.layoutControlItem13,
this.layoutControlItem15,
this.layoutControlItem16,
this.layoutControlItem14,
this.layoutControlItem18,
- this.layoutControlItem10,
- this.layoutControlItem22,
+ this.layoutControlItem12,
this.layoutControlItem23,
- this.layoutControlItem12});
+ this.layoutControlItem10,
+ this.layoutControlItem13,
+ this.layoutControlItem22,
+ this.layoutControlItem9,
+ this.layoutControlItem8,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem24});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition17,
- columnDefinition18,
- columnDefinition19,
- columnDefinition20});
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition13,
- rowDefinition14,
- rowDefinition15,
- rowDefinition16,
- rowDefinition17});
- this.Root.Size = new System.Drawing.Size(1342, 160);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1321, 160);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1074,29 +1115,9 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(330, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
@@ -1104,7 +1125,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1114,7 +1135,7 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1124,72 +1145,39 @@
this.layoutControlItem6.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(330, 28);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(660, 28);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(660, 56);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem13.Text = "渚涘簲鍟�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(990, 28);
+ this.layoutControlItem15.Location = new System.Drawing.Point(975, 28);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 56);
+ this.layoutControlItem16.Location = new System.Drawing.Point(975, 56);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem16.Text = "瀹℃牳浜�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1197,46 +1185,13 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(990, 84);
+ this.layoutControlItem18.Location = new System.Drawing.Point(975, 84);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 84);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(330, 56);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem23
- //
- this.layoutControlItem23.Control = this.txt_freceQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(660, 84);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(330, 28);
- this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
@@ -1245,9 +1200,106 @@
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(650, 28);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_freceQty;
+ this.layoutControlItem23.Location = new System.Drawing.Point(650, 112);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem23.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_fcheckResu;
+ this.layoutControlItem10.Location = new System.Drawing.Point(650, 84);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_suppName;
+ this.layoutControlItem13.Location = new System.Drawing.Point(325, 84);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem13.Text = "渚涘簲鍟�";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_checkStates;
+ this.layoutControlItem22.Location = new System.Drawing.Point(650, 56);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem22.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fbatchQty;
+ this.layoutControlItem9.Location = new System.Drawing.Point(325, 56);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_fcheckBy;
+ this.layoutControlItem8.Location = new System.Drawing.Point(650, 28);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_fcheckDate;
+ this.layoutControlItem2.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_lotNo;
+ this.layoutControlItem3.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem3.Text = "閫佹鎵瑰彿";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.txt_cgdNo;
+ this.layoutControlItem24.Location = new System.Drawing.Point(325, 28);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem24.Size = new System.Drawing.Size(325, 28);
+ this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
@@ -1625,6 +1677,7 @@
this.gridColumn20.FieldName = "fstand";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
this.gridColumn20.Width = 94;
@@ -1635,6 +1688,7 @@
this.gridColumn21.FieldName = "createBy";
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
this.gridColumn21.Width = 94;
@@ -1645,6 +1699,7 @@
this.gridColumn25.FieldName = "createDate";
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
this.gridColumn25.Width = 94;
@@ -1711,6 +1766,7 @@
this.gridColumn28.FieldName = "fcheckItem";
this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 1;
this.gridColumn28.Width = 94;
@@ -1721,6 +1777,7 @@
this.gridColumn29.FieldName = "fcheckResu";
this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
+ this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 2;
this.gridColumn29.Width = 94;
@@ -1731,6 +1788,7 @@
this.gridColumn24.FieldName = "fstand";
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
this.gridColumn24.Width = 94;
@@ -1741,6 +1799,7 @@
this.gridColumn26.FieldName = "createBy";
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
this.gridColumn26.Width = 94;
@@ -1751,6 +1810,7 @@
this.gridColumn27.FieldName = "createDate";
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
+ this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
this.gridColumn27.Width = 94;
@@ -1818,23 +1878,23 @@
this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition24.Width = 110D;
+ 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;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition18});
+ rowDefinition6});
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;
@@ -1930,26 +1990,6 @@
//
this.gridView4.Name = "gridView4";
//
- // gridColumn5
- //
- this.gridColumn5.Caption = "妫�楠岀姸鎬�";
- this.gridColumn5.FieldName = "checkStates";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 94;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
- this.gridColumn6.FieldName = "freceQty";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 94;
- //
// Frm_MesQaItemsDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1999,27 +2039,29 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStates.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2111,8 +2153,6 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
@@ -2121,9 +2161,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
private DevExpress.XtraEditors.TextEdit txt_fsubmitDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
@@ -2197,11 +2234,18 @@
private UserControl.UCUpFileList ucUpFileList1;
private DevExpress.XtraEditors.TextEdit txt_checkStates;
private DevExpress.XtraEditors.TextEdit txt_freceQty;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraEditors.TextEdit txt_cgdNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 208fc57..90e6aec 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -357,23 +357,21 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
+ if ( txt_fcheckResu.Text.Trim()== "N:涓嶅悎鏍�" && string.IsNullOrEmpty(txt_remarks.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("澶囨敞鑳戒负绌猴紒");
+ Gs.DevApp.ToolBox.MsgHelper.Warning("褰撴楠岀粨鏋滀笉鍚堟牸鏃讹紝璇峰～鍐欏娉ㄨ鏄庯紒");
txt_remarks.Focus();
return;
}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- fngDesc = "",
remarks = txt_remarks.Text.Trim(),
};
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index 21e9096..c6d0821 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -823,6 +823,8 @@
this.txt_fmrmode.EditValue = "-璇烽�夋嫨-";
this.txt_fmrmode.Location = new System.Drawing.Point(795, 139);
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[] {
@@ -849,6 +851,8 @@
this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
this.txt_fngHandle.Location = new System.Drawing.Point(795, 107);
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[] {
@@ -1026,6 +1030,8 @@
this.txt_freceQty.EditValue = "-璇烽�夋嫨-";
this.txt_freceQty.Location = new System.Drawing.Point(795, 75);
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[] {
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index ca37dfb..ca65b4a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -134,7 +134,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- string _fmrmode = txt_fmrmode.Text.Trim();
+
toolBarMenu1.isSetBtn = false;
if (txt_freceQty.SelectedIndex <= 0)
{
@@ -142,33 +142,54 @@
txt_freceQty.Focus();
return;
}
- //褰撻�夋嫨涓嶅悎鏍兼椂锛岃濉啓鍘熷洜
- if (txt_freceQty.SelectedIndex == 2)
+ if (txt_freceQty.SelectedIndex == 1)
{
- if ((txt_fngHandle.SelectedIndex <= 0))
+ if ((txt_fmrmode.SelectedIndex > 0) || txt_fngHandle.SelectedIndex > 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊缁撴灉锛�");
- txt_fngHandle.Focus();
+ Gs.DevApp.ToolBox.MsgHelper.Warning("浣犲垽瀹氫簡鍚堟牸锛屽氨涓嶈兘鍐嶉�夋嫨鍏跺畠澶勭悊鏂瑰紡浜嗭紒");
+ txt_fmrmode.Focus();
return;
}
- if (txt_fngHandle.SelectedIndex == 1)
+ }
+ else
+ {
+ //褰撻�夋嫨涓嶅悎鏍兼椂锛岃濉啓鍘熷洜
+ if (txt_freceQty.SelectedIndex == 2)
{
- if ((txt_fmrmode.SelectedIndex <= 0))
+ if ((txt_fngHandle.SelectedIndex <= 0))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶勭悊鏂瑰紡锛�");
- txt_fmrmode.Focus();
+ 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;
+ }
+ }
}
- else
- _fmrmode = "";
-
}
-
+ 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 = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- fngHandle = txt_fngHandle.Text.Trim(),
+ freceQty= _freceQty,
+ fngHandle = _fngHandle,
fmrmode = _fmrmode,
};
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index dd3b61b..8400bed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -30,25 +30,25 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -143,6 +143,9 @@
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -771,35 +774,35 @@
this.lab_paperBillNo});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition26.Height = 100D;
- rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition27.Height = 100D;
- rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition28.Height = 100D;
- rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition29.Height = 100D;
- rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition30.Height = 100D;
- rowDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition26,
- rowDefinition27,
- rowDefinition28,
- rowDefinition29,
- rowDefinition30});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1231, 175);
this.Root.TextVisible = false;
//
@@ -1027,7 +1030,10 @@
this.gridColumn12,
this.gridColumn13,
this.gvBtnAlawys,
- this.gvMxDel});
+ this.gvMxDel,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn16});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1154,7 +1160,7 @@
this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
- this.gvMx1ebeln.VisibleIndex = 4;
+ this.gvMx1ebeln.VisibleIndex = 5;
this.gvMx1ebeln.Width = 120;
//
// gridColumn8
@@ -1164,7 +1170,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 5;
+ this.gridColumn8.VisibleIndex = 6;
this.gridColumn8.Width = 70;
//
// gvMx1boardStyle
@@ -1177,7 +1183,7 @@
this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
- this.gvMx1boardStyle.VisibleIndex = 6;
+ this.gvMx1boardStyle.VisibleIndex = 7;
this.gvMx1boardStyle.Width = 180;
//
// gvMx1ebelnQty
@@ -1190,7 +1196,7 @@
this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
- this.gvMx1ebelnQty.VisibleIndex = 7;
+ this.gvMx1ebelnQty.VisibleIndex = 8;
this.gvMx1ebelnQty.Width = 80;
//
// gvMx1subQty
@@ -1203,7 +1209,7 @@
this.gvMx1subQty.OptionsColumn.ReadOnly = true;
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
- this.gvMx1subQty.VisibleIndex = 9;
+ this.gvMx1subQty.VisibleIndex = 10;
this.gvMx1subQty.Width = 80;
//
// gvMx1quantity
@@ -1219,7 +1225,7 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "yz_quantity_0_edit";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 10;
+ this.gvMx1quantity.VisibleIndex = 11;
this.gvMx1quantity.Width = 80;
//
// gvMx1memo
@@ -1236,7 +1242,7 @@
this.gvMx1memo.OptionsColumn.ReadOnly = true;
this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 11;
+ this.gvMx1memo.VisibleIndex = 12;
this.gvMx1memo.Width = 180;
//
// gvMx1okRkqty
@@ -1249,7 +1255,7 @@
this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
- this.gvMx1okRkqty.VisibleIndex = 8;
+ this.gvMx1okRkqty.VisibleIndex = 9;
this.gvMx1okRkqty.Width = 80;
//
// gvMx1checkDate
@@ -1280,7 +1286,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
+ this.gridColumn9.VisibleIndex = 13;
this.gridColumn9.Width = 50;
//
// gridColumn7
@@ -1291,7 +1297,7 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 13;
+ this.gridColumn7.VisibleIndex = 14;
this.gridColumn7.Width = 50;
//
// gridColumn6
@@ -1302,7 +1308,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 14;
+ this.gridColumn6.VisibleIndex = 15;
this.gridColumn6.Width = 180;
//
// gridColumn10
@@ -1312,7 +1318,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 15;
+ this.gridColumn10.VisibleIndex = 16;
this.gridColumn10.Width = 94;
//
// gridColumn12
@@ -1322,7 +1328,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 16;
+ this.gridColumn12.VisibleIndex = 19;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1332,7 +1338,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 17;
+ this.gridColumn13.VisibleIndex = 20;
this.gridColumn13.Width = 94;
//
// gvBtnAlawys
@@ -1342,16 +1348,16 @@
this.gvBtnAlawys.MinWidth = 80;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 18;
+ this.gvBtnAlawys.VisibleIndex = 21;
this.gvBtnAlawys.Width = 80;
//
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
- editorButtonImageOptions11.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1363,19 +1369,49 @@
this.gvMxDel.MinWidth = 80;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 19;
+ this.gvMxDel.VisibleIndex = 22;
this.gvMxDel.Width = 80;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions12.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ 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, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "鍒ゅ畾缁撴灉";
+ this.gridColumn14.FieldName = "freceQty";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 4;
+ this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "澶勭悊缁撴灉";
+ this.gridColumn15.FieldName = "czjg";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 17;
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "閫�鐞嗘柟寮�";
+ this.gridColumn16.FieldName = "tlfs";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 18;
+ this.gridColumn16.Width = 94;
//
// picCheckBox
//
@@ -1555,5 +1591,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 3507de5..148fc26 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -989,13 +989,12 @@
this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
this.gvMx1urgentFlag.FieldName = "urgentFlag";
- this.gvMx1urgentFlag.MaxWidth = 50;
- this.gvMx1urgentFlag.MinWidth = 50;
+ this.gvMx1urgentFlag.MinWidth = 10;
this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
this.gvMx1urgentFlag.Tag = "query_a.urgent_flag";
this.gvMx1urgentFlag.Visible = true;
this.gvMx1urgentFlag.VisibleIndex = 0;
- this.gvMx1urgentFlag.Width = 50;
+ this.gvMx1urgentFlag.Width = 10;
//
// gvMx1ebeln
//
@@ -1008,7 +1007,7 @@
this.gvMx1ebeln.Tag = "query_a.ebeln";
this.gvMx1ebeln.Visible = true;
this.gvMx1ebeln.VisibleIndex = 1;
- this.gvMx1ebeln.Width = 120;
+ this.gvMx1ebeln.Width = 105;
//
// gridColumn4
//
@@ -1019,7 +1018,7 @@
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 2;
- this.gridColumn4.Width = 100;
+ this.gridColumn4.Width = 88;
//
// gvMx1boardStyle
//
@@ -1032,7 +1031,7 @@
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
this.gvMx1boardStyle.VisibleIndex = 3;
- this.gvMx1boardStyle.Width = 180;
+ this.gvMx1boardStyle.Width = 159;
//
// gridColumn6
//
@@ -1042,7 +1041,7 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 125;
+ this.gridColumn6.Width = 109;
//
// gridColumn8
//
@@ -1052,7 +1051,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 83;
//
// gvMx1okRkqty
//
@@ -1065,7 +1064,7 @@
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
this.gvMx1okRkqty.VisibleIndex = 6;
- this.gvMx1okRkqty.Width = 100;
+ this.gvMx1okRkqty.Width = 88;
//
// gvMx1ebelnQty
//
@@ -1078,7 +1077,7 @@
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
this.gvMx1ebelnQty.VisibleIndex = 7;
- this.gvMx1ebelnQty.Width = 100;
+ this.gvMx1ebelnQty.Width = 88;
//
// gridColumn10
//
@@ -1092,7 +1091,7 @@
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 8;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 83;
//
// gridColumn5
//
@@ -1103,7 +1102,7 @@
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 9;
- this.gridColumn5.Width = 180;
+ this.gridColumn5.Width = 159;
//
// gridColumn9
//
@@ -1114,7 +1113,7 @@
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 10;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 83;
//
// gridColumn7
//
@@ -1125,7 +1124,7 @@
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 11;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 83;
//
// gridColumn15
//
@@ -1135,7 +1134,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 12;
- this.gridColumn15.Width = 94;
+ this.gridColumn15.Width = 83;
//
// gridColumn19
//
@@ -1145,7 +1144,7 @@
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 13;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 91;
//
// panelMx1
//
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index af6b082..ff2a2f4 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1734,6 +1734,9 @@
// gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
foreach (GridColumn column in gridView1.Columns)
{
+ column.MinWidth = 10;
+ column.MaxWidth = 0;
+
column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
column.OptionsColumn.AllowEdit = true;
// column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
@@ -1971,6 +1974,8 @@
{
// column.DefaultCellStyle.Alignment = true;
column.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
+ column.MinWidth = 10;
+ column.MaxWidth = 0;
}
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
gridView1.OptionsFilter.AllowFilterEditor = false;
--
Gitblit v1.9.3