From 60128ac8cb2998f4679fde2b23cbebb11d608986 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 05 五月 2025 13:46:42 +0800
Subject: [PATCH] 委外结案
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 104 ++++++++
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 635 ++++++++++++++++++++++++------------------------
2 files changed, 419 insertions(+), 320 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index f755eac..ef51a2a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -30,26 +30,25 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition46 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition47 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition48 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition49 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition50 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition51 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition52 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition53 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition54 = 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();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_auditStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_orderNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -83,6 +82,7 @@
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -121,7 +121,10 @@
this.txt_bomVersion = new DevExpress.XtraEditors.TextEdit();
this.txt_storageLowerLimit = new DevExpress.XtraEditors.TextEdit();
this.txt_planReleaseDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_wrkQty = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -141,8 +144,20 @@
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -187,21 +202,6 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_wrkQty = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -254,7 +254,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bomVersion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_storageLowerLimit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_planReleaseDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -274,14 +277,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
@@ -295,8 +290,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -374,14 +374,13 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_auditStatus,
this.gv_orderNo,
+ this.gv_businessStatus,
this.gridColumn3,
this.gridColumn2,
this.gridColumn1,
this.gv_erpProductionOrderNo,
this.gv_orderType,
- this.gv_businessStatus,
this.gv_workOrderQty,
this.gv_nostockinqty,
this.gv_stockinqty,
@@ -407,26 +406,14 @@
this.gv_stockowner,
this.gridColumn4,
this.gridColumn7,
- this.gridColumn14});
+ this.gridColumn14,
+ this.gridColumn15});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gv_auditStatus
- //
- this.gv_auditStatus.AppearanceCell.Options.UseFont = true;
- this.gv_auditStatus.Caption = "瀹℃牳鐘舵��";
- this.gv_auditStatus.FieldName = "auditStatusChk";
- this.gv_auditStatus.MinWidth = 25;
- this.gv_auditStatus.Name = "gv_auditStatus";
- this.gv_auditStatus.OptionsColumn.AllowEdit = false;
- this.gv_auditStatus.Tag = "query_a.AUDIT_STATUS";
- this.gv_auditStatus.Visible = true;
- this.gv_auditStatus.VisibleIndex = 0;
- this.gv_auditStatus.Width = 50;
//
// gv_orderNo
//
@@ -438,7 +425,7 @@
this.gv_orderNo.OptionsColumn.AllowEdit = false;
this.gv_orderNo.Tag = "query_a.ORDER_NO";
this.gv_orderNo.Visible = true;
- this.gv_orderNo.VisibleIndex = 1;
+ this.gv_orderNo.VisibleIndex = 0;
this.gv_orderNo.Width = 120;
//
// gridColumn3
@@ -507,7 +494,7 @@
this.gv_businessStatus.OptionsColumn.AllowEdit = false;
this.gv_businessStatus.Tag = "query_a.BUSINESS_STATUS";
this.gv_businessStatus.Visible = true;
- this.gv_businessStatus.VisibleIndex = 7;
+ this.gv_businessStatus.VisibleIndex = 1;
this.gv_businessStatus.Width = 50;
//
// gv_workOrderQty
@@ -520,7 +507,7 @@
this.gv_workOrderQty.OptionsColumn.AllowEdit = false;
this.gv_workOrderQty.Tag = "query_a.WORK_ORDER_QTY";
this.gv_workOrderQty.Visible = true;
- this.gv_workOrderQty.VisibleIndex = 8;
+ this.gv_workOrderQty.VisibleIndex = 7;
this.gv_workOrderQty.Width = 50;
//
// gv_nostockinqty
@@ -533,7 +520,7 @@
this.gv_nostockinqty.OptionsColumn.AllowEdit = false;
this.gv_nostockinqty.Tag = "query_a.NOSTOCKINQTY";
this.gv_nostockinqty.Visible = true;
- this.gv_nostockinqty.VisibleIndex = 9;
+ this.gv_nostockinqty.VisibleIndex = 8;
this.gv_nostockinqty.Width = 50;
//
// gv_stockinqty
@@ -546,7 +533,7 @@
this.gv_stockinqty.OptionsColumn.AllowEdit = false;
this.gv_stockinqty.Tag = "query_a.STOCKINQTY";
this.gv_stockinqty.Visible = true;
- this.gv_stockinqty.VisibleIndex = 10;
+ this.gv_stockinqty.VisibleIndex = 9;
this.gv_stockinqty.Width = 50;
//
// gv_unit
@@ -559,7 +546,7 @@
this.gv_unit.OptionsColumn.AllowEdit = false;
this.gv_unit.Tag = "query_a.UNIT";
this.gv_unit.Visible = true;
- this.gv_unit.VisibleIndex = 12;
+ this.gv_unit.VisibleIndex = 11;
this.gv_unit.Width = 50;
//
// gv_estimatedStartTime
@@ -572,7 +559,7 @@
this.gv_estimatedStartTime.OptionsColumn.AllowEdit = false;
this.gv_estimatedStartTime.Tag = "query_a.ESTIMATED_START_TIME";
this.gv_estimatedStartTime.Visible = true;
- this.gv_estimatedStartTime.VisibleIndex = 11;
+ this.gv_estimatedStartTime.VisibleIndex = 10;
this.gv_estimatedStartTime.Width = 180;
//
// gv_estimatedEndTime
@@ -585,7 +572,7 @@
this.gv_estimatedEndTime.OptionsColumn.AllowEdit = false;
this.gv_estimatedEndTime.Tag = "query_a.ESTIMATED_END_TIME";
this.gv_estimatedEndTime.Visible = true;
- this.gv_estimatedEndTime.VisibleIndex = 13;
+ this.gv_estimatedEndTime.VisibleIndex = 12;
this.gv_estimatedEndTime.Width = 180;
//
// gv_planReleaseDate
@@ -598,7 +585,7 @@
this.gv_planReleaseDate.OptionsColumn.AllowEdit = false;
this.gv_planReleaseDate.Tag = "query_a.PLAN_RELEASE_DATE";
this.gv_planReleaseDate.Visible = true;
- this.gv_planReleaseDate.VisibleIndex = 14;
+ this.gv_planReleaseDate.VisibleIndex = 13;
this.gv_planReleaseDate.Width = 94;
//
// gv_storageUpperLimit
@@ -611,7 +598,7 @@
this.gv_storageUpperLimit.OptionsColumn.AllowEdit = false;
this.gv_storageUpperLimit.Tag = "query_a.STORAGE_UPPER_LIMIT";
this.gv_storageUpperLimit.Visible = true;
- this.gv_storageUpperLimit.VisibleIndex = 15;
+ this.gv_storageUpperLimit.VisibleIndex = 14;
this.gv_storageUpperLimit.Width = 50;
//
// gv_storageLowerLimit
@@ -624,7 +611,7 @@
this.gv_storageLowerLimit.OptionsColumn.AllowEdit = false;
this.gv_storageLowerLimit.Tag = "query_a.STORAGE_LOWER_LIMIT";
this.gv_storageLowerLimit.Visible = true;
- this.gv_storageLowerLimit.VisibleIndex = 17;
+ this.gv_storageLowerLimit.VisibleIndex = 16;
this.gv_storageLowerLimit.Width = 50;
//
// gv_trackingNo
@@ -637,7 +624,7 @@
this.gv_trackingNo.OptionsColumn.AllowEdit = false;
this.gv_trackingNo.Tag = "query_a.TRACKING_NO";
this.gv_trackingNo.Visible = true;
- this.gv_trackingNo.VisibleIndex = 16;
+ this.gv_trackingNo.VisibleIndex = 15;
this.gv_trackingNo.Width = 94;
//
// gv_batchNo
@@ -650,7 +637,7 @@
this.gv_batchNo.OptionsColumn.AllowEdit = false;
this.gv_batchNo.Tag = "query_a.BATCH_NO";
this.gv_batchNo.Visible = true;
- this.gv_batchNo.VisibleIndex = 18;
+ this.gv_batchNo.VisibleIndex = 17;
this.gv_batchNo.Width = 94;
//
// gv_bomVersion
@@ -663,7 +650,7 @@
this.gv_bomVersion.OptionsColumn.AllowEdit = false;
this.gv_bomVersion.Tag = "query_a.BOM_VERSION";
this.gv_bomVersion.Visible = true;
- this.gv_bomVersion.VisibleIndex = 19;
+ this.gv_bomVersion.VisibleIndex = 18;
this.gv_bomVersion.Width = 94;
//
// gv_generationMethod
@@ -676,7 +663,7 @@
this.gv_generationMethod.OptionsColumn.AllowEdit = false;
this.gv_generationMethod.Tag = "query_a.GENERATION_METHOD";
this.gv_generationMethod.Visible = true;
- this.gv_generationMethod.VisibleIndex = 20;
+ this.gv_generationMethod.VisibleIndex = 19;
this.gv_generationMethod.Width = 94;
//
// gv_demandOrderNo
@@ -689,7 +676,7 @@
this.gv_demandOrderNo.OptionsColumn.AllowEdit = false;
this.gv_demandOrderNo.Tag = "query_a.DEMAND_ORDER_NO";
this.gv_demandOrderNo.Visible = true;
- this.gv_demandOrderNo.VisibleIndex = 21;
+ this.gv_demandOrderNo.VisibleIndex = 20;
this.gv_demandOrderNo.Width = 94;
//
// gv_demandOrderLineNo
@@ -702,7 +689,7 @@
this.gv_demandOrderLineNo.OptionsColumn.AllowEdit = false;
this.gv_demandOrderLineNo.Tag = "query_a.DEMAND_ORDER_LINE_NO";
this.gv_demandOrderLineNo.Visible = true;
- this.gv_demandOrderLineNo.VisibleIndex = 22;
+ this.gv_demandOrderLineNo.VisibleIndex = 21;
this.gv_demandOrderLineNo.Width = 60;
//
// gv_closingPerson
@@ -715,7 +702,7 @@
this.gv_closingPerson.OptionsColumn.AllowEdit = false;
this.gv_closingPerson.Tag = "query_a.CLOSING_PERSON";
this.gv_closingPerson.Visible = true;
- this.gv_closingPerson.VisibleIndex = 23;
+ this.gv_closingPerson.VisibleIndex = 22;
this.gv_closingPerson.Width = 94;
//
// gv_closingType
@@ -728,7 +715,7 @@
this.gv_closingType.OptionsColumn.AllowEdit = false;
this.gv_closingType.Tag = "query_a.CLOSING_TYPE";
this.gv_closingType.Visible = true;
- this.gv_closingType.VisibleIndex = 24;
+ this.gv_closingType.VisibleIndex = 23;
this.gv_closingType.Width = 94;
//
// gv_remarks
@@ -741,7 +728,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 25;
+ this.gv_remarks.VisibleIndex = 24;
this.gv_remarks.Width = 94;
//
// gv_purchaseorderno
@@ -754,7 +741,7 @@
this.gv_purchaseorderno.OptionsColumn.AllowEdit = false;
this.gv_purchaseorderno.Tag = "query_a.PURCHASEORDERNO";
this.gv_purchaseorderno.Visible = true;
- this.gv_purchaseorderno.VisibleIndex = 26;
+ this.gv_purchaseorderno.VisibleIndex = 25;
this.gv_purchaseorderno.Width = 94;
//
// gv_purchaseorderentryseq
@@ -767,7 +754,7 @@
this.gv_purchaseorderentryseq.OptionsColumn.AllowEdit = false;
this.gv_purchaseorderentryseq.Tag = "query_a.PURCHASEORDERENTRYSEQ";
this.gv_purchaseorderentryseq.Visible = true;
- this.gv_purchaseorderentryseq.VisibleIndex = 27;
+ this.gv_purchaseorderentryseq.VisibleIndex = 26;
this.gv_purchaseorderentryseq.Width = 70;
//
// gv_auditor
@@ -818,7 +805,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 28;
+ this.gridColumn7.VisibleIndex = 27;
this.gridColumn7.Width = 94;
//
// gridColumn14
@@ -828,8 +815,16 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 29;
+ this.gridColumn14.VisibleIndex = 28;
this.gridColumn14.Width = 94;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "涓婚敭Guid";
+ this.gridColumn15.FieldName = "guid";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Width = 94;
//
// pageBar1
//
@@ -1227,6 +1222,14 @@
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.Name = "txt_wrkQty";
+ this.txt_wrkQty.Size = new System.Drawing.Size(170, 24);
+ this.txt_wrkQty.StyleController = this.layoutMx1;
+ this.txt_wrkQty.TabIndex = 667;
+ //
// layoutControlItem34
//
this.layoutControlItem34.Control = this.lbGuid;
@@ -1238,6 +1241,27 @@
this.layoutControlItem34.Text = "lbGuid";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.txt_stockowner;
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 217);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem29.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem29.Text = "鍏ュ簱璐т富ID";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txt_itemId;
+ this.layoutControlItem32.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem32.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem32.Text = "浜у搧ID";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
// Root
//
@@ -1278,47 +1302,47 @@
this.layoutControlItem35});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition46.Height = 100D;
- rowDefinition46.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition47.Height = 100D;
- rowDefinition47.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition48.Height = 100D;
- rowDefinition48.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition49.Height = 100D;
- rowDefinition49.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition50.Height = 100D;
- rowDefinition50.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition51.Height = 100D;
- rowDefinition51.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition52.Height = 100D;
- rowDefinition52.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition53.Height = 100D;
- rowDefinition53.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition54.Height = 100D;
- rowDefinition54.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;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition46,
- rowDefinition47,
- rowDefinition48,
- rowDefinition49,
- rowDefinition50,
- rowDefinition51,
- rowDefinition52,
- rowDefinition53,
- rowDefinition54});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
this.Root.Size = new System.Drawing.Size(1126, 303);
this.Root.TextVisible = false;
//
@@ -1509,26 +1533,158 @@
this.layoutControlItem28.Text = "澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem29
+ // layoutControlItem33
//
- this.layoutControlItem29.Control = this.txt_stockowner;
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 217);
- this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem29.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem29.Text = "鍏ュ簱璐т富ID";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem33.Control = this.txt_stockownerName;
+ this.layoutControlItem33.Location = new System.Drawing.Point(0, 217);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem33.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem33.Text = "鍏ュ簱璐т富";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem32
+ // layoutControlItem15
//
- this.layoutControlItem32.Control = this.txt_itemId;
- this.layoutControlItem32.Location = new System.Drawing.Point(828, 31);
- this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem32.Text = "浜у搧ID";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem15.Control = this.txt_estimatedStartTime;
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 31);
+ 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.Text = "棰勮寮�宸ユ椂闂�";
+ 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.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem19.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem19.Text = "棰勮瀹屽伐鏃堕棿";
+ 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.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.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.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.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.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.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.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.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.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.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.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ 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.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem22.Size = new System.Drawing.Size(276, 31);
+ 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.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem18.Size = new System.Drawing.Size(276, 31);
+ 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.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
+ 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.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 31);
+ 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.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem35.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem35.Text = "鏈叆搴撴暟";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1903,7 +2059,7 @@
this.gvMx1ownerType.Name = "gvMx1ownerType";
this.gvMx1ownerType.Tag = "query_a.OWNER_TYPE";
this.gvMx1ownerType.Visible = true;
- this.gvMx1ownerType.VisibleIndex = 25;
+ this.gvMx1ownerType.VisibleIndex = 24;
this.gvMx1ownerType.Width = 94;
//
// gvMx1owner
@@ -1925,7 +2081,7 @@
this.gvMx1fsrctransorgid.Name = "gvMx1fsrctransorgid";
this.gvMx1fsrctransorgid.Tag = "query_a.FSRCTRANSORGID";
this.gvMx1fsrctransorgid.Visible = true;
- this.gvMx1fsrctransorgid.VisibleIndex = 26;
+ this.gvMx1fsrctransorgid.VisibleIndex = 25;
this.gvMx1fsrctransorgid.Width = 94;
//
// gvMx1fsrctransstockid
@@ -1937,7 +2093,7 @@
this.gvMx1fsrctransstockid.Name = "gvMx1fsrctransstockid";
this.gvMx1fsrctransstockid.Tag = "query_a.FSRCTRANSSTOCKID";
this.gvMx1fsrctransstockid.Visible = true;
- this.gvMx1fsrctransstockid.VisibleIndex = 27;
+ this.gvMx1fsrctransstockid.VisibleIndex = 26;
this.gvMx1fsrctransstockid.Width = 94;
//
// gvMx1fstockstatusid
@@ -1949,7 +2105,7 @@
this.gvMx1fstockstatusid.Name = "gvMx1fstockstatusid";
this.gvMx1fstockstatusid.Tag = "query_a.FSTOCKSTATUSID";
this.gvMx1fstockstatusid.Visible = true;
- this.gvMx1fstockstatusid.VisibleIndex = 31;
+ this.gvMx1fstockstatusid.VisibleIndex = 28;
this.gvMx1fstockstatusid.Width = 94;
//
// gvMx1fneeddate
@@ -1961,7 +2117,7 @@
this.gvMx1fneeddate.Name = "gvMx1fneeddate";
this.gvMx1fneeddate.Tag = "query_a.FNEEDDATE";
this.gvMx1fneeddate.Visible = true;
- this.gvMx1fneeddate.VisibleIndex = 32;
+ this.gvMx1fneeddate.VisibleIndex = 29;
this.gvMx1fneeddate.Width = 94;
//
// gvMx1fmemo
@@ -1973,7 +2129,7 @@
this.gvMx1fmemo.Name = "gvMx1fmemo";
this.gvMx1fmemo.Tag = "query_a.FMEMO";
this.gvMx1fmemo.Visible = true;
- this.gvMx1fmemo.VisibleIndex = 33;
+ this.gvMx1fmemo.VisibleIndex = 30;
this.gvMx1fmemo.Width = 94;
//
// gvMx1typeb
@@ -1985,7 +2141,7 @@
this.gvMx1typeb.Name = "gvMx1typeb";
this.gvMx1typeb.Tag = "query_a.TYPEB";
this.gvMx1typeb.Visible = true;
- this.gvMx1typeb.VisibleIndex = 28;
+ this.gvMx1typeb.VisibleIndex = 27;
this.gvMx1typeb.Width = 50;
//
// gridColumn8
@@ -1995,7 +2151,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 34;
+ this.gridColumn8.VisibleIndex = 31;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -2005,7 +2161,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 35;
+ this.gridColumn9.VisibleIndex = 32;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -2015,7 +2171,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 36;
+ this.gridColumn10.VisibleIndex = 33;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -2025,7 +2181,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 37;
+ this.gridColumn11.VisibleIndex = 34;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -2035,7 +2191,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 38;
+ this.gridColumn12.VisibleIndex = 35;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -2045,7 +2201,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 39;
+ this.gridColumn13.VisibleIndex = 36;
this.gridColumn13.Width = 94;
//
// picCheckBox
@@ -2058,167 +2214,6 @@
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_stockownerName;
- this.layoutControlItem33.Location = new System.Drawing.Point(0, 217);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem33.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem33.Text = "鍏ュ簱璐т富";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_estimatedStartTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 31);
- 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.Text = "棰勮寮�宸ユ椂闂�";
- 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.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(278, 31);
- this.layoutControlItem19.Text = "棰勮瀹屽伐鏃堕棿";
- 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.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.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.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.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.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.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.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.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.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.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.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
- 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.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem22.Size = new System.Drawing.Size(276, 31);
- 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.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 31);
- 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.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
- 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.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
- // txt_wrkQty
- //
- this.txt_wrkQty.Location = new System.Drawing.Point(666, 74);
- this.txt_wrkQty.Name = "txt_wrkQty";
- this.txt_wrkQty.Size = new System.Drawing.Size(170, 24);
- this.txt_wrkQty.StyleController = this.layoutMx1;
- this.txt_wrkQty.TabIndex = 667;
- //
- // layoutControlItem35
- //
- this.layoutControlItem35.Control = this.txt_wrkQty;
- this.layoutControlItem35.Location = new System.Drawing.Point(552, 62);
- 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.Text = "鏈叆搴撴暟";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
//
// Frm_ProductionOrder
//
@@ -2282,7 +2277,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bomVersion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_storageLowerLimit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_planReleaseDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -2302,14 +2300,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
@@ -2323,8 +2313,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_wrkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -2336,7 +2331,6 @@
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_auditStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_orderNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -2488,5 +2482,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
}
}
\ 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 58ba3c8..39537e7 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -1,3 +1,4 @@
+using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -20,6 +21,8 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
+ this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "auditStatusChk", "", (value) =>
@@ -99,7 +102,43 @@
getPageList(this.pageBar1.CurrentPage);
}
}
+ /// <summary>
+ /// 缁撴
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnJieAnClick1(object sender, EventArgs e)
+ {
+ var frm = new ShowJieAn();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ string strType = ee.StringSingle.Replace("(鎵ц鑷崇粨妗�)", "").Replace("(寮哄埗缁撴)", "");
+ if (strType == "toclose")
+ {
+ _toolCk(1);
+ }
+ else
+ {
+ if (strType == "closure")
+ {
+ _toolCk(2);
+ }
+ }
+ };
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鍙嶇粨妗�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFjieAnClick(object sender, EventArgs e)
+ {
+ _toolCk(3);
+ }
/// <summary>
///
/// </summary>
@@ -195,5 +234,70 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case 1:
+ strMsg = "鎵ц鑷崇粨妗�";
+ break;
+ case 2:
+ strMsg = "寮哄埗缁撴";
+ break;
+ case 3:
+ strMsg = "鍙嶇粨妗堬紙鍙嶆墽琛岃嚦瀹屽伐锛�";
+ break;
+ };
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_orderNo, gridView1, "orderNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ {
+ //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+ getPageList(this.pageBar1.CurrentPage);
+ int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3