From 5aab9b3b2af46e747c24709e88294cf5300d430a Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 06 八月 2025 11:41:26 +0800
Subject: [PATCH] 1、检验项目保存后根据检验标准计算样本数 2、检验项目复制新增物料类型选项 3、增加仓管员字段 4、采购到货新增（本次收量、需求单据号、源单单号、ERP剩余未收数量）
---
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs | 225 ++++++++++++++--------
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 33 +++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 131 ++++++++----
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 109 +++++++---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 48 ++--
5 files changed, 355 insertions(+), 191 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 4de8d0c..a3330a8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -342,12 +342,43 @@
decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand);
decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow);
decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow);
- if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { _ycsl = 5; }
+
+ /* if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { _ycsl = 5; }
+ else
+ {
+ MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
+ return;
+ }
+ */
+
+ //浼樺寲鍚庣殑浠ｇ爜锛屼富瑕佹槸鍦ㄧ粰_ycsl璧嬪�肩殑閮ㄥ垎澧炲姞浜嗗SampleSizeNo鐨勫垽鏂�
+ if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f)
+ {
+ string sampleSizeNo = row["SampleSizeNo"].ToString().ToUpper();
+ if (sampleSizeNo.StartsWith("GB"))
+ {
+ _ycsl = 5;
+ }
+ else if (sampleSizeNo.StartsWith("PC"))
+ {
+ string[] parts = sampleSizeNo.Split('=');
+ if (parts.Length > 1 && int.TryParse(parts[1], out int value))
+ {
+ _ycsl = value;
+ }
+ else
+ {
+ MsgHelper.ShowError("PCS鏍煎紡涓嶆纭�");
+ return;
+ }
+ }
+ }
else
{
MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
return;
}
+
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
index 76ab316..ead6a51 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.Designer.cs
@@ -28,16 +28,16 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.wizardControl1 = new DevExpress.XtraWizard.WizardControl();
this.welcomeWizardPage1 = new DevExpress.XtraWizard.WelcomeWizardPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -75,6 +75,8 @@
this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_tcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_tname = new DevExpress.XtraGrid.Columns.GridColumn();
this.panBom = new DevExpress.XtraEditors.PanelControl();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.splitRight = new DevExpress.XtraEditors.SplitContainerControl();
@@ -132,9 +134,9 @@
this.wizardControl1.Controls.Add(this.completionWizardPage1);
this.wizardControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.wizardControl1.FinishText = "&淇濆瓨";
- this.wizardControl1.ImageOptions.ImageWidth = 100;
- this.wizardControl1.Margin = new System.Windows.Forms.Padding(4);
- this.wizardControl1.MinimumSize = new System.Drawing.Size(133, 138);
+ this.wizardControl1.ImageOptions.ImageWidth = 87;
+ this.wizardControl1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+ this.wizardControl1.MinimumSize = new System.Drawing.Size(116, 107);
this.wizardControl1.Name = "wizardControl1";
this.wizardControl1.NextText = "&涓嬩竴姝� >";
this.wizardControl1.Pages.AddRange(new DevExpress.XtraWizard.BaseWizardPage[] {
@@ -142,24 +144,26 @@
this.wizardPage1,
this.completionWizardPage1});
this.wizardControl1.PreviousText = "< &涓婁竴姝�";
- this.wizardControl1.Size = new System.Drawing.Size(1038, 718);
+ this.wizardControl1.Size = new System.Drawing.Size(908, 558);
this.wizardControl1.Text = "";
//
// welcomeWizardPage1
//
this.welcomeWizardPage1.Controls.Add(this.gcMx1);
this.welcomeWizardPage1.IntroductionText = "璇ュ悜瀵硷紝灏嗘妸褰撳墠鐗╂枡鐨勬楠岄」鐩紝澶嶅埗涓�涓垨澶氫釜鐗╂枡锛屽鍒惰繃绋嬩腑锛岃嫢閲嶅閫夋嫨浜嗙墿鏂欙紝灏嗚嚜鍔ㄨ繃婊わ紝鍙細澶嶅埗涓�娆★紒";
- this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.welcomeWizardPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.welcomeWizardPage1.Name = "welcomeWizardPage1";
this.welcomeWizardPage1.ProceedText = "鐐瑰嚮 Next 缁х画杩涜";
- this.welcomeWizardPage1.Size = new System.Drawing.Size(898, 553);
+ this.welcomeWizardPage1.Size = new System.Drawing.Size(789, 426);
this.welcomeWizardPage1.Text = "褰撳墠妫�楠岄」鐩俊鎭�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptJYXM,
@@ -169,7 +173,7 @@
this.rptJYSP,
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1});
- this.gcMx1.Size = new System.Drawing.Size(898, 553);
+ this.gcMx1.Size = new System.Drawing.Size(789, 426);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -192,6 +196,7 @@
this.gvMx1fstand,
this.gvMx1fdownAllow,
this.gridColumn19});
+ this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -203,18 +208,20 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid";
this.gvMx1guid.FieldName = "guid";
+ this.gvMx1guid.MinWidth = 17;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
+ this.gvMx1guid.Width = 82;
//
// gvMx1pid
//
this.gvMx1pid.AppearanceCell.Options.UseFont = true;
this.gvMx1pid.Caption = "pid";
this.gvMx1pid.FieldName = "pid";
+ this.gvMx1pid.MinWidth = 17;
this.gvMx1pid.Name = "gvMx1pid";
this.gvMx1pid.Tag = "query_a.pid";
- this.gvMx1pid.Width = 94;
+ this.gvMx1pid.Width = 82;
//
// gvMx1fcheckItem
//
@@ -222,11 +229,12 @@
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
this.gvMx1fcheckItem.FieldName = "fcheckItem";
+ this.gvMx1fcheckItem.MinWidth = 17;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "edit";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 0;
- this.gvMx1fcheckItem.Width = 150;
+ this.gvMx1fcheckItem.Width = 131;
//
// rptJYXM
//
@@ -241,11 +249,12 @@
this.gvMx1forder.Caption = "椤哄簭";
this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
this.gvMx1forder.FieldName = "forder";
+ this.gvMx1forder.MinWidth = 17;
this.gvMx1forder.Name = "gvMx1forder";
this.gvMx1forder.Tag = "yz_quantity_0_edit";
this.gvMx1forder.Visible = true;
this.gvMx1forder.VisibleIndex = 1;
- this.gvMx1forder.Width = 50;
+ this.gvMx1forder.Width = 44;
//
// repositoryItemComboBox1
//
@@ -274,18 +283,20 @@
//
this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
this.gridColumn5.FieldName = "fspecRequ";
+ this.gridColumn5.MinWidth = 17;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "edit";
- this.gridColumn5.Width = 150;
+ this.gridColumn5.Width = 131;
//
// gvMx1memo
//
this.gvMx1memo.AppearanceCell.Options.UseFont = true;
this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1memo.FieldName = "memo";
+ this.gvMx1memo.MinWidth = 17;
this.gvMx1memo.Name = "gvMx1memo";
this.gvMx1memo.Tag = "edit";
- this.gvMx1memo.Width = 150;
+ this.gvMx1memo.Width = 131;
//
// gvMx1fcheckTool
//
@@ -293,11 +304,12 @@
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
this.gvMx1fcheckTool.FieldName = "fcheckTool";
+ this.gvMx1fcheckTool.MinWidth = 17;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "edit";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 2;
- this.gvMx1fcheckTool.Width = 150;
+ this.gvMx1fcheckTool.Width = 131;
//
// rptJYGJ
//
@@ -313,11 +325,12 @@
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
+ this.gvMx1sampleSizeNo.MinWidth = 17;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "edit";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 3;
- this.gvMx1sampleSizeNo.Width = 150;
+ this.gvMx1sampleSizeNo.Width = 131;
//
// rptJYBZ
//
@@ -331,10 +344,11 @@
//
this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
this.sampleSizeName.FieldName = "sampleSizeNo";
+ this.sampleSizeName.MinWidth = 17;
this.sampleSizeName.Name = "sampleSizeName";
this.sampleSizeName.OptionsColumn.ReadOnly = true;
this.sampleSizeName.Tag = "edit";
- this.sampleSizeName.Width = 150;
+ this.sampleSizeName.Width = 131;
//
// gvMx1fcheckLevel
//
@@ -342,11 +356,12 @@
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+ this.gvMx1fcheckLevel.MinWidth = 17;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "edit";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 4;
- this.gvMx1fcheckLevel.Width = 200;
+ this.gvMx1fcheckLevel.Width = 175;
//
// rptJYSP
//
@@ -362,11 +377,12 @@
this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
this.gvMx1facLevel.FieldName = "facLevel";
+ this.gvMx1facLevel.MinWidth = 17;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "edit";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 5;
- this.gvMx1facLevel.Width = 150;
+ this.gvMx1facLevel.Width = 131;
//
// rptJSSP
//
@@ -381,51 +397,55 @@
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
+ this.gvMx1fupAllow.MinWidth = 17;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 6;
- this.gvMx1fupAllow.Width = 60;
+ this.gvMx1fupAllow.Width = 52;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
+ this.gvMx1fstand.MinWidth = 17;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "yz_quantity_0_edit";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 7;
- this.gvMx1fstand.Width = 60;
+ this.gvMx1fstand.Width = 52;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
+ this.gvMx1fdownAllow.MinWidth = 17;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 8;
- this.gvMx1fdownAllow.Width = 60;
+ this.gvMx1fdownAllow.Width = 52;
//
// gridColumn19
//
this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
this.gridColumn19.FieldName = "ypsl";
+ this.gridColumn19.MinWidth = 17;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Tag = "edit";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 9;
- this.gridColumn19.Width = 94;
+ this.gridColumn19.Width = 82;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -433,15 +453,16 @@
//
this.wizardPage1.Controls.Add(this.splitLeft);
this.wizardPage1.DescriptionText = "浣犲彲閫夋嫨涓�涓垨澶氫釜锛岄噸澶嶆垨宸茶缃殑鐗╂枡锛屼繚瀛樻椂灏嗚嚜鍔ㄥ拷鐣�";
- this.wizardPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.wizardPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.wizardPage1.Name = "wizardPage1";
- this.wizardPage1.Size = new System.Drawing.Size(998, 540);
+ this.wizardPage1.Size = new System.Drawing.Size(876, 415);
this.wizardPage1.Text = "閫夋嫨鐗╂枡";
//
// splitLeft
//
this.splitLeft.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitLeft.Location = new System.Drawing.Point(0, 0);
+ this.splitLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitLeft.Name = "splitLeft";
//
// splitLeft.Panel1
@@ -455,17 +476,19 @@
this.splitLeft.Panel2.Controls.Add(this.splitRight);
this.splitLeft.Panel2.Text = "Panel2";
this.splitLeft.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitLeft.Size = new System.Drawing.Size(998, 540);
- this.splitLeft.SplitterPosition = 519;
+ this.splitLeft.Size = new System.Drawing.Size(876, 415);
+ this.splitLeft.SplitterPosition = 454;
this.splitLeft.TabIndex = 1;
//
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gvMain;
+ this.gcMain.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(519, 496);
+ this.gcMain.Size = new System.Drawing.Size(454, 381);
this.gcMain.TabIndex = 7;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMain});
@@ -475,7 +498,7 @@
this.gvMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMain.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gvMain.Appearance.Row.Options.UseFont = true;
- this.gvMain.ColumnPanelRowHeight = 50;
+ this.gvMain.ColumnPanelRowHeight = 39;
this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.colChkInt,
this.gv_guid,
@@ -483,9 +506,12 @@
this.gv2,
this.gv_salesOrderId,
this.gv_orderLineId,
- this.gv_itemId});
+ this.gv_itemId,
+ this.gv_tcode,
+ this.gv_tname});
+ this.gvMain.DetailHeight = 272;
this.gvMain.GridControl = this.gcMain;
- this.gvMain.IndicatorWidth = 50;
+ this.gvMain.IndicatorWidth = 44;
this.gvMain.Name = "gvMain";
this.gvMain.OptionsFind.ShowSearchNavButtons = false;
this.gvMain.OptionsView.ShowAutoFilterRow = true;
@@ -495,86 +521,110 @@
//
this.colChkInt.Caption = ".";
this.colChkInt.FieldName = "chkInt";
- this.colChkInt.MinWidth = 25;
+ this.colChkInt.MinWidth = 22;
this.colChkInt.Name = "colChkInt";
this.colChkInt.Visible = true;
this.colChkInt.VisibleIndex = 0;
- this.colChkInt.Width = 94;
+ this.colChkInt.Width = 82;
//
// gv_guid
//
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 50;
+ this.gv_guid.MinWidth = 44;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "a.guid";
- this.gv_guid.Width = 94;
+ this.gv_guid.Width = 82;
//
// gridColumn1
//
this.gridColumn1.Caption = "浣跨敤缁勭粐";
this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 17;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "org.FNumber";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 50;
+ this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.Width = 44;
//
// gv2
//
this.gv2.AppearanceCell.Options.UseFont = true;
this.gv2.Caption = "鐗╂枡ID";
this.gv2.FieldName = "id";
+ this.gv2.MinWidth = 17;
this.gv2.Name = "gv2";
this.gv2.OptionsColumn.AllowEdit = false;
this.gv2.Tag = "a.id";
this.gv2.Visible = true;
- this.gv2.VisibleIndex = 1;
- this.gv2.Width = 50;
+ this.gv2.VisibleIndex = 6;
+ this.gv2.Width = 44;
//
// gv_salesOrderId
//
this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
this.gv_salesOrderId.Caption = "鐗╂枡缂栫爜";
this.gv_salesOrderId.FieldName = "itemNo";
+ this.gv_salesOrderId.MinWidth = 17;
this.gv_salesOrderId.Name = "gv_salesOrderId";
this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
this.gv_salesOrderId.Tag = "a.item_no";
this.gv_salesOrderId.Visible = true;
- this.gv_salesOrderId.VisibleIndex = 2;
- this.gv_salesOrderId.Width = 50;
+ this.gv_salesOrderId.VisibleIndex = 3;
+ this.gv_salesOrderId.Width = 44;
//
// gv_orderLineId
//
this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
this.gv_orderLineId.Caption = "鐗╂枡鍚嶇О";
this.gv_orderLineId.FieldName = "itemName";
+ this.gv_orderLineId.MinWidth = 17;
this.gv_orderLineId.Name = "gv_orderLineId";
this.gv_orderLineId.OptionsColumn.AllowEdit = false;
this.gv_orderLineId.Tag = "a.item_name";
this.gv_orderLineId.Visible = true;
- this.gv_orderLineId.VisibleIndex = 3;
- this.gv_orderLineId.Width = 50;
+ this.gv_orderLineId.VisibleIndex = 4;
+ this.gv_orderLineId.Width = 44;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡瑙勬牸";
this.gv_itemId.FieldName = "itemModel";
+ this.gv_itemId.MinWidth = 17;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "a.item_model";
- this.gv_itemId.Width = 50;
+ this.gv_itemId.Width = 44;
+ //
+ // gv_tcode
+ //
+ this.gv_tcode.Caption = "鐗╂枡绫诲瀷";
+ this.gv_tcode.FieldName = "tcode";
+ this.gv_tcode.Name = "gv_tcode";
+ this.gv_tcode.Tag = "it.tcode";
+ this.gv_tcode.Visible = true;
+ this.gv_tcode.VisibleIndex = 1;
+ //
+ // gv_tname
+ //
+ this.gv_tname.Caption = "鐗╂枡绫诲瀷鍚嶇О";
+ this.gv_tname.FieldName = "tname";
+ this.gv_tname.Name = "gv_tname";
+ this.gv_tname.Tag = "it.tname";
+ this.gv_tname.Visible = true;
+ this.gv_tname.VisibleIndex = 2;
//
// panBom
//
this.panBom.Controls.Add(this.pageBar1);
this.panBom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panBom.Location = new System.Drawing.Point(0, 496);
+ this.panBom.Location = new System.Drawing.Point(0, 381);
+ this.panBom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panBom.Name = "panBom";
- this.panBom.Size = new System.Drawing.Size(519, 44);
+ this.panBom.Size = new System.Drawing.Size(454, 34);
this.panBom.TabIndex = 6;
//
// pageBar1
@@ -582,10 +632,10 @@
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pageBar1.Location = new System.Drawing.Point(2, 2);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(515, 40);
+ this.pageBar1.Size = new System.Drawing.Size(450, 30);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -593,6 +643,7 @@
//
this.splitRight.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitRight.Location = new System.Drawing.Point(0, 0);
+ this.splitRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.splitRight.Name = "splitRight";
//
// splitRight.Panel1
@@ -604,29 +655,32 @@
//
this.splitRight.Panel2.Controls.Add(this.gcMainCopy);
this.splitRight.Panel2.Text = "Panel2";
- this.splitRight.Size = new System.Drawing.Size(467, 540);
- this.splitRight.SplitterPosition = 45;
+ this.splitRight.Size = new System.Drawing.Size(412, 415);
+ this.splitRight.SplitterPosition = 39;
this.splitRight.TabIndex = 3;
//
// btnIn
//
this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue;
this.btnIn.Appearance.Options.UseForeColor = true;
- this.btnIn.Location = new System.Drawing.Point(4, 199);
+ this.btnIn.Location = new System.Drawing.Point(4, 155);
+ this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(39, 29);
+ this.btnIn.Size = new System.Drawing.Size(34, 23);
this.btnIn.TabIndex = 0;
this.btnIn.Text = ">>";
//
// gcMainCopy
//
this.gcMainCopy.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMainCopy.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMainCopy.Location = new System.Drawing.Point(0, 0);
this.gcMainCopy.MainView = this.gvMainCopy;
+ this.gcMainCopy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMainCopy.Name = "gcMainCopy";
this.gcMainCopy.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.rptBtnDel});
- this.gcMainCopy.Size = new System.Drawing.Size(410, 540);
+ this.gcMainCopy.Size = new System.Drawing.Size(363, 415);
this.gcMainCopy.TabIndex = 2;
this.gcMainCopy.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMainCopy});
@@ -641,6 +695,7 @@
this.gridColumn15,
this.gridColumn6,
this.gridColumn9});
+ this.gvMainCopy.DetailHeight = 272;
this.gvMainCopy.GridControl = this.gcMainCopy;
this.gvMainCopy.Name = "gvMainCopy";
this.gvMainCopy.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -658,7 +713,7 @@
this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 0;
- this.gridColumn11.Width = 150;
+ this.gridColumn11.Width = 131;
//
// gridColumn12
//
@@ -670,7 +725,7 @@
this.gridColumn12.Tag = "query_a.item_id";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 1;
- this.gridColumn12.Width = 150;
+ this.gridColumn12.Width = 131;
//
// gridColumn13
//
@@ -683,7 +738,7 @@
this.gridColumn13.Tag = "query_a.item_no";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 2;
- this.gridColumn13.Width = 150;
+ this.gridColumn13.Width = 131;
//
// gridColumn14
//
@@ -696,7 +751,7 @@
this.gridColumn14.Tag = "query_a.item_name";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 3;
- this.gridColumn14.Width = 150;
+ this.gridColumn14.Width = 131;
//
// gridColumn15
//
@@ -707,25 +762,25 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Tag = "query_a.item_model";
- this.gridColumn15.Width = 150;
+ this.gridColumn15.Width = 131;
//
// gridColumn6
//
this.gridColumn6.Caption = "绉诲嚭";
this.gridColumn6.ColumnEdit = this.rptBtnDel;
- this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.MinWidth = 22;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 4;
- this.gridColumn6.Width = 94;
+ this.gridColumn6.Width = 82;
//
// rptBtnDel
//
this.rptBtnDel.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptBtnDel.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptBtnDel.Name = "rptBtnDel";
this.rptBtnDel.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptBtnDel.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnDel_ButtonClick);
@@ -734,30 +789,30 @@
//
this.gridColumn9.Caption = "gridColumn9";
this.gridColumn9.FieldName = "guid";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 22;
this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 82;
//
// completionWizardPage1
//
this.completionWizardPage1.FinishText = "鏈�鍚庝竴姝ワ紝鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
- this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.completionWizardPage1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.completionWizardPage1.Name = "completionWizardPage1";
this.completionWizardPage1.ProceedText = "鐐瑰嚮鈥滀繚瀛樷�濆畬鎴愭搷浣�";
- this.completionWizardPage1.Size = new System.Drawing.Size(898, 553);
+ this.completionWizardPage1.Size = new System.Drawing.Size(789, 426);
this.completionWizardPage1.Text = "淇濆瓨淇℃伅";
//
- // JyxmShow
+ // JyxmShowCopy
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1038, 718);
+ this.ClientSize = new System.Drawing.Size(908, 558);
this.Controls.Add(this.wizardControl1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- this.Margin = new System.Windows.Forms.Padding(4);
+ this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "JyxmShow";
+ this.Name = "JyxmShowCopy";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "妫�楠岄」鐩鍒�";
((System.ComponentModel.ISupportInitialize)(this.wizardControl1)).EndInit();
@@ -850,5 +905,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_tcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_tname;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 3c85512..28047c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -53,6 +53,7 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -149,9 +150,12 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+ gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -997,7 +1001,10 @@
this.gridColumn18,
this.gridColumn4,
this.gridColumn19,
- this.gridColumn20});
+ this.gridColumn20,
+ gv_remainingReceivedQty,
+ this.gv_sourceDocumentId,
+ this.gv_demandDocumentId});
this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1058,7 +1065,7 @@
this.gvMx1returnFlag.UnboundDataType = typeof(bool);
this.gvMx1returnFlag.Visible = true;
this.gvMx1returnFlag.VisibleIndex = 0;
- this.gvMx1returnFlag.Width = 23;
+ this.gvMx1returnFlag.Width = 22;
//
// gvMx1urgentFlag
//
@@ -1100,7 +1107,7 @@
this.gvMx1checkStates.Tag = "query_a.check_states";
this.gvMx1checkStates.Visible = true;
this.gvMx1checkStates.VisibleIndex = 2;
- this.gvMx1checkStates.Width = 42;
+ this.gvMx1checkStates.Width = 28;
//
// gvMx1checkRes
//
@@ -1113,7 +1120,7 @@
this.gvMx1checkRes.Tag = "query_a.check_res";
this.gvMx1checkRes.Visible = true;
this.gvMx1checkRes.VisibleIndex = 3;
- this.gvMx1checkRes.Width = 42;
+ this.gvMx1checkRes.Width = 28;
//
// gvMx1ebeln
//
@@ -1136,7 +1143,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 32;
+ this.gridColumn8.Width = 22;
//
// gvMx1boardStyle
//
@@ -1149,7 +1156,7 @@
this.gvMx1boardStyle.Tag = "query_a.board_style";
this.gvMx1boardStyle.Visible = true;
this.gvMx1boardStyle.VisibleIndex = 6;
- this.gvMx1boardStyle.Width = 84;
+ this.gvMx1boardStyle.Width = 56;
//
// gvMx1ebelnQty
//
@@ -1162,7 +1169,7 @@
this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
this.gvMx1ebelnQty.Visible = true;
this.gvMx1ebelnQty.VisibleIndex = 7;
- this.gvMx1ebelnQty.Width = 37;
+ this.gvMx1ebelnQty.Width = 24;
//
// gvMx1subQty
//
@@ -1175,7 +1182,7 @@
this.gvMx1subQty.Tag = "query_a.sub_qty";
this.gvMx1subQty.Visible = true;
this.gvMx1subQty.VisibleIndex = 9;
- this.gvMx1subQty.Width = 37;
+ this.gvMx1subQty.Width = 24;
//
// gvMx1quantity
//
@@ -1190,8 +1197,8 @@
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "edit";
this.gvMx1quantity.Visible = true;
- this.gvMx1quantity.VisibleIndex = 10;
- this.gvMx1quantity.Width = 37;
+ this.gvMx1quantity.VisibleIndex = 11;
+ this.gvMx1quantity.Width = 25;
//
// gvMx1memo
//
@@ -1207,8 +1214,8 @@
this.gvMx1memo.OptionsColumn.ReadOnly = true;
this.gvMx1memo.Tag = "edit";
this.gvMx1memo.Visible = true;
- this.gvMx1memo.VisibleIndex = 11;
- this.gvMx1memo.Width = 84;
+ this.gvMx1memo.VisibleIndex = 12;
+ this.gvMx1memo.Width = 58;
//
// gvMx1okRkqty
//
@@ -1221,7 +1228,7 @@
this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
this.gvMx1okRkqty.Visible = true;
this.gvMx1okRkqty.VisibleIndex = 8;
- this.gvMx1okRkqty.Width = 37;
+ this.gvMx1okRkqty.Width = 24;
//
// gvMx1checkDate
//
@@ -1251,8 +1258,8 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 12;
- this.gridColumn9.Width = 23;
+ this.gridColumn9.VisibleIndex = 15;
+ this.gridColumn9.Width = 25;
//
// gridColumn7
//
@@ -1262,8 +1269,8 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 13;
- this.gridColumn7.Width = 23;
+ this.gridColumn7.VisibleIndex = 16;
+ this.gridColumn7.Width = 25;
//
// gridColumn6
//
@@ -1273,8 +1280,8 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 14;
- this.gridColumn6.Width = 84;
+ this.gridColumn6.VisibleIndex = 17;
+ this.gridColumn6.Width = 65;
//
// gridColumn10
//
@@ -1283,8 +1290,8 @@
this.gridColumn10.MinWidth = 22;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 18;
- this.gridColumn10.Width = 22;
+ this.gridColumn10.VisibleIndex = 21;
+ this.gridColumn10.Width = 25;
//
// gridColumn12
//
@@ -1293,8 +1300,8 @@
this.gridColumn12.MinWidth = 22;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 19;
- this.gridColumn12.Width = 22;
+ this.gridColumn12.VisibleIndex = 22;
+ this.gridColumn12.Width = 25;
//
// gridColumn13
//
@@ -1303,8 +1310,8 @@
this.gridColumn13.MinWidth = 22;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 20;
- this.gridColumn13.Width = 22;
+ this.gridColumn13.VisibleIndex = 23;
+ this.gridColumn13.Width = 25;
//
// gvBtnAlawys
//
@@ -1313,8 +1320,8 @@
this.gvBtnAlawys.MinWidth = 70;
this.gvBtnAlawys.Name = "gvBtnAlawys";
this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 21;
- this.gvBtnAlawys.Width = 70;
+ this.gvBtnAlawys.VisibleIndex = 24;
+ this.gvBtnAlawys.Width = 81;
//
// repositoryItemButtonEdit2
//
@@ -1334,8 +1341,8 @@
this.gvMxDel.MinWidth = 70;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 22;
- this.gvMxDel.Width = 70;
+ this.gvMxDel.VisibleIndex = 25;
+ this.gvMxDel.Width = 81;
//
// repositoryItemButtonEdit1
//
@@ -1363,8 +1370,8 @@
this.gridColumn15.MinWidth = 22;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 15;
- this.gridColumn15.Width = 44;
+ this.gridColumn15.VisibleIndex = 18;
+ this.gridColumn15.Width = 25;
//
// gridColumn16
//
@@ -1373,8 +1380,8 @@
this.gridColumn16.MinWidth = 22;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 16;
- this.gridColumn16.Width = 44;
+ this.gridColumn16.VisibleIndex = 19;
+ this.gridColumn16.Width = 25;
//
// gridColumn2
//
@@ -1383,8 +1390,8 @@
this.gridColumn2.MinWidth = 22;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 17;
- this.gridColumn2.Width = 23;
+ this.gridColumn2.VisibleIndex = 20;
+ this.gridColumn2.Width = 25;
//
// gridColumn17
//
@@ -1393,8 +1400,8 @@
this.gridColumn17.MinWidth = 22;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 23;
- this.gridColumn17.Width = 23;
+ this.gridColumn17.VisibleIndex = 26;
+ this.gridColumn17.Width = 25;
//
// rptHistory
//
@@ -1421,7 +1428,8 @@
this.gridColumn4.FieldName = "depotCode";
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 24;
+ this.gridColumn4.VisibleIndex = 27;
+ this.gridColumn4.Width = 22;
//
// gridColumn19
//
@@ -1429,7 +1437,17 @@
this.gridColumn19.FieldName = "depotName";
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 25;
+ this.gridColumn19.VisibleIndex = 28;
+ this.gridColumn19.Width = 22;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "浠撶鍛�";
+ this.gridColumn20.FieldName = "staffName";
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 29;
+ this.gridColumn20.Width = 35;
//
// picCheckBox
//
@@ -1443,13 +1461,32 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn20
+ // gv_remainingReceivedQty
//
- this.gridColumn20.Caption = "浠撶鍛�";
- this.gridColumn20.FieldName = "staffName";
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 26;
+ gv_remainingReceivedQty.Caption = "ERP绱鏈敹鏁伴噺";
+ gv_remainingReceivedQty.FieldName = "remainingReceivedQty";
+ gv_remainingReceivedQty.Name = "gv_remainingReceivedQty";
+ gv_remainingReceivedQty.Visible = true;
+ gv_remainingReceivedQty.VisibleIndex = 10;
+ gv_remainingReceivedQty.Width = 27;
+ //
+ // gv_sourceDocumentId
+ //
+ this.gv_sourceDocumentId.Caption = "婧愬崟鍗曞彿";
+ this.gv_sourceDocumentId.FieldName = "sourceDocumentId";
+ this.gv_sourceDocumentId.Name = "gv_sourceDocumentId";
+ this.gv_sourceDocumentId.Visible = true;
+ this.gv_sourceDocumentId.VisibleIndex = 13;
+ this.gv_sourceDocumentId.Width = 31;
+ //
+ // gv_demandDocumentId
+ //
+ this.gv_demandDocumentId.Caption = "闇�姹傚崟鎹彿";
+ this.gv_demandDocumentId.FieldName = "demandDocumentId";
+ this.gv_demandDocumentId.Name = "gv_demandDocumentId";
+ this.gv_demandDocumentId.Visible = true;
+ this.gv_demandDocumentId.VisibleIndex = 14;
+ this.gv_demandDocumentId.Width = 23;
//
// Frm_MesInvItemArn
//
@@ -1620,5 +1657,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentId;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index cee2a79..44f212d 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2356,30 +2356,30 @@
#endregion
- //璇诲彇榛樿缁勭粐
- public static string GetFirstOrg(UserControl.UcLookOrg txt_erpSczz)
- {
- string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
- var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
- var _obj = UtilityHelper.ReturnToDynamic(strReturn);
- string _extendText = _obj.rtnData.extendText;
- string[] _dftOrg = _extendText.Split(',');
- if (_dftOrg.Length > 0)
- {
- txt_erpSczz.SetIdOrCode(_dftOrg[0].Trim());
- return _dftOrg[0].Trim();
- }
- return "";
- }
- catch (Exception ex)
- {
- return "";
- }
- }
+ //璇诲彇榛樿缁勭粐
+ public static string GetFirstOrg(UserControl.UcLookOrg txt_erpSczz)
+ {
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ string _extendText = _obj.rtnData.extendText;
+ string[] _dftOrg = _extendText.Split(',');
+ if (_dftOrg.Length > 0)
+ {
+ txt_erpSczz.SetIdOrCode(_dftOrg[0].Trim());
+ return _dftOrg[0].Trim();
+ }
+ return "";
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 6fb1378..42fa531 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -49,12 +49,15 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
this.label1 = new System.Windows.Forms.Label();
this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -115,7 +118,10 @@
this.gridColumn2,
this.gridColumn4,
this.gridColumn1,
- this.gridColumn8});
+ this.gridColumn8,
+ this.gv_demandDocumentId,
+ this.gv_sourceDocumentId,
+ this.gv_remainingReceivedQty});
this.gridView1.DetailHeight = 272;
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 44;
@@ -183,8 +189,8 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 10;
+ this.gridColumn3.VisibleIndex = 17;
+ this.gridColumn3.Width = 40;
//
// gv_supplierItemCode
//
@@ -197,8 +203,8 @@
this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
this.gv_supplierItemCode.Visible = true;
- this.gv_supplierItemCode.VisibleIndex = 3;
- this.gv_supplierItemCode.Width = 10;
+ this.gv_supplierItemCode.VisibleIndex = 4;
+ this.gv_supplierItemCode.Width = 13;
//
// gv_supplierItemName
//
@@ -211,8 +217,8 @@
this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
this.gv_supplierItemName.Visible = true;
- this.gv_supplierItemName.VisibleIndex = 4;
- this.gv_supplierItemName.Width = 10;
+ this.gv_supplierItemName.VisibleIndex = 5;
+ this.gv_supplierItemName.Width = 13;
//
// gridColumn6
//
@@ -222,8 +228,8 @@
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 10;
+ this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.Width = 45;
//
// gridColumn9
//
@@ -233,8 +239,8 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 6;
- this.gridColumn9.Width = 44;
+ this.gridColumn9.VisibleIndex = 8;
+ this.gridColumn9.Width = 17;
//
// gridColumn7
//
@@ -248,8 +254,8 @@
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 7;
- this.gridColumn7.Width = 10;
+ this.gridColumn7.VisibleIndex = 6;
+ this.gridColumn7.Width = 11;
//
// gv_purchaseUnit
//
@@ -262,8 +268,8 @@
this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gv_purchaseUnit.Visible = true;
- this.gv_purchaseUnit.VisibleIndex = 8;
- this.gv_purchaseUnit.Width = 44;
+ this.gv_purchaseUnit.VisibleIndex = 11;
+ this.gv_purchaseUnit.Width = 72;
//
// gv_remarks
//
@@ -276,8 +282,8 @@
this.gv_remarks.OptionsColumn.ReadOnly = true;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 9;
- this.gv_remarks.Width = 10;
+ this.gv_remarks.VisibleIndex = 12;
+ this.gv_remarks.Width = 12;
//
// gridColumn5
//
@@ -287,8 +293,8 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 10;
- this.gridColumn5.Width = 10;
+ this.gridColumn5.VisibleIndex = 13;
+ this.gridColumn5.Width = 12;
//
// gridColumn10
//
@@ -297,8 +303,8 @@
this.gridColumn10.MinWidth = 10;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 11;
- this.gridColumn10.Width = 109;
+ this.gridColumn10.VisibleIndex = 14;
+ this.gridColumn10.Width = 45;
//
// gridColumn2
//
@@ -307,8 +313,8 @@
this.gridColumn2.MinWidth = 10;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 12;
- this.gridColumn2.Width = 10;
+ this.gridColumn2.VisibleIndex = 15;
+ this.gridColumn2.Width = 20;
//
// gridColumn4
//
@@ -318,8 +324,8 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 13;
- this.gridColumn4.Width = 105;
+ this.gridColumn4.VisibleIndex = 18;
+ this.gridColumn4.Width = 285;
//
// gridColumn1
//
@@ -328,8 +334,44 @@
this.gridColumn1.MinWidth = 10;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 22;
+ this.gridColumn1.VisibleIndex = 16;
+ this.gridColumn1.Width = 54;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鏈鏀堕噺";
+ this.gridColumn8.FieldName = "bcsl";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 10;
+ this.gridColumn8.Width = 72;
+ //
+ // gv_demandDocumentId
+ //
+ this.gv_demandDocumentId.Caption = "闇�姹傚崟鎹彿";
+ this.gv_demandDocumentId.FieldName = "demandDocumentId";
+ this.gv_demandDocumentId.Name = "gv_demandDocumentId";
+ this.gv_demandDocumentId.Visible = true;
+ this.gv_demandDocumentId.VisibleIndex = 2;
+ this.gv_demandDocumentId.Width = 38;
+ //
+ // gv_sourceDocumentId
+ //
+ this.gv_sourceDocumentId.Caption = "婧愬崟鍗曞彿";
+ this.gv_sourceDocumentId.FieldName = "sourceDocumentId";
+ this.gv_sourceDocumentId.Name = "gv_sourceDocumentId";
+ this.gv_sourceDocumentId.Visible = true;
+ this.gv_sourceDocumentId.VisibleIndex = 3;
+ this.gv_sourceDocumentId.Width = 32;
+ //
+ // gv_remainingReceivedQty
+ //
+ this.gv_remainingReceivedQty.Caption = "ERP鍓╀綑鏈敹鏁伴噺";
+ this.gv_remainingReceivedQty.FieldName = "remainingReceivedQty";
+ this.gv_remainingReceivedQty.Name = "gv_remainingReceivedQty";
+ this.gv_remainingReceivedQty.Visible = true;
+ this.gv_remainingReceivedQty.VisibleIndex = 9;
+ this.gv_remainingReceivedQty.Width = 62;
//
// panelControl3
//
@@ -389,14 +431,6 @@
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
//
- // gridColumn8
- //
- this.gridColumn8.Caption = "鏈鏀堕噺";
- this.gridColumn8.FieldName = "bcsl";
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 15;
- //
// SelectCgMx
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -451,5 +485,8 @@
private System.Windows.Forms.Label label1;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_demandDocumentId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_sourceDocumentId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
}
}
\ No newline at end of file
--
Gitblit v1.9.3