From 57838c8b507ee91c982f49b89feee3c0654435d8 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 18 四月 2025 14:43:57 +0800
Subject: [PATCH] 委外数量
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 1
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs | 646 ++++++++++++++++++++++++++---------------------------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 17
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs | 15 +
DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs | 27 +
5 files changed, 362 insertions(+), 344 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
index 85086bd..f755eac 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.Designer.cs
@@ -30,19 +30,19 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -104,7 +104,7 @@
this.txt_auditor = new DevExpress.XtraEditors.TextEdit();
this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
this.txt_trackingNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_stockinqty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yrkQty = new DevExpress.XtraEditors.TextEdit();
this.txt_batchNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_purchaseorderno = new DevExpress.XtraEditors.TextEdit();
@@ -132,30 +132,17 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = 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.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -184,10 +171,8 @@
this.gvMx1variableLossRate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1salesOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1issuingOrg2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1owner = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1supplyingOrg2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fsrctransorgid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fsrctransstockid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1fstockstatusid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -202,6 +187,21 @@
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();
@@ -237,7 +237,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_auditor.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_trackingNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_stockinqty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yrkQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_batchNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_purchaseorderno.Properties)).BeginInit();
@@ -265,18 +265,24 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((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();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
@@ -284,17 +290,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).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.layoutControlItem22)).BeginInit();
+ ((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();
this.SuspendLayout();
//
// toolBarMenu1
@@ -525,7 +527,7 @@
//
this.gv_nostockinqty.AppearanceCell.Options.UseFont = true;
this.gv_nostockinqty.Caption = "鏈叆搴撴暟閲� ";
- this.gv_nostockinqty.FieldName = "nostockinqty";
+ this.gv_nostockinqty.FieldName = "wrkQty";
this.gv_nostockinqty.MinWidth = 25;
this.gv_nostockinqty.Name = "gv_nostockinqty";
this.gv_nostockinqty.OptionsColumn.AllowEdit = false;
@@ -538,7 +540,7 @@
//
this.gv_stockinqty.AppearanceCell.Options.UseFont = true;
this.gv_stockinqty.Caption = "鍏ュ簱鏁伴噺 ";
- this.gv_stockinqty.FieldName = "stockinqty";
+ this.gv_stockinqty.FieldName = "yrkQty";
this.gv_stockinqty.MinWidth = 25;
this.gv_stockinqty.Name = "gv_stockinqty";
this.gv_stockinqty.OptionsColumn.AllowEdit = false;
@@ -777,8 +779,6 @@
this.gv_auditor.Name = "gv_auditor";
this.gv_auditor.OptionsColumn.AllowEdit = false;
this.gv_auditor.Tag = "query_a.AUDITOR";
- this.gv_auditor.Visible = true;
- this.gv_auditor.VisibleIndex = 28;
this.gv_auditor.Width = 94;
//
// gv_auditDate
@@ -790,8 +790,6 @@
this.gv_auditDate.Name = "gv_auditDate";
this.gv_auditDate.OptionsColumn.AllowEdit = false;
this.gv_auditDate.Tag = "query_a.AUDIT_DATE";
- this.gv_auditDate.Visible = true;
- this.gv_auditDate.VisibleIndex = 29;
this.gv_auditDate.Width = 94;
//
// gv_stockowner
@@ -820,7 +818,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 30;
+ this.gridColumn7.VisibleIndex = 28;
this.gridColumn7.Width = 94;
//
// gridColumn14
@@ -830,7 +828,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 31;
+ this.gridColumn14.VisibleIndex = 29;
this.gridColumn14.Width = 94;
//
// pageBar1
@@ -892,7 +890,7 @@
this.layoutMx1.Controls.Add(this.txt_auditor);
this.layoutMx1.Controls.Add(this.txt_remarks);
this.layoutMx1.Controls.Add(this.txt_trackingNo);
- this.layoutMx1.Controls.Add(this.txt_stockinqty);
+ this.layoutMx1.Controls.Add(this.txt_yrkQty);
this.layoutMx1.Controls.Add(this.txt_batchNo);
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_purchaseorderno);
@@ -909,9 +907,12 @@
this.layoutMx1.Controls.Add(this.txt_bomVersion);
this.layoutMx1.Controls.Add(this.txt_storageLowerLimit);
this.layoutMx1.Controls.Add(this.txt_planReleaseDate);
+ this.layoutMx1.Controls.Add(this.txt_wrkQty);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem34});
+ this.layoutControlItem34,
+ this.layoutControlItem29,
+ this.layoutControlItem32});
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);
@@ -940,7 +941,7 @@
//
// txt_stockownerName
//
- this.txt_stockownerName.Location = new System.Drawing.Point(390, 229);
+ this.txt_stockownerName.Location = new System.Drawing.Point(114, 229);
this.txt_stockownerName.Name = "txt_stockownerName";
this.txt_stockownerName.Properties.Appearance.Options.UseFont = true;
this.txt_stockownerName.Size = new System.Drawing.Size(170, 24);
@@ -958,7 +959,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(666, 74);
+ this.txt_itemModel.Location = new System.Drawing.Point(666, 105);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
this.txt_itemModel.Size = new System.Drawing.Size(170, 24);
@@ -976,7 +977,7 @@
//
// txt_auditDate
//
- this.txt_auditDate.Location = new System.Drawing.Point(942, 198);
+ this.txt_auditDate.Location = new System.Drawing.Point(942, 167);
this.txt_auditDate.Name = "txt_auditDate";
this.txt_auditDate.Properties.Appearance.Options.UseFont = true;
this.txt_auditDate.Size = new System.Drawing.Size(172, 24);
@@ -985,7 +986,7 @@
//
// txt_planConfirmation
//
- this.txt_planConfirmation.Location = new System.Drawing.Point(942, 167);
+ this.txt_planConfirmation.Location = new System.Drawing.Point(942, 136);
this.txt_planConfirmation.Name = "txt_planConfirmation";
this.txt_planConfirmation.Properties.Appearance.Options.UseFont = true;
this.txt_planConfirmation.Size = new System.Drawing.Size(172, 24);
@@ -1003,7 +1004,7 @@
//
// txt_auditStatus
//
- this.txt_auditStatus.Location = new System.Drawing.Point(942, 260);
+ this.txt_auditStatus.Location = new System.Drawing.Point(942, 229);
this.txt_auditStatus.Name = "txt_auditStatus";
this.txt_auditStatus.Properties.Appearance.Options.UseFont = true;
this.txt_auditStatus.Size = new System.Drawing.Size(172, 24);
@@ -1048,7 +1049,7 @@
//
// txt_auditor
//
- this.txt_auditor.Location = new System.Drawing.Point(942, 229);
+ this.txt_auditor.Location = new System.Drawing.Point(942, 198);
this.txt_auditor.Name = "txt_auditor";
this.txt_auditor.Properties.Appearance.Options.UseFont = true;
this.txt_auditor.Size = new System.Drawing.Size(172, 24);
@@ -1073,18 +1074,18 @@
this.txt_trackingNo.StyleController = this.layoutMx1;
this.txt_trackingNo.TabIndex = 267;
//
- // txt_stockinqty
+ // txt_yrkQty
//
- this.txt_stockinqty.Location = new System.Drawing.Point(666, 43);
- this.txt_stockinqty.Name = "txt_stockinqty";
- this.txt_stockinqty.Properties.Appearance.Options.UseFont = true;
- this.txt_stockinqty.Size = new System.Drawing.Size(170, 24);
- this.txt_stockinqty.StyleController = this.layoutMx1;
- this.txt_stockinqty.TabIndex = 471;
+ this.txt_yrkQty.Location = new System.Drawing.Point(666, 43);
+ 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.StyleController = this.layoutMx1;
+ this.txt_yrkQty.TabIndex = 471;
//
// txt_batchNo
//
- this.txt_batchNo.Location = new System.Drawing.Point(666, 198);
+ this.txt_batchNo.Location = new System.Drawing.Point(666, 229);
this.txt_batchNo.Name = "txt_batchNo";
this.txt_batchNo.Properties.Appearance.Options.UseFont = true;
this.txt_batchNo.Size = new System.Drawing.Size(170, 24);
@@ -1129,7 +1130,7 @@
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(666, 105);
+ this.txt_dwName.Location = new System.Drawing.Point(666, 136);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Size = new System.Drawing.Size(170, 24);
@@ -1147,7 +1148,7 @@
//
// txt_estimatedStartTime
//
- this.txt_estimatedStartTime.Location = new System.Drawing.Point(942, 74);
+ this.txt_estimatedStartTime.Location = new System.Drawing.Point(942, 43);
this.txt_estimatedStartTime.Name = "txt_estimatedStartTime";
this.txt_estimatedStartTime.Properties.Appearance.Options.UseFont = true;
this.txt_estimatedStartTime.Size = new System.Drawing.Size(172, 24);
@@ -1183,7 +1184,7 @@
//
// txt_storageUpperLimit
//
- this.txt_storageUpperLimit.Location = new System.Drawing.Point(666, 136);
+ this.txt_storageUpperLimit.Location = new System.Drawing.Point(666, 167);
this.txt_storageUpperLimit.Name = "txt_storageUpperLimit";
this.txt_storageUpperLimit.Properties.Appearance.Options.UseFont = true;
this.txt_storageUpperLimit.Size = new System.Drawing.Size(170, 24);
@@ -1192,7 +1193,7 @@
//
// txt_estimatedEndTime
//
- this.txt_estimatedEndTime.Location = new System.Drawing.Point(942, 105);
+ this.txt_estimatedEndTime.Location = new System.Drawing.Point(942, 74);
this.txt_estimatedEndTime.Name = "txt_estimatedEndTime";
this.txt_estimatedEndTime.Properties.Appearance.Options.UseFont = true;
this.txt_estimatedEndTime.Size = new System.Drawing.Size(172, 24);
@@ -1210,7 +1211,7 @@
//
// txt_storageLowerLimit
//
- this.txt_storageLowerLimit.Location = new System.Drawing.Point(666, 167);
+ this.txt_storageLowerLimit.Location = new System.Drawing.Point(666, 198);
this.txt_storageLowerLimit.Name = "txt_storageLowerLimit";
this.txt_storageLowerLimit.Properties.Appearance.Options.UseFont = true;
this.txt_storageLowerLimit.Size = new System.Drawing.Size(170, 24);
@@ -1219,7 +1220,7 @@
//
// txt_planReleaseDate
//
- this.txt_planReleaseDate.Location = new System.Drawing.Point(942, 136);
+ this.txt_planReleaseDate.Location = new System.Drawing.Point(942, 105);
this.txt_planReleaseDate.Name = "txt_planReleaseDate";
this.txt_planReleaseDate.Properties.Appearance.Options.UseFont = true;
this.txt_planReleaseDate.Size = new System.Drawing.Size(172, 24);
@@ -1252,18 +1253,16 @@
this.layoutControlItem7,
this.layoutControlItem9,
this.layoutControlItem10,
- this.layoutControlItem11,
this.layoutControlItem12,
this.layoutControlItem13,
- this.layoutControlItem14,
this.layoutControlItem16,
this.layoutControlItem17,
- this.layoutControlItem18,
this.layoutControlItem20,
this.layoutControlItem21,
- this.layoutControlItem22,
this.layoutControlItem24,
this.layoutControlItem25,
+ this.layoutControlItem28,
+ this.layoutControlItem33,
this.layoutControlItem15,
this.layoutControlItem19,
this.layoutControlItem23,
@@ -1271,54 +1270,55 @@
this.layoutControlItem31,
this.layoutControlItem26,
this.layoutControlItem30,
- this.layoutControlItem28,
- this.layoutControlItem29,
- this.layoutControlItem33,
- this.layoutControlItem32,
- this.layoutControlItem8});
+ this.layoutControlItem8,
+ this.layoutControlItem22,
+ this.layoutControlItem18,
+ this.layoutControlItem14,
+ this.layoutControlItem11,
+ this.layoutControlItem35});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
+ rowDefinition46,
+ rowDefinition47,
+ rowDefinition48,
+ rowDefinition49,
+ rowDefinition50,
+ rowDefinition51,
+ rowDefinition52,
+ rowDefinition53,
+ rowDefinition54});
this.Root.Size = new System.Drawing.Size(1126, 303);
this.Root.TextVisible = false;
//
@@ -1384,7 +1384,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_stockinqty;
+ this.layoutControlItem7.Control = this.txt_yrkQty;
this.layoutControlItem7.Location = new System.Drawing.Point(552, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1414,17 +1414,6 @@
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 62);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_purchaseorderno;
@@ -1445,17 +1434,6 @@
this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem13.Text = "闇�姹傚崟鎹彿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_dwName;
- this.layoutControlItem14.Location = new System.Drawing.Point(552, 93);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem14.Text = "鍗曚綅";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
@@ -1478,17 +1456,6 @@
this.layoutControlItem17.Text = "闇�姹傚崟鎹鍙�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_storageUpperLimit;
- this.layoutControlItem18.Location = new System.Drawing.Point(552, 124);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem18.Text = "鍏ュ簱涓婇檺";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_bomVersion;
@@ -1507,19 +1474,8 @@
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem21.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem21.Text = "缁撴浜�";
+ this.layoutControlItem21.Text = "缁撴浜哄憳";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txt_storageLowerLimit;
- this.layoutControlItem22.Location = new System.Drawing.Point(552, 155);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem22.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem22.Text = "鍏ュ簱涓嬮檺";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
@@ -1542,83 +1498,6 @@
this.layoutControlItem25.Text = "缁撴绫诲瀷";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_estimatedStartTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 62);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- 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, 93);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- 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, 124);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
- 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, 155);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
- 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, 186);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 6;
- 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, 217);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
- 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, 248);
- this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem30.Size = new System.Drawing.Size(278, 35);
- this.layoutControlItem30.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_remarks;
@@ -1640,17 +1519,6 @@
this.layoutControlItem29.Text = "鍏ュ簱璐т富ID";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txt_stockownerName;
- this.layoutControlItem33.Location = new System.Drawing.Point(276, 217);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 1;
- 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
//
this.layoutControlItem32.Control = this.txt_itemId;
@@ -1661,17 +1529,6 @@
this.layoutControlItem32.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem32.Text = "浜у搧ID";
this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_batchNo;
- this.layoutControlItem8.Location = new System.Drawing.Point(552, 186);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem8.Text = "鎵瑰彿";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1732,10 +1589,8 @@
this.gvMx1variableLossRate,
this.gvMx1salesOrderNo,
this.gvMx1itemNo,
- this.gvMx1issuingOrg2,
this.gvMx1ownerType,
this.gvMx1owner,
- this.gvMx1supplyingOrg2,
this.gvMx1fsrctransorgid,
this.gvMx1fsrctransstockid,
this.gvMx1fstockstatusid,
@@ -1770,7 +1625,7 @@
//
this.gvMx1workOrderNo.AppearanceCell.Options.UseFont = true;
this.gvMx1workOrderNo.Caption = "鎶曟枡鍗曞彿";
- this.gvMx1workOrderNo.FieldName = "workOrderNo";
+ this.gvMx1workOrderNo.FieldName = "tldNo";
this.gvMx1workOrderNo.MinWidth = 50;
this.gvMx1workOrderNo.Name = "gvMx1workOrderNo";
this.gvMx1workOrderNo.Tag = "query_a.WORK_ORDER_NO";
@@ -2039,18 +1894,6 @@
this.gvMx1itemNo.VisibleIndex = 23;
this.gvMx1itemNo.Width = 94;
//
- // gvMx1issuingOrg2
- //
- this.gvMx1issuingOrg2.AppearanceCell.Options.UseFont = true;
- this.gvMx1issuingOrg2.Caption = "鍙戞枡缁勭粐 ";
- this.gvMx1issuingOrg2.FieldName = "issuingOrg2";
- this.gvMx1issuingOrg2.MinWidth = 50;
- this.gvMx1issuingOrg2.Name = "gvMx1issuingOrg2";
- this.gvMx1issuingOrg2.Tag = "query_a.ISSUING_ORG_2";
- this.gvMx1issuingOrg2.Visible = true;
- this.gvMx1issuingOrg2.VisibleIndex = 24;
- this.gvMx1issuingOrg2.Width = 94;
- //
// gvMx1ownerType
//
this.gvMx1ownerType.AppearanceCell.Options.UseFont = true;
@@ -2071,44 +1914,30 @@
this.gvMx1owner.MinWidth = 50;
this.gvMx1owner.Name = "gvMx1owner";
this.gvMx1owner.Tag = "query_a.OWNER";
- this.gvMx1owner.Visible = true;
- this.gvMx1owner.VisibleIndex = 26;
this.gvMx1owner.Width = 94;
- //
- // gvMx1supplyingOrg2
- //
- this.gvMx1supplyingOrg2.AppearanceCell.Options.UseFont = true;
- this.gvMx1supplyingOrg2.Caption = "渚涘簲缁勭粐 ";
- this.gvMx1supplyingOrg2.FieldName = "supplyingOrg2";
- this.gvMx1supplyingOrg2.MinWidth = 50;
- this.gvMx1supplyingOrg2.Name = "gvMx1supplyingOrg2";
- this.gvMx1supplyingOrg2.Tag = "query_a.SUPPLYING_ORG_2";
- this.gvMx1supplyingOrg2.Visible = true;
- this.gvMx1supplyingOrg2.VisibleIndex = 27;
- this.gvMx1supplyingOrg2.Width = 94;
//
// gvMx1fsrctransorgid
//
this.gvMx1fsrctransorgid.AppearanceCell.Options.UseFont = true;
this.gvMx1fsrctransorgid.Caption = "鎷ㄥ嚭缁勭粐 ";
- this.gvMx1fsrctransorgid.FieldName = "fsrctransorgid";
+ this.gvMx1fsrctransorgid.FieldName = "bcOrgName";
this.gvMx1fsrctransorgid.MinWidth = 50;
this.gvMx1fsrctransorgid.Name = "gvMx1fsrctransorgid";
this.gvMx1fsrctransorgid.Tag = "query_a.FSRCTRANSORGID";
this.gvMx1fsrctransorgid.Visible = true;
- this.gvMx1fsrctransorgid.VisibleIndex = 29;
+ this.gvMx1fsrctransorgid.VisibleIndex = 26;
this.gvMx1fsrctransorgid.Width = 94;
//
// gvMx1fsrctransstockid
//
this.gvMx1fsrctransstockid.AppearanceCell.Options.UseFont = true;
this.gvMx1fsrctransstockid.Caption = "鎷ㄥ嚭浠撳簱 ";
- this.gvMx1fsrctransstockid.FieldName = "fsrctransstockid";
+ this.gvMx1fsrctransstockid.FieldName = "ckName";
this.gvMx1fsrctransstockid.MinWidth = 50;
this.gvMx1fsrctransstockid.Name = "gvMx1fsrctransstockid";
this.gvMx1fsrctransstockid.Tag = "query_a.FSRCTRANSSTOCKID";
this.gvMx1fsrctransstockid.Visible = true;
- this.gvMx1fsrctransstockid.VisibleIndex = 30;
+ this.gvMx1fsrctransstockid.VisibleIndex = 27;
this.gvMx1fsrctransstockid.Width = 94;
//
// gvMx1fstockstatusid
@@ -2230,6 +2059,167 @@
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
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2275,7 +2265,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_auditor.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_trackingNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_stockinqty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yrkQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_batchNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_purchaseorderno.Properties)).EndInit();
@@ -2303,18 +2293,24 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((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();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
@@ -2322,17 +2318,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).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.layoutControlItem22)).EndInit();
+ ((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();
this.ResumeLayout(false);
}
@@ -2392,7 +2384,7 @@
private DevExpress.XtraEditors.TextEdit txt_auditor;
private DevExpress.XtraEditors.TextEdit txt_auditStatus;
private DevExpress.XtraEditors.TextEdit txt_stockowner;
- private DevExpress.XtraEditors.TextEdit txt_stockinqty;
+ private DevExpress.XtraEditors.TextEdit txt_yrkQty;
private DevExpress.XtraEditors.TextEdit txt_purchaseorderentryseq;
private DevExpress.XtraEditors.TextEdit txt_purchaseorderno;
private DevExpress.XtraEditors.TextEdit txt_remarks;
@@ -2425,16 +2417,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
@@ -2466,10 +2454,8 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1variableLossRate;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderNo;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1issuingOrg2;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1ownerType;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1owner;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1supplyingOrg2;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fsrctransorgid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fsrctransstockid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstockstatusid;
@@ -2483,6 +2469,12 @@
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;
+ private DevExpress.XtraEditors.TextEdit txt_wrkQty;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
@@ -2490,11 +2482,11 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
}
}
\ 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 042867d..f8cd6ee 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -180,6 +180,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index af98902..98bb53d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -247,6 +247,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -259,7 +260,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -614,7 +616,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -625,6 +627,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 173;
this.splitMx1.TabIndex = 0;
@@ -1193,7 +1196,7 @@
// gvMx1id
//
this.gvMx1id.AppearanceCell.Options.UseFont = true;
- this.gvMx1id.Caption = "涓婚敭 ";
+ this.gvMx1id.Caption = "鏄庣粏涓婚敭";
this.gvMx1id.FieldName = "id";
this.gvMx1id.MinWidth = 50;
this.gvMx1id.Name = "gvMx1id";
@@ -1203,7 +1206,7 @@
// gvMx1pid
//
this.gvMx1pid.AppearanceCell.Options.UseFont = true;
- this.gvMx1pid.Caption = "宸ュ崟涓婚敭 ";
+ this.gvMx1pid.Caption = "涓昏〃涓婚敭";
this.gvMx1pid.FieldName = "pid";
this.gvMx1pid.MinWidth = 50;
this.gvMx1pid.Name = "gvMx1pid";
@@ -1213,7 +1216,7 @@
// gvMx1erpid
//
this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
- this.gvMx1erpid.Caption = "erpid ";
+ this.gvMx1erpid.Caption = "erpId";
this.gvMx1erpid.FieldName = "erpid";
this.gvMx1erpid.MinWidth = 50;
this.gvMx1erpid.Name = "gvMx1erpid";
@@ -1223,7 +1226,7 @@
// gvMx1eid
//
this.gvMx1eid.AppearanceCell.Options.UseFont = true;
- this.gvMx1eid.Caption = "eid ";
+ this.gvMx1eid.Caption = "eId";
this.gvMx1eid.FieldName = "eid";
this.gvMx1eid.MinWidth = 50;
this.gvMx1eid.Name = "gvMx1eid";
@@ -1383,7 +1386,7 @@
// gvMx1dab017
//
this.gvMx1dab017.AppearanceCell.Options.UseFont = true;
- this.gvMx1dab017.Caption = "浠撳簱id ";
+ this.gvMx1dab017.Caption = "浠撳簱Id";
this.gvMx1dab017.FieldName = "dab017";
this.gvMx1dab017.MinWidth = 50;
this.gvMx1dab017.Name = "gvMx1dab017";
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs
index f78db52..98eff35 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.Designer.cs
@@ -30,6 +30,7 @@
{
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -72,6 +73,7 @@
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
this.gv_guid,
this.gridColumn2,
this.gv_ebelnK3id,
@@ -92,10 +94,18 @@
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsSelection.MultiSelect = true;
- this.gridView1.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
//
// gv_guid
//
@@ -354,5 +364,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraEditors.PanelControl panelControl1;
private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
index 257c0ac..3a04761 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/SelectWwPc.cs
@@ -15,21 +15,32 @@
public SelectWwPc(string _lineId)
{
InitializeComponent();
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
getPageList(1);
btnIn.Click += (s, e) =>
{
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
var list = new List<string>();
- int[] rows = this.gridView1.GetSelectedRows();//鍏堣幏鍙栭�夋嫨琛岀殑琛屽彿
- DataTable dt = this.gcMain.DataSource as DataTable;//寰楀埌GridControl鐨勬暟鎹簮
- foreach (int idx in rows)
+ DataTable dt = this.gcMain.DataSource as DataTable;
{
- string _guid = dt.Rows[idx]["guid"].ToString();
- list.Add(_guid);
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["guid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ list.Add(_guid);
+ }
+ }
}
- UpdateParent?.Invoke(this,
- new UpdateParentEventArgs { StringList = list });
- Close();
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
};
}
--
Gitblit v1.9.3