From eddbf3ce84e8c41bdbe86d58037073df4b6ae250 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 25 七月 2025 10:02:12 +0800
Subject: [PATCH] 委外bug
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs | 16
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 10
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 433 +++++++++++++-------------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 447 +++++++++------------------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 16
5 files changed, 384 insertions(+), 538 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 0d5f213..723d430 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -30,19 +30,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -83,6 +82,7 @@
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.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -143,7 +143,6 @@
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -202,7 +201,7 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -277,7 +276,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
@@ -298,6 +296,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -756,7 +755,7 @@
// gv_auditor
//
this.gv_auditor.AppearanceCell.Options.UseFont = true;
- this.gv_auditor.Caption = "瀹℃牳浜� ";
+ this.gv_auditor.Caption = "Mes瀹℃牳浜� ";
this.gv_auditor.FieldName = "auditor";
this.gv_auditor.MinWidth = 25;
this.gv_auditor.Name = "gv_auditor";
@@ -769,7 +768,7 @@
// gv_auditDate
//
this.gv_auditDate.AppearanceCell.Options.UseFont = true;
- this.gv_auditDate.Caption = "瀹℃牳鏃堕棿 ";
+ this.gv_auditDate.Caption = "Mes瀹℃牳鏃堕棿 ";
this.gv_auditDate.FieldName = "auditDate";
this.gv_auditDate.MinWidth = 25;
this.gv_auditDate.Name = "gv_auditDate";
@@ -826,6 +825,16 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Width = 94;
//
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "瀹℃牳";
+ this.gridColumn16.FieldName = "auditStatusChk";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 0;
+ this.gridColumn16.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -863,7 +872,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 651);
- this.splitMx1.SplitterPosition = 303;
+ this.splitMx1.SplitterPosition = 238;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -907,12 +916,13 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem34,
this.layoutControlItem29,
- this.layoutControlItem32});
+ this.layoutControlItem32,
+ this.layoutControlItem8});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 44, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 303);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 238);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -936,10 +946,10 @@
//
// txt_stockownerName
//
- this.txt_stockownerName.Location = new System.Drawing.Point(114, 229);
+ this.txt_stockownerName.Location = new System.Drawing.Point(114, 208);
this.txt_stockownerName.Name = "txt_stockownerName";
this.txt_stockownerName.Properties.Appearance.Options.UseFont = true;
- this.txt_stockownerName.Size = new System.Drawing.Size(170, 24);
+ this.txt_stockownerName.Size = new System.Drawing.Size(165, 24);
this.txt_stockownerName.StyleController = this.layoutMx1;
this.txt_stockownerName.TabIndex = 664;
//
@@ -948,79 +958,79 @@
this.txt_orderNo.Location = new System.Drawing.Point(114, 12);
this.txt_orderNo.Name = "txt_orderNo";
this.txt_orderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_orderNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_orderNo.Size = new System.Drawing.Size(165, 24);
this.txt_orderNo.StyleController = this.layoutMx1;
this.txt_orderNo.TabIndex = 211;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(666, 105);
+ this.txt_itemModel.Location = new System.Drawing.Point(656, 96);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(170, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(165, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 662;
//
// txt_orderType
//
- this.txt_orderType.Location = new System.Drawing.Point(390, 12);
+ this.txt_orderType.Location = new System.Drawing.Point(385, 12);
this.txt_orderType.Name = "txt_orderType";
this.txt_orderType.Properties.Appearance.Options.UseFont = true;
- this.txt_orderType.Size = new System.Drawing.Size(170, 24);
+ this.txt_orderType.Size = new System.Drawing.Size(165, 24);
this.txt_orderType.StyleController = this.layoutMx1;
this.txt_orderType.TabIndex = 219;
//
// txt_auditDate
//
- this.txt_auditDate.Location = new System.Drawing.Point(942, 167);
+ this.txt_auditDate.Location = new System.Drawing.Point(927, 152);
this.txt_auditDate.Name = "txt_auditDate";
this.txt_auditDate.Properties.Appearance.Options.UseFont = true;
- this.txt_auditDate.Size = new System.Drawing.Size(172, 24);
+ this.txt_auditDate.Size = new System.Drawing.Size(166, 24);
this.txt_auditDate.StyleController = this.layoutMx1;
this.txt_auditDate.TabIndex = 532;
//
// txt_planConfirmation
//
- this.txt_planConfirmation.Location = new System.Drawing.Point(942, 136);
+ this.txt_planConfirmation.Location = new System.Drawing.Point(927, 124);
this.txt_planConfirmation.Name = "txt_planConfirmation";
this.txt_planConfirmation.Properties.Appearance.Options.UseFont = true;
- this.txt_planConfirmation.Size = new System.Drawing.Size(172, 24);
+ this.txt_planConfirmation.Size = new System.Drawing.Size(166, 24);
this.txt_planConfirmation.StyleController = this.layoutMx1;
this.txt_planConfirmation.TabIndex = 627;
//
// txt_workOrderQty
//
- this.txt_workOrderQty.Location = new System.Drawing.Point(666, 12);
+ this.txt_workOrderQty.Location = new System.Drawing.Point(656, 12);
this.txt_workOrderQty.Name = "txt_workOrderQty";
this.txt_workOrderQty.Properties.Appearance.Options.UseFont = true;
- this.txt_workOrderQty.Size = new System.Drawing.Size(170, 24);
+ this.txt_workOrderQty.Size = new System.Drawing.Size(165, 24);
this.txt_workOrderQty.StyleController = this.layoutMx1;
this.txt_workOrderQty.TabIndex = 231;
//
// txt_auditStatus
//
- this.txt_auditStatus.Location = new System.Drawing.Point(942, 229);
+ this.txt_auditStatus.Location = new System.Drawing.Point(927, 208);
this.txt_auditStatus.Name = "txt_auditStatus";
this.txt_auditStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_auditStatus.Size = new System.Drawing.Size(172, 24);
+ this.txt_auditStatus.Size = new System.Drawing.Size(166, 24);
this.txt_auditStatus.StyleController = this.layoutMx1;
this.txt_auditStatus.TabIndex = 507;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(390, 74);
+ this.txt_itemName.Location = new System.Drawing.Point(385, 68);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(170, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(165, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 660;
//
// txt_businessStatusTxt
//
- this.txt_businessStatusTxt.Location = new System.Drawing.Point(942, 12);
+ this.txt_businessStatusTxt.Location = new System.Drawing.Point(927, 12);
this.txt_businessStatusTxt.Name = "txt_businessStatusTxt";
this.txt_businessStatusTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_businessStatusTxt.Size = new System.Drawing.Size(172, 24);
+ this.txt_businessStatusTxt.Size = new System.Drawing.Size(166, 24);
this.txt_businessStatusTxt.StyleController = this.layoutMx1;
this.txt_businessStatusTxt.TabIndex = 222;
//
@@ -1035,198 +1045,198 @@
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(114, 43);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(114, 40);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
this.txt_erpProductionOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(165, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 319;
//
// txt_auditor
//
- this.txt_auditor.Location = new System.Drawing.Point(942, 198);
+ this.txt_auditor.Location = new System.Drawing.Point(927, 180);
this.txt_auditor.Name = "txt_auditor";
this.txt_auditor.Properties.Appearance.Options.UseFont = true;
- this.txt_auditor.Size = new System.Drawing.Size(172, 24);
+ this.txt_auditor.Size = new System.Drawing.Size(166, 24);
this.txt_auditor.StyleController = this.layoutMx1;
this.txt_auditor.TabIndex = 519;
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(114, 260);
+ this.txt_remarks.Location = new System.Drawing.Point(385, 208);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(446, 24);
+ this.txt_remarks.Size = new System.Drawing.Size(436, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 397;
//
// txt_trackingNo
//
- this.txt_trackingNo.Location = new System.Drawing.Point(390, 43);
+ this.txt_trackingNo.Location = new System.Drawing.Point(385, 40);
this.txt_trackingNo.Name = "txt_trackingNo";
this.txt_trackingNo.Properties.Appearance.Options.UseFont = true;
- this.txt_trackingNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_trackingNo.Size = new System.Drawing.Size(165, 24);
this.txt_trackingNo.StyleController = this.layoutMx1;
this.txt_trackingNo.TabIndex = 267;
//
// txt_yrkQty
//
- this.txt_yrkQty.Location = new System.Drawing.Point(666, 43);
+ this.txt_yrkQty.Location = new System.Drawing.Point(656, 40);
this.txt_yrkQty.Name = "txt_yrkQty";
this.txt_yrkQty.Properties.Appearance.Options.UseFont = true;
- this.txt_yrkQty.Size = new System.Drawing.Size(170, 24);
+ this.txt_yrkQty.Size = new System.Drawing.Size(165, 24);
this.txt_yrkQty.StyleController = this.layoutMx1;
this.txt_yrkQty.TabIndex = 471;
//
// txt_batchNo
//
- this.txt_batchNo.Location = new System.Drawing.Point(666, 229);
+ this.txt_batchNo.Location = new System.Drawing.Point(656, 208);
this.txt_batchNo.Name = "txt_batchNo";
this.txt_batchNo.Properties.Appearance.Options.UseFont = true;
- this.txt_batchNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_batchNo.Size = new System.Drawing.Size(165, 24);
this.txt_batchNo.StyleController = this.layoutMx1;
this.txt_batchNo.TabIndex = 273;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(114, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(114, 68);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(165, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 226;
//
// txt_purchaseorderno
//
- this.txt_purchaseorderno.Location = new System.Drawing.Point(114, 105);
+ this.txt_purchaseorderno.Location = new System.Drawing.Point(114, 96);
this.txt_purchaseorderno.Name = "txt_purchaseorderno";
this.txt_purchaseorderno.Properties.Appearance.Options.UseFont = true;
- this.txt_purchaseorderno.Size = new System.Drawing.Size(170, 24);
+ this.txt_purchaseorderno.Size = new System.Drawing.Size(165, 24);
this.txt_purchaseorderno.StyleController = this.layoutMx1;
this.txt_purchaseorderno.TabIndex = 427;
//
// txt_demandOrderNo
//
- this.txt_demandOrderNo.Location = new System.Drawing.Point(390, 105);
+ this.txt_demandOrderNo.Location = new System.Drawing.Point(385, 96);
this.txt_demandOrderNo.Name = "txt_demandOrderNo";
this.txt_demandOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_demandOrderNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_demandOrderNo.Size = new System.Drawing.Size(165, 24);
this.txt_demandOrderNo.StyleController = this.layoutMx1;
this.txt_demandOrderNo.TabIndex = 351;
//
// txt_purchaseorderentryseq
//
- this.txt_purchaseorderentryseq.Location = new System.Drawing.Point(114, 136);
+ this.txt_purchaseorderentryseq.Location = new System.Drawing.Point(114, 124);
this.txt_purchaseorderentryseq.Name = "txt_purchaseorderentryseq";
this.txt_purchaseorderentryseq.Properties.Appearance.Options.UseFont = true;
- this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(170, 24);
+ this.txt_purchaseorderentryseq.Size = new System.Drawing.Size(165, 24);
this.txt_purchaseorderentryseq.StyleController = this.layoutMx1;
this.txt_purchaseorderentryseq.TabIndex = 438;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(666, 136);
+ this.txt_dwName.Location = new System.Drawing.Point(656, 124);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
- this.txt_dwName.Size = new System.Drawing.Size(170, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(165, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 228;
//
// txt_closingType
//
- this.txt_closingType.Location = new System.Drawing.Point(390, 198);
+ this.txt_closingType.Location = new System.Drawing.Point(385, 180);
this.txt_closingType.Name = "txt_closingType";
this.txt_closingType.Properties.Appearance.Options.UseFont = true;
- this.txt_closingType.Size = new System.Drawing.Size(170, 24);
+ this.txt_closingType.Size = new System.Drawing.Size(165, 24);
this.txt_closingType.StyleController = this.layoutMx1;
this.txt_closingType.TabIndex = 378;
//
// txt_estimatedStartTime
//
- this.txt_estimatedStartTime.Location = new System.Drawing.Point(942, 43);
+ this.txt_estimatedStartTime.Location = new System.Drawing.Point(927, 40);
this.txt_estimatedStartTime.Name = "txt_estimatedStartTime";
this.txt_estimatedStartTime.Properties.Appearance.Options.UseFont = true;
- this.txt_estimatedStartTime.Size = new System.Drawing.Size(172, 24);
+ this.txt_estimatedStartTime.Size = new System.Drawing.Size(166, 24);
this.txt_estimatedStartTime.StyleController = this.layoutMx1;
this.txt_estimatedStartTime.TabIndex = 243;
//
// txt_demandOrderLineNo
//
- this.txt_demandOrderLineNo.Location = new System.Drawing.Point(390, 136);
+ this.txt_demandOrderLineNo.Location = new System.Drawing.Point(385, 124);
this.txt_demandOrderLineNo.Name = "txt_demandOrderLineNo";
this.txt_demandOrderLineNo.Properties.Appearance.Options.UseFont = true;
- this.txt_demandOrderLineNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_demandOrderLineNo.Size = new System.Drawing.Size(165, 24);
this.txt_demandOrderLineNo.StyleController = this.layoutMx1;
this.txt_demandOrderLineNo.TabIndex = 360;
//
// txt_sourceOrderNo
//
- this.txt_sourceOrderNo.Location = new System.Drawing.Point(114, 198);
+ this.txt_sourceOrderNo.Location = new System.Drawing.Point(114, 180);
this.txt_sourceOrderNo.Name = "txt_sourceOrderNo";
this.txt_sourceOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_sourceOrderNo.Size = new System.Drawing.Size(170, 24);
+ this.txt_sourceOrderNo.Size = new System.Drawing.Size(165, 24);
this.txt_sourceOrderNo.StyleController = this.layoutMx1;
this.txt_sourceOrderNo.TabIndex = 336;
//
// txt_closingPerson
//
- this.txt_closingPerson.Location = new System.Drawing.Point(390, 167);
+ this.txt_closingPerson.Location = new System.Drawing.Point(385, 152);
this.txt_closingPerson.Name = "txt_closingPerson";
this.txt_closingPerson.Properties.Appearance.Options.UseFont = true;
- this.txt_closingPerson.Size = new System.Drawing.Size(170, 24);
+ this.txt_closingPerson.Size = new System.Drawing.Size(165, 24);
this.txt_closingPerson.StyleController = this.layoutMx1;
this.txt_closingPerson.TabIndex = 370;
//
// txt_storageUpperLimit
//
- this.txt_storageUpperLimit.Location = new System.Drawing.Point(666, 167);
+ this.txt_storageUpperLimit.Location = new System.Drawing.Point(656, 152);
this.txt_storageUpperLimit.Name = "txt_storageUpperLimit";
this.txt_storageUpperLimit.Properties.Appearance.Options.UseFont = true;
- this.txt_storageUpperLimit.Size = new System.Drawing.Size(170, 24);
+ this.txt_storageUpperLimit.Size = new System.Drawing.Size(165, 24);
this.txt_storageUpperLimit.StyleController = this.layoutMx1;
this.txt_storageUpperLimit.TabIndex = 258;
//
// txt_estimatedEndTime
//
- this.txt_estimatedEndTime.Location = new System.Drawing.Point(942, 74);
+ this.txt_estimatedEndTime.Location = new System.Drawing.Point(927, 68);
this.txt_estimatedEndTime.Name = "txt_estimatedEndTime";
this.txt_estimatedEndTime.Properties.Appearance.Options.UseFont = true;
- this.txt_estimatedEndTime.Size = new System.Drawing.Size(172, 24);
+ this.txt_estimatedEndTime.Size = new System.Drawing.Size(166, 24);
this.txt_estimatedEndTime.StyleController = this.layoutMx1;
this.txt_estimatedEndTime.TabIndex = 247;
//
// txt_bomVersion
//
- this.txt_bomVersion.Location = new System.Drawing.Point(114, 167);
+ this.txt_bomVersion.Location = new System.Drawing.Point(114, 152);
this.txt_bomVersion.Name = "txt_bomVersion";
this.txt_bomVersion.Properties.Appearance.Options.UseFont = true;
- this.txt_bomVersion.Size = new System.Drawing.Size(170, 24);
+ this.txt_bomVersion.Size = new System.Drawing.Size(165, 24);
this.txt_bomVersion.StyleController = this.layoutMx1;
this.txt_bomVersion.TabIndex = 280;
//
// txt_storageLowerLimit
//
- this.txt_storageLowerLimit.Location = new System.Drawing.Point(666, 198);
+ this.txt_storageLowerLimit.Location = new System.Drawing.Point(656, 180);
this.txt_storageLowerLimit.Name = "txt_storageLowerLimit";
this.txt_storageLowerLimit.Properties.Appearance.Options.UseFont = true;
- this.txt_storageLowerLimit.Size = new System.Drawing.Size(170, 24);
+ this.txt_storageLowerLimit.Size = new System.Drawing.Size(165, 24);
this.txt_storageLowerLimit.StyleController = this.layoutMx1;
this.txt_storageLowerLimit.TabIndex = 262;
//
// txt_planReleaseDate
//
- this.txt_planReleaseDate.Location = new System.Drawing.Point(942, 105);
+ this.txt_planReleaseDate.Location = new System.Drawing.Point(927, 96);
this.txt_planReleaseDate.Name = "txt_planReleaseDate";
this.txt_planReleaseDate.Properties.Appearance.Options.UseFont = true;
- this.txt_planReleaseDate.Size = new System.Drawing.Size(172, 24);
+ this.txt_planReleaseDate.Size = new System.Drawing.Size(166, 24);
this.txt_planReleaseDate.StyleController = this.layoutMx1;
this.txt_planReleaseDate.TabIndex = 252;
//
// txt_wrkQty
//
- this.txt_wrkQty.Location = new System.Drawing.Point(666, 74);
+ this.txt_wrkQty.Location = new System.Drawing.Point(656, 68);
this.txt_wrkQty.Name = "txt_wrkQty";
- this.txt_wrkQty.Size = new System.Drawing.Size(170, 24);
+ this.txt_wrkQty.Size = new System.Drawing.Size(165, 24);
this.txt_wrkQty.StyleController = this.layoutMx1;
this.txt_wrkQty.TabIndex = 667;
//
@@ -1285,7 +1295,6 @@
this.layoutControlItem21,
this.layoutControlItem24,
this.layoutControlItem25,
- this.layoutControlItem28,
this.layoutControlItem33,
this.layoutControlItem15,
this.layoutControlItem19,
@@ -1294,56 +1303,53 @@
this.layoutControlItem31,
this.layoutControlItem26,
this.layoutControlItem30,
- this.layoutControlItem8,
this.layoutControlItem22,
this.layoutControlItem18,
this.layoutControlItem14,
this.layoutControlItem11,
- this.layoutControlItem35});
+ this.layoutControlItem35,
+ this.layoutControlItem28});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition15.Height = 100D;
- rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition16.Height = 100D;
- rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition10,
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14,
- rowDefinition15,
- rowDefinition16,
- rowDefinition17,
- rowDefinition18});
- this.Root.Size = new System.Drawing.Size(1126, 303);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.Root.Size = new System.Drawing.Size(1105, 244);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1351,195 +1357,184 @@
this.layoutControlItem1.Control = this.txt_orderNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem1.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_orderType;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_workOrderQty;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_businessStatusTxt;
- this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem4.Text = "涓氬姟鐘舵��";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_trackingNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem6.Text = "璁″垝璺熻釜鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_yrkQty;
- this.layoutControlItem7.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_itemNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem9.Text = "浜у搧缂栫爜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_purchaseorderno;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 93);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem12.Text = "閲囪喘璁㈠崟";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_demandOrderNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(276, 93);
+ this.layoutControlItem13.Location = new System.Drawing.Point(271, 84);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem13.Text = "闇�姹傚崟鎹彿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_purchaseorderentryseq;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem16.Text = "閲囪喘鍗曡鍙�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_demandOrderLineNo;
- this.layoutControlItem17.Location = new System.Drawing.Point(276, 124);
+ this.layoutControlItem17.Location = new System.Drawing.Point(271, 112);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem17.Text = "闇�姹傚崟鎹鍙�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_bomVersion;
- this.layoutControlItem20.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 140);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem20.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem20.Text = "BOM鐗堟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_closingPerson;
- this.layoutControlItem21.Location = new System.Drawing.Point(276, 155);
+ this.layoutControlItem21.Location = new System.Drawing.Point(271, 140);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem21.Text = "缁撴浜哄憳";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_sourceOrderNo;
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 186);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 168);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem24.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem24.Text = "婧愬崟缂栧彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_closingType;
- this.layoutControlItem25.Location = new System.Drawing.Point(276, 186);
+ this.layoutControlItem25.Location = new System.Drawing.Point(271, 168);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem25.Text = "缁撴绫诲瀷";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem28
- //
- this.layoutControlItem28.Control = this.txt_remarks;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 248);
- this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem28.Size = new System.Drawing.Size(552, 35);
- this.layoutControlItem28.Text = "澶囨敞";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.txt_stockownerName;
- this.layoutControlItem33.Location = new System.Drawing.Point(0, 217);
+ this.layoutControlItem33.Location = new System.Drawing.Point(0, 196);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem33.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem33.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem33.Text = "鍏ュ簱璐т富";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1547,143 +1542,145 @@
//
this.layoutControlItem15.Control = this.txt_estimatedStartTime;
this.layoutControlItem15.CustomizationFormText = "Erp棰勮寮�宸�";
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(813, 28);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem15.Text = "Erp棰勮寮�宸�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_estimatedEndTime;
- this.layoutControlItem19.Location = new System.Drawing.Point(828, 62);
+ this.layoutControlItem19.Location = new System.Drawing.Point(813, 56);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(272, 28);
this.layoutControlItem19.Text = "Erp棰勮瀹屽伐";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_planReleaseDate;
- this.layoutControlItem23.Location = new System.Drawing.Point(828, 93);
+ this.layoutControlItem23.CustomizationFormText = "Erp璁″垝涓嬭揪";
+ this.layoutControlItem23.Location = new System.Drawing.Point(813, 84);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem23.Text = "璁″垝涓嬭揪鏃堕棿";
+ this.layoutControlItem23.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem23.Text = "Erp璁″垝涓嬭揪";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_planConfirmation;
- this.layoutControlItem27.Location = new System.Drawing.Point(828, 124);
+ this.layoutControlItem27.Location = new System.Drawing.Point(813, 112);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem27.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem27.Text = "璁″垝纭鏃堕棿";
+ this.layoutControlItem27.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem27.Text = "Erp璁″垝纭";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_auditDate;
- this.layoutControlItem31.Location = new System.Drawing.Point(828, 155);
+ this.layoutControlItem31.CustomizationFormText = "Mes瀹℃牳鏃堕棿";
+ this.layoutControlItem31.Location = new System.Drawing.Point(813, 140);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem31.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem31.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem31.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem31.Text = "Mes瀹℃牳鏃堕棿";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_auditor;
- this.layoutControlItem26.Location = new System.Drawing.Point(828, 186);
+ this.layoutControlItem26.Location = new System.Drawing.Point(813, 168);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem26.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem26.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem26.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem26.Text = "Mes瀹℃牳浜哄憳";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.txt_auditStatus;
- this.layoutControlItem30.Location = new System.Drawing.Point(828, 217);
+ this.layoutControlItem30.Location = new System.Drawing.Point(813, 196);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem30.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem30.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem30.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem30.Text = "Mes瀹℃牳鐘舵��";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_batchNo;
- this.layoutControlItem8.Location = new System.Drawing.Point(552, 217);
+ this.layoutControlItem8.Location = new System.Drawing.Point(542, 196);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem8.Text = "鎵瑰彿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_storageLowerLimit;
- this.layoutControlItem22.Location = new System.Drawing.Point(552, 186);
+ this.layoutControlItem22.Location = new System.Drawing.Point(542, 168);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem22.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem22.Text = "鍏ュ簱涓嬮檺";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_storageUpperLimit;
- this.layoutControlItem18.Location = new System.Drawing.Point(552, 155);
+ this.layoutControlItem18.Location = new System.Drawing.Point(542, 140);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem18.Text = "鍏ュ簱涓婇檺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_dwName;
- this.layoutControlItem14.Location = new System.Drawing.Point(552, 124);
+ this.layoutControlItem14.Location = new System.Drawing.Point(542, 112);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem14.Text = "鍗曚綅";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 93);
+ this.layoutControlItem11.Location = new System.Drawing.Point(542, 84);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_wrkQty;
- this.layoutControlItem35.Location = new System.Drawing.Point(552, 62);
+ this.layoutControlItem35.Location = new System.Drawing.Point(542, 56);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem35.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem35.Size = new System.Drawing.Size(271, 28);
this.layoutControlItem35.Text = "鏈叆搴撴暟";
this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1693,7 +1690,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 336);
+ this.tabMx.Size = new System.Drawing.Size(1126, 401);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1702,7 +1699,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 304);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 369);
this.tabMxPage1.Text = "鏄庣粏";
//
// gcMx1
@@ -1711,7 +1708,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 304);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 369);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2216,15 +2213,17 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn16
+ // layoutControlItem28
//
- this.gridColumn16.Caption = "瀹℃牳";
- this.gridColumn16.FieldName = "auditStatusChk";
- this.gridColumn16.MinWidth = 25;
- this.gridColumn16.Name = "gridColumn16";
- this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 0;
- this.gridColumn16.Width = 94;
+ this.layoutControlItem28.Control = this.txt_remarks;
+ this.layoutControlItem28.Location = new System.Drawing.Point(271, 196);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem28.Size = new System.Drawing.Size(542, 28);
+ this.layoutControlItem28.Text = "澶囨敞";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
// Frm_ProductionOrder
//
@@ -2310,7 +2309,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
@@ -2331,6 +2329,7 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
this.ResumeLayout(false);
}
@@ -2474,7 +2473,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.Utils.ToolTipController tips;
@@ -2495,5 +2493,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
index 5189607..d74310a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -289,7 +289,7 @@
lbGuid, txt_orderNo, gridView1, "orderNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -306,9 +306,9 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -321,13 +321,13 @@
gridView1.FocusedRowHandle = rowHandle;
}
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index 6cd1249..7227e72 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -38,7 +38,6 @@
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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -54,17 +53,13 @@
this.gv_unit = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_mesEndProd = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_blState = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_blTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_blUser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_wgTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_wgUser = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_pcTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -81,29 +76,24 @@
this.txt_wgUser = new DevExpress.XtraEditors.TextEdit();
this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
- this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
this.txt_blStateTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
- this.txt_mesEndProd = new DevExpress.XtraEditors.TextEdit();
this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
this.txt_cgd = new DevExpress.XtraEditors.TextEdit();
this.txt_cgdxh = new DevExpress.XtraEditors.TextEdit();
this.txt_erpProductionOrderNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_pcHNo = new DevExpress.XtraEditors.TextEdit();
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.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = 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.tabMx = new DevExpress.XtraTab.XtraTabControl();
@@ -127,9 +117,8 @@
this.gvMx1dab012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1dab002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -155,29 +144,24 @@
((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgd.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).BeginInit();
((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.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).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.tabMx)).BeginInit();
@@ -185,9 +169,8 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -274,17 +257,13 @@
this.gv_unit,
this.gv_daa014,
this.gv_daa011,
- this.gv_mesStartProd,
- this.gv_mesEndProd,
this.gv_blState,
this.gv_blTime,
this.gv_blUser,
this.gv_daa018,
this.gv_wgTime,
this.gv_wgUser,
- this.gv_pcTime,
this.gv_remark,
- this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
this.gridColumn10,
@@ -398,32 +377,6 @@
this.gv_daa011.Tag = "query_a.daa011";
this.gv_daa011.Width = 50;
//
- // gv_mesStartProd
- //
- this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
- this.gv_mesStartProd.Caption = "Mes棰勮寮�宸�";
- this.gv_mesStartProd.FieldName = "mesStartProd";
- this.gv_mesStartProd.MinWidth = 50;
- this.gv_mesStartProd.Name = "gv_mesStartProd";
- this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
- this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
- this.gv_mesStartProd.Visible = true;
- this.gv_mesStartProd.VisibleIndex = 8;
- this.gv_mesStartProd.Width = 180;
- //
- // gv_mesEndProd
- //
- this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
- this.gv_mesEndProd.Caption = "Mes棰勮瀹屽伐";
- this.gv_mesEndProd.FieldName = "mesEndProd";
- this.gv_mesEndProd.MinWidth = 50;
- this.gv_mesEndProd.Name = "gv_mesEndProd";
- this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
- this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
- this.gv_mesEndProd.Visible = true;
- this.gv_mesEndProd.VisibleIndex = 9;
- this.gv_mesEndProd.Width = 180;
- //
// gv_blState
//
this.gv_blState.AppearanceCell.Options.UseFont = true;
@@ -492,19 +445,6 @@
this.gv_wgUser.Tag = "query_a.wg_user";
this.gv_wgUser.Width = 94;
//
- // gv_pcTime
- //
- this.gv_pcTime.AppearanceCell.Options.UseFont = true;
- this.gv_pcTime.Caption = "鎺掍骇鏃堕棿 ";
- this.gv_pcTime.FieldName = "pcTime";
- this.gv_pcTime.MinWidth = 50;
- this.gv_pcTime.Name = "gv_pcTime";
- this.gv_pcTime.OptionsColumn.AllowEdit = false;
- this.gv_pcTime.Tag = "query_a.pc_time";
- this.gv_pcTime.Visible = true;
- this.gv_pcTime.VisibleIndex = 13;
- this.gv_pcTime.Width = 180;
- //
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
@@ -515,18 +455,8 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 10;
+ this.gv_remark.VisibleIndex = 8;
this.gv_remark.Width = 94;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "鎺掍骇缂栧彿";
- this.gridColumn7.FieldName = "pcHNo";
- this.gridColumn7.MinWidth = 25;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 14;
- this.gridColumn7.Width = 94;
//
// gridColumn8
//
@@ -535,7 +465,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 11;
+ this.gridColumn8.VisibleIndex = 9;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -545,7 +475,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
+ this.gridColumn9.VisibleIndex = 10;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -555,7 +485,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 15;
+ this.gridColumn10.VisibleIndex = 11;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -565,7 +495,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 16;
+ this.gridColumn11.VisibleIndex = 12;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -575,7 +505,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 17;
+ this.gridColumn12.VisibleIndex = 13;
this.gridColumn12.Width = 94;
//
// pageBar1
@@ -615,7 +545,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 154;
+ this.splitMx1.SplitterPosition = 135;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -627,16 +557,13 @@
this.layoutMx1.Controls.Add(this.txt_wgUser);
this.layoutMx1.Controls.Add(this.txt_daa014);
this.layoutMx1.Controls.Add(this.txt_daa018);
- this.layoutMx1.Controls.Add(this.txt_mesStartProd);
this.layoutMx1.Controls.Add(this.txt_blStateTxt);
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_daa008);
- this.layoutMx1.Controls.Add(this.txt_mesEndProd);
this.layoutMx1.Controls.Add(this.txt_dwName);
this.layoutMx1.Controls.Add(this.txt_cgd);
this.layoutMx1.Controls.Add(this.txt_cgdxh);
this.layoutMx1.Controls.Add(this.txt_erpProductionOrderNo);
- this.layoutMx1.Controls.Add(this.txt_pcHNo);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16});
@@ -644,7 +571,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 154);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 135);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -659,155 +586,127 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(111, 121);
+ this.txt_remark.Location = new System.Drawing.Point(99, 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(439, 24);
+ this.txt_remark.Size = new System.Drawing.Size(461, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 312;
//
// txt_daa001
//
- this.txt_daa001.Location = new System.Drawing.Point(111, 9);
+ this.txt_daa001.Location = new System.Drawing.Point(99, 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(168, 24);
+ this.txt_daa001.Size = new System.Drawing.Size(185, 24);
this.txt_daa001.StyleController = this.layoutMx1;
this.txt_daa001.TabIndex = 216;
//
// txt_wgTime
//
- this.txt_wgTime.Location = new System.Drawing.Point(653, 65);
+ this.txt_wgTime.Location = new System.Drawing.Point(927, 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(168, 24);
+ this.txt_wgTime.Size = new System.Drawing.Size(187, 24);
this.txt_wgTime.StyleController = this.layoutMx1;
this.txt_wgTime.TabIndex = 258;
//
// txt_wgUser
//
- this.txt_wgUser.Location = new System.Drawing.Point(653, 37);
+ this.txt_wgUser.Location = new System.Drawing.Point(927, 40);
this.txt_wgUser.Name = "txt_wgUser";
this.txt_wgUser.Properties.Appearance.Options.UseFont = true;
this.txt_wgUser.Properties.ReadOnly = true;
- this.txt_wgUser.Size = new System.Drawing.Size(168, 24);
+ this.txt_wgUser.Size = new System.Drawing.Size(187, 24);
this.txt_wgUser.StyleController = this.layoutMx1;
this.txt_wgUser.TabIndex = 262;
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(382, 9);
+ this.txt_daa014.Location = new System.Drawing.Point(375, 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(168, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(185, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 226;
//
// txt_daa018
//
- this.txt_daa018.Location = new System.Drawing.Point(653, 9);
+ this.txt_daa018.Location = new System.Drawing.Point(927, 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(168, 24);
+ this.txt_daa018.Size = new System.Drawing.Size(187, 24);
this.txt_daa018.StyleController = this.layoutMx1;
this.txt_daa018.TabIndex = 252;
//
- // txt_mesStartProd
- //
- this.txt_mesStartProd.Location = new System.Drawing.Point(924, 9);
- this.txt_mesStartProd.Name = "txt_mesStartProd";
- this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesStartProd.Properties.ReadOnly = true;
- this.txt_mesStartProd.Size = new System.Drawing.Size(169, 24);
- this.txt_mesStartProd.StyleController = this.layoutMx1;
- this.txt_mesStartProd.TabIndex = 231;
- //
// txt_blStateTxt
//
- this.txt_blStateTxt.Location = new System.Drawing.Point(924, 65);
+ this.txt_blStateTxt.Location = new System.Drawing.Point(651, 12);
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(169, 24);
+ this.txt_blStateTxt.Size = new System.Drawing.Size(185, 24);
this.txt_blStateTxt.StyleController = this.layoutMx1;
this.txt_blStateTxt.TabIndex = 240;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(111, 37);
+ this.txt_itemNo.Location = new System.Drawing.Point(99, 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(168, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 217;
//
// txt_daa008
//
- this.txt_daa008.Location = new System.Drawing.Point(382, 37);
+ this.txt_daa008.Location = new System.Drawing.Point(375, 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(168, 24);
+ this.txt_daa008.Size = new System.Drawing.Size(185, 24);
this.txt_daa008.StyleController = this.layoutMx1;
this.txt_daa008.TabIndex = 219;
//
- // txt_mesEndProd
- //
- this.txt_mesEndProd.Location = new System.Drawing.Point(924, 37);
- this.txt_mesEndProd.Name = "txt_mesEndProd";
- this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
- this.txt_mesEndProd.Properties.ReadOnly = true;
- this.txt_mesEndProd.Size = new System.Drawing.Size(169, 24);
- this.txt_mesEndProd.StyleController = this.layoutMx1;
- this.txt_mesEndProd.TabIndex = 235;
- //
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(382, 65);
+ this.txt_dwName.Location = new System.Drawing.Point(651, 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(168, 24);
+ this.txt_dwName.Size = new System.Drawing.Size(185, 24);
this.txt_dwName.StyleController = this.layoutMx1;
this.txt_dwName.TabIndex = 222;
//
// txt_cgd
//
- this.txt_cgd.Location = new System.Drawing.Point(111, 65);
+ this.txt_cgd.Location = new System.Drawing.Point(99, 69);
this.txt_cgd.Name = "txt_cgd";
- this.txt_cgd.Size = new System.Drawing.Size(168, 24);
+ this.txt_cgd.Size = new System.Drawing.Size(185, 24);
this.txt_cgd.StyleController = this.layoutMx1;
this.txt_cgd.TabIndex = 313;
//
// txt_cgdxh
//
- this.txt_cgdxh.Location = new System.Drawing.Point(111, 93);
+ this.txt_cgdxh.Location = new System.Drawing.Point(375, 69);
this.txt_cgdxh.Name = "txt_cgdxh";
- this.txt_cgdxh.Size = new System.Drawing.Size(168, 24);
+ this.txt_cgdxh.Size = new System.Drawing.Size(185, 24);
this.txt_cgdxh.StyleController = this.layoutMx1;
this.txt_cgdxh.TabIndex = 314;
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(382, 93);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(651, 69);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(185, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 315;
- //
- // txt_pcHNo
- //
- this.txt_pcHNo.Location = new System.Drawing.Point(653, 93);
- this.txt_pcHNo.Name = "txt_pcHNo";
- this.txt_pcHNo.Size = new System.Drawing.Size(168, 24);
- this.txt_pcHNo.StyleController = this.layoutMx1;
- this.txt_pcHNo.TabIndex = 316;
//
// layoutControlItem16
//
@@ -828,20 +727,17 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
this.layoutControlItem6,
- this.layoutControlItem7,
- this.layoutControlItem8,
- this.layoutControlItem11,
- this.layoutControlItem12,
this.layoutControlItem17,
+ this.layoutControlItem3,
+ this.layoutControlItem7,
+ this.layoutControlItem12,
+ this.layoutControlItem11,
this.layoutControlItem18,
this.layoutControlItem13,
- this.layoutControlItem10,
this.layoutControlItem19,
- this.layoutControlItem20});
+ this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -865,15 +761,12 @@
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[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1105, 160);
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1126, 135);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -882,40 +775,19 @@
this.layoutControlItem1.CustomizationFormText = "濮斿宸ュ崟鍙�";
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ 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(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_daa018;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem3.Text = "宸ュ崟鐘舵�� ";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_mesStartProd;
- this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
- this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
- this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
@@ -923,96 +795,94 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_daa008;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem6.Text = "宸ュ崟鏁伴噺";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_wgUser;
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem7.Text = "瀹屽伐浜哄憳";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_mesEndProd;
- this.layoutControlItem8.CustomizationFormText = "Mes棰勮瀹屽伐";
- this.layoutControlItem8.Location = new System.Drawing.Point(813, 28);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(272, 28);
- this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_wgTime;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 56);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem11.Text = "瀹屽伐鏃堕棿 ";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_blStateTxt;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 56);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 28);
- this.layoutControlItem12.Text = "閫氱煡澶囨枡";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_cgd;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 57);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_daa018;
+ this.layoutControlItem3.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ 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);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_wgUser;
+ 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);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_wgTime;
+ this.layoutControlItem11.Location = new System.Drawing.Point(828, 57);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ 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);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_cgdxh;
- this.layoutControlItem18.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem18.Location = new System.Drawing.Point(276, 57);
this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_remark;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 86);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(542, 28);
- this.layoutControlItem13.Text = "澶囨敞";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
+ 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);
//
// tabMx
//
@@ -1020,7 +890,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 404);
+ this.tabMx.Size = new System.Drawing.Size(1126, 423);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1029,7 +899,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 372);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 391);
this.tabMxPage1.Text = "澶囨枡鍗曡韩";
//
// gcMx1
@@ -1038,7 +908,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 372);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 391);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1246,38 +1116,27 @@
this.gvMx1dab002.VisibleIndex = 9;
this.gvMx1dab002.Width = 50;
//
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_dwName;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem10.Text = "鍗曚綅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
- //
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem19.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem19.Location = new System.Drawing.Point(552, 57);
this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 28);
+ 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(87, 18);
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem20
+ // layoutControlItem10
//
- this.layoutControlItem20.Control = this.txt_pcHNo;
- this.layoutControlItem20.Location = new System.Drawing.Point(542, 84);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
- this.layoutControlItem20.Text = "鎺掍骇缂栧彿";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem10.Control = this.txt_dwName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ 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);
//
// Frm_WwGd
//
@@ -1313,29 +1172,24 @@
((System.ComponentModel.ISupportInitialize)(this.txt_wgUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_blStateTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgd.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).EndInit();
((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.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).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.tabMx)).EndInit();
@@ -1343,9 +1197,8 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
this.ResumeLayout(false);
}
@@ -1364,17 +1217,13 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_unit;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa014;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa011;
- private DevExpress.XtraGrid.Columns.GridColumn gv_mesStartProd;
- private DevExpress.XtraGrid.Columns.GridColumn gv_mesEndProd;
private DevExpress.XtraGrid.Columns.GridColumn gv_blState;
private DevExpress.XtraGrid.Columns.GridColumn gv_blTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_blUser;
private DevExpress.XtraGrid.Columns.GridColumn gv_daa018;
private DevExpress.XtraGrid.Columns.GridColumn gv_wgTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_wgUser;
- private DevExpress.XtraGrid.Columns.GridColumn gv_pcTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
@@ -1384,8 +1233,6 @@
private DevExpress.XtraEditors.TextEdit txt_wgTime;
private DevExpress.XtraEditors.TextEdit txt_daa018;
private DevExpress.XtraEditors.TextEdit txt_blStateTxt;
- private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
- private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
private DevExpress.XtraEditors.TextEdit txt_daa014;
private DevExpress.XtraEditors.TextEdit txt_dwName;
private DevExpress.XtraEditors.TextEdit txt_daa008;
@@ -1395,14 +1242,8 @@
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.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1430,16 +1271,18 @@
private DevExpress.XtraEditors.TextEdit txt_cgd;
private DevExpress.XtraEditors.TextEdit txt_cgdxh;
private DevExpress.XtraEditors.TextEdit txt_erpProductionOrderNo;
- private DevExpress.XtraEditors.TextEdit txt_pcHNo;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ 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 layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
}
}
\ 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 ca6ecfd..51c9ee5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -200,7 +200,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -214,7 +214,7 @@
};
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -252,11 +252,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -303,7 +303,7 @@
lbGuid, txt_daa001, gridView1, "daa001");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -319,9 +319,9 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -334,10 +334,12 @@
gridView1.FocusedRowHandle = rowHandle;
}
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
index 3ae4671..266b000 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
@@ -190,7 +190,7 @@
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
private void getModel(string strGuid)
@@ -200,7 +200,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -256,11 +256,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -285,7 +285,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -302,9 +302,9 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -313,10 +313,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3