From f4d5aa97370f698c63b0b9f185f06e7bae56975c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 19 八月 2025 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 3
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 330 +++++++++++++++++++++--------------
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 58 +++++
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 74 ++++----
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 5
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 29 ++-
7 files changed, 315 insertions(+), 188 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 1d9a7de..781ccf8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -2600,11 +2600,11 @@
//
this.layShuLiang.Controls.Add(this.txt_iCount_1);
this.layShuLiang.Controls.Add(this.txt_yuliang_1);
- this.layShuLiang.Location = new System.Drawing.Point(662, 44);
+ this.layShuLiang.Location = new System.Drawing.Point(654, 44);
this.layShuLiang.Name = "layShuLiang";
this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
this.layShuLiang.Root = this.layoutControlGroup3;
- this.layShuLiang.Size = new System.Drawing.Size(321, 28);
+ this.layShuLiang.Size = new System.Drawing.Size(317, 28);
this.layShuLiang.TabIndex = 475;
this.layShuLiang.Text = "dataLayoutControl1";
//
@@ -2613,16 +2613,16 @@
this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
this.txt_iCount_1.StyleController = this.layShuLiang;
this.txt_iCount_1.TabIndex = 5;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
this.txt_yuliang_1.StyleController = this.layShuLiang;
this.txt_yuliang_1.TabIndex = 6;
//
@@ -2647,7 +2647,7 @@
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem25
@@ -2655,7 +2655,7 @@
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2663,16 +2663,16 @@
//
this.layoutControlItem39.Control = this.txt_yuliang_1;
this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
+ this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
+ this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(985, 10);
+ this.radOut.Location = new System.Drawing.Point(973, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2681,7 +2681,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(325, 32);
+ this.radOut.Size = new System.Drawing.Size(321, 32);
this.radOut.StyleController = this.layoutMx99;
this.radOut.TabIndex = 473;
//
@@ -2689,29 +2689,29 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(230, 24);
this.txt_psnQty_1.StyleController = this.layoutMx99;
this.txt_psnQty_1.TabIndex = 330;
this.txt_psnQty_1.Tag = "readOnly-1";
//
// txt_printRemark
//
- this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
+ this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
this.txt_printRemark.Name = "txt_printRemark";
this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
- this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
+ this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
this.txt_printRemark.StyleController = this.layoutMx99;
this.txt_printRemark.TabIndex = 334;
this.txt_printRemark.Tag = "readOnly-1";
@@ -2719,11 +2719,11 @@
// txt_kQty
//
this.txt_kQty.EditValue = "";
- this.txt_kQty.Location = new System.Drawing.Point(424, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(420, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(230, 24);
this.txt_kQty.StyleController = this.layoutMx99;
this.txt_kQty.TabIndex = 472;
this.txt_kQty.Tag = "readonly";
@@ -2734,7 +2734,7 @@
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(230, 24);
this.txt_yQty.StyleController = this.layoutMx99;
this.txt_yQty.TabIndex = 470;
this.txt_yQty.Tag = "readonly";
@@ -2744,7 +2744,7 @@
this.txt_zQty.Location = new System.Drawing.Point(99, 12);
this.txt_zQty.Name = "txt_zQty";
this.txt_zQty.Properties.ReadOnly = true;
- this.txt_zQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_zQty.Size = new System.Drawing.Size(230, 24);
this.txt_zQty.StyleController = this.layoutMx99;
this.txt_zQty.TabIndex = 474;
//
@@ -2772,7 +2772,7 @@
columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition10.Width = 100D;
columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition11.Width = 328D;
+ columnDefinition11.Width = 323D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition7,
columnDefinition8,
@@ -2786,7 +2786,7 @@
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition8,
rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -2794,21 +2794,21 @@
this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.radOut;
- this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
+ this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem35.Text = "鑷姩璁＄畻";
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
@@ -2818,12 +2818,12 @@
this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
- this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem26.TextVisible = false;
@@ -2836,18 +2836,18 @@
this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_printRemark;
- this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
@@ -2857,21 +2857,21 @@
this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
+ this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.layShuLiang;
- this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
+ this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
@@ -2881,7 +2881,7 @@
this.layoutControlItem36.Control = this.txt_zQty;
this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
- this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index ce4f47a..d2f96cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,4 +1,6 @@
+using DevExpress.Data;
using DevExpress.Utils;
+using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.DevFrm.WOM;
@@ -790,7 +792,7 @@
txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
txt_iCount_98.Text = txt_kQty98.Text;//杩芥函鐮�
txt_iCount_100.Text = txt_kQty100.Text;//鍚庣洊鐮�
-
+
}
else
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
index 31fc8a5..e62beb7 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -325,6 +325,9 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ UtilityHelper.SetCheckIco(gridView1, "auditStatusChk", "auditor", "auditDate", picCheckBox, this,( _inFieldValue==8?1:0).ToString() );
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index 3f0529c..a9f7d37 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -86,18 +86,18 @@
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -113,11 +113,16 @@
this.gvMx1dab007 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab021 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab009 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1dab017 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1dab018 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab001 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -154,18 +159,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -304,7 +309,7 @@
this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.VisibleIndex = 4;
this.gridColumn3.Width = 94;
//
// gridColumn2
@@ -314,7 +319,7 @@
this.gridColumn2.MinWidth = 50;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.VisibleIndex = 5;
this.gridColumn2.Width = 150;
//
// gridColumn1
@@ -324,7 +329,7 @@
this.gridColumn1.MinWidth = 50;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 6;
this.gridColumn1.Width = 150;
//
// gv_daa008
@@ -337,7 +342,7 @@
this.gv_daa008.OptionsColumn.AllowEdit = false;
this.gv_daa008.Tag = "query_a.daa008";
this.gv_daa008.Visible = true;
- this.gv_daa008.VisibleIndex = 5;
+ this.gv_daa008.VisibleIndex = 7;
this.gv_daa008.Width = 50;
//
// gv_unit
@@ -350,7 +355,7 @@
this.gv_unit.OptionsColumn.AllowEdit = false;
this.gv_unit.Tag = "query_a.unit";
this.gv_unit.Visible = true;
- this.gv_unit.VisibleIndex = 6;
+ this.gv_unit.VisibleIndex = 8;
this.gv_unit.Width = 50;
//
// gv_daa014
@@ -363,7 +368,7 @@
this.gv_daa014.OptionsColumn.AllowEdit = false;
this.gv_daa014.Tag = "query_a.daa014";
this.gv_daa014.Visible = true;
- this.gv_daa014.VisibleIndex = 7;
+ this.gv_daa014.VisibleIndex = 3;
this.gv_daa014.Width = 50;
//
// gv_daa011
@@ -455,7 +460,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 8;
+ this.gv_remark.VisibleIndex = 9;
this.gv_remark.Width = 94;
//
// gridColumn8
@@ -465,7 +470,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 9;
+ this.gridColumn8.VisibleIndex = 10;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -474,8 +479,6 @@
this.gridColumn9.FieldName = "cgdxh";
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -485,7 +488,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 11;
+ this.gridColumn10.VisibleIndex = 2;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -495,7 +498,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 12;
+ this.gridColumn11.VisibleIndex = 11;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -505,7 +508,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 13;
+ this.gridColumn12.VisibleIndex = 12;
this.gridColumn12.Width = 94;
//
// pageBar1
@@ -586,125 +589,125 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(99, 98);
+ this.txt_remark.Location = new System.Drawing.Point(116, 98);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Properties.ReadOnly = true;
- this.txt_remark.Size = new System.Drawing.Size(461, 24);
+ this.txt_remark.Size = new System.Drawing.Size(444, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 312;
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(99, 12);
+ this.txt_daa001.Location = new System.Drawing.Point(116, 12);
this.txt_daa001.Name = "txt_daa001";
this.txt_daa001.Properties.Appearance.Options.UseFont = true;
this.txt_daa001.Properties.ReadOnly = true;
- this.txt_daa001.Size = new System.Drawing.Size(185, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(168, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
//
// txt_wgTime
//
- this.txt_wgTime.Location = new System.Drawing.Point(927, 69);
+ this.txt_wgTime.Location = new System.Drawing.Point(944, 69);
this.txt_wgTime.Name = "txt_wgTime";
this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
this.txt_wgTime.Properties.ReadOnly = true;
- this.txt_wgTime.Size = new System.Drawing.Size(187, 24);
+ this.txt_wgTime.Size = new System.Drawing.Size(170, 24);
this.txt_wgTime.StyleController = this.layoutMx1;
this.txt_wgTime.TabIndex = 258;
//
// txt_kgTime
//
- this.txt_kgTime.Location = new System.Drawing.Point(927, 40);
+ this.txt_kgTime.Location = new System.Drawing.Point(944, 40);
this.txt_kgTime.Name = "txt_kgTime";
this.txt_kgTime.Properties.Appearance.Options.UseFont = true;
this.txt_kgTime.Properties.ReadOnly = true;
- this.txt_kgTime.Size = new System.Drawing.Size(187, 24);
+ this.txt_kgTime.Size = new System.Drawing.Size(170, 24);
this.txt_kgTime.StyleController = this.layoutMx1;
this.txt_kgTime.TabIndex = 262;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(375, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(668, 12);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
this.txt_daa014.Properties.ReadOnly = true;
- this.txt_daa014.Size = new System.Drawing.Size(185, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(168, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 226;
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(927, 12);
+ this.txt_daa018.Location = new System.Drawing.Point(944, 12);
this.txt_daa018.Name = "txt_daa018";
this.txt_daa018.Properties.Appearance.Options.UseFont = true;
this.txt_daa018.Properties.ReadOnly = true;
- this.txt_daa018.Size = new System.Drawing.Size(187, 24);
+ this.txt_daa018.Size = new System.Drawing.Size(170, 24);
this.txt_daa018.StyleController = this.layoutMx1;
this.txt_daa018.TabIndex = 252;
//
// txt_blStateTxt
//
- this.txt_blStateTxt.Location = new System.Drawing.Point(651, 12);
+ this.txt_blStateTxt.Location = new System.Drawing.Point(668, 69);
this.txt_blStateTxt.Name = "txt_blStateTxt";
this.txt_blStateTxt.Properties.Appearance.Options.UseFont = true;
this.txt_blStateTxt.Properties.ReadOnly = true;
- this.txt_blStateTxt.Size = new System.Drawing.Size(185, 24);
+ this.txt_blStateTxt.Size = new System.Drawing.Size(168, 24);
this.txt_blStateTxt.StyleController = this.layoutMx1;
this.txt_blStateTxt.TabIndex = 240;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(99, 40);
+ this.txt_itemNo.Location = new System.Drawing.Point(116, 40);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Properties.ReadOnly = true;
- this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(168, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 217;
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(375, 40);
+ this.txt_daa008.Location = new System.Drawing.Point(392, 40);
this.txt_daa008.Name = "txt_daa008";
this.txt_daa008.Properties.Appearance.Options.UseFont = true;
this.txt_daa008.Properties.ReadOnly = true;
- this.txt_daa008.Size = new System.Drawing.Size(185, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(168, 24);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 219;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(651, 40);
+ this.txt_dwName.Location = new System.Drawing.Point(668, 40);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Properties.ReadOnly = true;
- this.txt_dwName.Size = new System.Drawing.Size(185, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(168, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 222;
//
// txt_cgd
//
- this.txt_cgd.Location = new System.Drawing.Point(99, 69);
+ this.txt_cgd.Location = new System.Drawing.Point(116, 69);
this.txt_cgd.Name = "txt_cgd";
- this.txt_cgd.Size = new System.Drawing.Size(185, 24);
+ this.txt_cgd.Size = new System.Drawing.Size(168, 24);
this.txt_cgd.StyleController = this.layoutMx1;
this.txt_cgd.TabIndex = 313;
//
// txt_cgdxh
//
- this.txt_cgdxh.Location = new System.Drawing.Point(375, 69);
+ this.txt_cgdxh.Location = new System.Drawing.Point(392, 69);
this.txt_cgdxh.Name = "txt_cgdxh";
- this.txt_cgdxh.Size = new System.Drawing.Size(185, 24);
+ this.txt_cgdxh.Size = new System.Drawing.Size(168, 24);
this.txt_cgdxh.StyleController = this.layoutMx1;
this.txt_cgdxh.TabIndex = 314;
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(651, 69);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(392, 12);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(185, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 315;
//
@@ -726,18 +729,18 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem17,
this.layoutControlItem3,
this.layoutControlItem7,
- this.layoutControlItem12,
this.layoutControlItem11,
this.layoutControlItem18,
this.layoutControlItem13,
+ this.layoutControlItem10,
+ this.layoutControlItem12,
this.layoutControlItem19,
- this.layoutControlItem10});
+ this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -777,17 +780,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem5
//
@@ -797,7 +790,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem6
//
@@ -808,7 +801,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem6.Text = "宸ュ崟鏁伴噺";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem17
//
@@ -818,7 +811,7 @@
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem17.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem3
//
@@ -828,28 +821,19 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem3.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem3.Text = "宸ュ崟鐘舵�� ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_kgTime;
+ this.layoutControlItem7.CustomizationFormText = "Mes寮�宸ユ椂闂�";
this.layoutControlItem7.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem7.Size = new System.Drawing.Size(278, 29);
- this.layoutControlItem7.Text = "寮�宸ユ椂闂�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_blStateTxt;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 0);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
- this.layoutControlItem12.Text = "閫氱煡澶囨枡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem7.Text = "Mes寮�宸ユ椂闂�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem11
//
@@ -859,8 +843,8 @@
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
- this.layoutControlItem11.Text = "瀹屽伐鏃堕棿 ";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem11.Text = "Mes瀹屽伐鏃堕棿 ";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem18
//
@@ -871,7 +855,7 @@
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem13
//
@@ -882,18 +866,7 @@
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem13.Size = new System.Drawing.Size(552, 29);
this.layoutControlItem13.Text = "澶囨敞澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem19.Location = new System.Drawing.Point(552, 57);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
- this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(92, 18);
//
// layoutControlItem10
//
@@ -904,7 +877,38 @@
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem10.Text = "鍗曚綅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(92, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_blStateTxt;
+ this.layoutControlItem12.Location = new System.Drawing.Point(552, 57);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem12.Text = "閫氱煡澶囨枡";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(92, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
+ this.layoutControlItem19.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(92, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_daa014;
+ this.layoutControlItem2.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(92, 18);
//
// tabMx
//
@@ -953,11 +957,16 @@
this.gvMx1dab007,
this.gvMx1dab021,
this.gvMx1dab009,
- this.gvMx1dab017,
- this.gvMx1dab018,
this.gvMx1dab001,
this.gvMx1dab012,
- this.gvMx1dab002});
+ this.gvMx1dab002,
+ this.gridColumn7,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn16,
+ this.gridColumn17,
+ this.gridColumn18,
+ this.gridColumn19});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1011,7 +1020,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.VisibleIndex = 1;
this.gridColumn6.Width = 94;
//
// gridColumn5
@@ -1021,7 +1030,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 1;
+ this.gridColumn5.VisibleIndex = 2;
this.gridColumn5.Width = 94;
//
// gridColumn4
@@ -1031,7 +1040,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 2;
+ this.gridColumn4.VisibleIndex = 3;
this.gridColumn4.Width = 94;
//
// gvMx1dab006
@@ -1043,7 +1052,7 @@
this.gvMx1dab006.Name = "gvMx1dab006";
this.gvMx1dab006.Tag = "query_a.dab006";
this.gvMx1dab006.Visible = true;
- this.gvMx1dab006.VisibleIndex = 3;
+ this.gvMx1dab006.VisibleIndex = 5;
this.gvMx1dab006.Width = 50;
//
// gvMx1dab007
@@ -1055,7 +1064,7 @@
this.gvMx1dab007.Name = "gvMx1dab007";
this.gvMx1dab007.Tag = "query_a.dab007";
this.gvMx1dab007.Visible = true;
- this.gvMx1dab007.VisibleIndex = 4;
+ this.gvMx1dab007.VisibleIndex = 6;
this.gvMx1dab007.Width = 50;
//
// gvMx1dab021
@@ -1067,7 +1076,7 @@
this.gvMx1dab021.Name = "gvMx1dab021";
this.gvMx1dab021.Tag = "query_a.dab021";
this.gvMx1dab021.Visible = true;
- this.gvMx1dab021.VisibleIndex = 5;
+ this.gvMx1dab021.VisibleIndex = 7;
this.gvMx1dab021.Width = 50;
//
// gvMx1dab009
@@ -1079,28 +1088,8 @@
this.gvMx1dab009.Name = "gvMx1dab009";
this.gvMx1dab009.Tag = "query_a.dab009";
this.gvMx1dab009.Visible = true;
- this.gvMx1dab009.VisibleIndex = 6;
+ this.gvMx1dab009.VisibleIndex = 8;
this.gvMx1dab009.Width = 50;
- //
- // gvMx1dab017
- //
- this.gvMx1dab017.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab017.Caption = "浠撳簱Id";
- this.gvMx1dab017.FieldName = "dab017";
- this.gvMx1dab017.MinWidth = 50;
- this.gvMx1dab017.Name = "gvMx1dab017";
- this.gvMx1dab017.Tag = "query_a.dab017";
- this.gvMx1dab017.Width = 94;
- //
- // gvMx1dab018
- //
- this.gvMx1dab018.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab018.Caption = "浠撳簱鍚嶇О ";
- this.gvMx1dab018.FieldName = "dab018";
- this.gvMx1dab018.MinWidth = 50;
- this.gvMx1dab018.Name = "gvMx1dab018";
- this.gvMx1dab018.Tag = "query_a.dab018";
- this.gvMx1dab018.Width = 94;
//
// gvMx1dab001
//
@@ -1111,7 +1100,7 @@
this.gvMx1dab001.Name = "gvMx1dab001";
this.gvMx1dab001.Tag = "query_a.dab001";
this.gvMx1dab001.Visible = true;
- this.gvMx1dab001.VisibleIndex = 7;
+ this.gvMx1dab001.VisibleIndex = 9;
this.gvMx1dab001.Width = 94;
//
// gvMx1dab012
@@ -1123,7 +1112,7 @@
this.gvMx1dab012.Name = "gvMx1dab012";
this.gvMx1dab012.Tag = "query_a.dab012";
this.gvMx1dab012.Visible = true;
- this.gvMx1dab012.VisibleIndex = 8;
+ this.gvMx1dab012.VisibleIndex = 10;
this.gvMx1dab012.Width = 50;
//
// gvMx1dab002
@@ -1135,8 +1124,76 @@
this.gvMx1dab002.Name = "gvMx1dab002";
this.gvMx1dab002.Tag = "query_a.dab002";
this.gvMx1dab002.Visible = true;
- this.gvMx1dab002.VisibleIndex = 9;
+ this.gvMx1dab002.VisibleIndex = 0;
this.gvMx1dab002.Width = 50;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "琛ユ枡鏁伴噺";
+ this.gridColumn7.FieldName = "blQty";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 11;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "瓒呴鏁伴噺";
+ this.gridColumn14.FieldName = "clQty";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 12;
+ this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
+ this.gridColumn15.FieldName = "llBl";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 13;
+ this.gridColumn15.Width = 94;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "鑹搧閫�鏂�";
+ this.gridColumn16.FieldName = "lpTl";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 14;
+ this.gridColumn16.Width = 94;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "浣滀笟涓嶈壇閫�鏂�";
+ this.gridColumn17.FieldName = "zyBl";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 15;
+ this.gridColumn17.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "閫�鏂欐�绘暟";
+ this.gridColumn18.FieldName = "ztsl";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "棰嗘枡杩涘害";
+ this.gridColumn19.FieldName = "barbl";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 4;
+ this.gridColumn19.Width = 94;
//
// Frm_WwGd
//
@@ -1182,18 +1239,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1241,7 +1298,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 layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
@@ -1260,8 +1316,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab007;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab009;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab021;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab017;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab018;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab001;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab012;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1dab002;
@@ -1278,11 +1332,19 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index 51c9ee5..95eca36 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -1,3 +1,4 @@
+using DevExpress.Utils;
using Gs.DevApp.DevFrm.WW;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -7,6 +8,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -28,6 +30,9 @@
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
+ gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
+ gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
+ Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "pcShChk", "", (value) =>
{
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 9780866..fe632be 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -67,10 +67,10 @@
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptSrm = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
this.label1 = new System.Windows.Forms.Label();
this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -160,6 +160,7 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 60;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// colChkInt
@@ -258,6 +259,8 @@
this.gridColumn6.MinWidth = 10;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "purchaseQty", "閲囪喘:{0:0.##}")});
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
this.gridColumn6.Width = 11;
@@ -269,6 +272,8 @@
this.gridColumn9.MinWidth = 10;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "yssl", "宸叉敹:{0:0.##}")});
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 6;
this.gridColumn9.Width = 50;
@@ -284,6 +289,8 @@
this.gridColumn7.MinWidth = 10;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "wssl", "鏈敹={0:0.##}")});
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 7;
this.gridColumn7.Width = 10;
@@ -495,6 +502,16 @@
this.rptSrm.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptSrm.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptSrm_ButtonClick);
//
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "寤虹珛鏃堕棿";
+ this.gridColumn11.FieldName = "createDate";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 4;
+ this.gridColumn11.Width = 94;
+ //
// panelControl3
//
this.panelControl3.Controls.Add(this.label1);
@@ -524,16 +541,6 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "濮斿")});
this.radioGroup1.Size = new System.Drawing.Size(197, 34);
this.radioGroup1.TabIndex = 0;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "寤虹珛鏃堕棿";
- this.gridColumn11.FieldName = "createDate";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 94;
//
// SelectCgMx
//
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 60ab5b4..6785641 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -1,4 +1,6 @@
-锘縰sing DevExpress.XtraEditors;
+锘縰sing DevExpress.Data;
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Newtonsoft.Json;
@@ -11,7 +13,6 @@
{
public partial class SelectCgMx : XtraForm
{
-
private readonly string _webServiceName = "MesInvItemArnManager/";
private string suppId = "";
private string receiveOrgId = "";
@@ -24,6 +25,56 @@
public SelectCgMx(string _suppId, string _receiveOrgId)
{
InitializeComponent();
+ #region MyRegion
+ gridView1.Columns["purchaseQty"].SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Custom;
+ gridView1.Columns["yssl"].SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Custom;
+ gridView1.Columns["wssl"].SummaryItem.SummaryType = DevExpress.Data.SummaryItemType.Custom;
+ gridView1.CustomSummaryCalculate += (sender, e) =>
+ {
+ GridView view = sender as GridView;
+ object obj = e.FieldValue;
+ if (e.SummaryProcess == CustomSummaryProcess.Start)
+ {
+ // 鍒濆鍖栨眹鎬诲��
+ e.TotalValue = 0;
+ }
+ else if (e.SummaryProcess == CustomSummaryProcess.Calculate)
+ {
+ // 妫�鏌ュ綋鍓嶈鐨凷tatus瀛楁鏄惁涓�1
+ int status = Convert.ToInt32(view.GetListSourceRowCellValue(e.RowHandle, "chkInt"));
+ if (status == 1)
+ {
+ string _colCaption = e.Item.ToString();
+ if (_colCaption.Contains("閲囪喘"))
+ {
+ decimal amount = Convert.ToDecimal(view.GetListSourceRowCellValue(e.RowHandle, "purchaseQty"));
+ e.TotalValue = Convert.ToDecimal(e.TotalValue) + amount;
+ }
+ else
+ {
+ if (_colCaption.Contains("宸叉敹"))
+ {
+ decimal amount2 = Convert.ToDecimal(view.GetListSourceRowCellValue(e.RowHandle, "yssl"));
+ e.TotalValue = Convert.ToDecimal(e.TotalValue) + amount2;
+ }
+ else
+ {
+ if (_colCaption.Contains("鏈敹"))
+ {
+ decimal amount3 = Convert.ToDecimal(view.GetListSourceRowCellValue(e.RowHandle, "wssl"));
+ e.TotalValue = Convert.ToDecimal(e.TotalValue) + amount3;
+ }
+ }
+ }
+ }
+ }
+ else if (e.SummaryProcess == CustomSummaryProcess.Finalize)
+ {
+ // 璁剧疆鏈�缁堟眹鎬诲��
+ e.TotalValue = e.TotalValue;
+ }
+ };
+ #endregion
this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
@@ -103,7 +154,6 @@
}
}
-
#region SRM鐨勫垪琛ㄥ拰閫夋嫨浜嬩欢
/// <summary>
/// </summary>
@@ -177,7 +227,5 @@
}
}
#endregion
-
-
}
}
\ No newline at end of file
--
Gitblit v1.9.3