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/Rk/Frm_MesInvItemArn.Designer.cs | 182 +++++++++++++++++++++++++++++++-------------
1 files changed, 127 insertions(+), 55 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index e83ba9c..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();
@@ -93,6 +94,7 @@
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -106,7 +108,6 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -147,8 +148,14 @@
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
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.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();
@@ -181,6 +188,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -194,7 +202,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -538,7 +545,8 @@
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem18,
- this.layoutControlItem9});
+ this.layoutControlItem9,
+ this.lab_paperBillNo});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutMx1.Name = "layoutMx1";
@@ -729,6 +737,17 @@
this.layoutControlItem9.Text = "涓婚敭GUID";
this.layoutControlItem9.TextSize = new System.Drawing.Size(79, 14);
//
+ // lab_paperBillNo
+ //
+ this.lab_paperBillNo.Control = this.txt_paperBillNo;
+ this.lab_paperBillNo.Location = new System.Drawing.Point(528, 48);
+ this.lab_paperBillNo.Name = "lab_paperBillNo";
+ this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
+ this.lab_paperBillNo.Size = new System.Drawing.Size(264, 24);
+ this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
+ this.lab_paperBillNo.TextSize = new System.Drawing.Size(60, 14);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -745,8 +764,7 @@
this.layoutControlItem8,
this.layoutControlItem5,
this.layoutControlItem17,
- this.layoutControlItem16,
- this.lab_paperBillNo});
+ this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -908,17 +926,6 @@
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
- // lab_paperBillNo
- //
- this.lab_paperBillNo.Control = this.txt_paperBillNo;
- this.lab_paperBillNo.Location = new System.Drawing.Point(528, 48);
- this.lab_paperBillNo.Name = "lab_paperBillNo";
- this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2;
- this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
- this.lab_paperBillNo.Size = new System.Drawing.Size(264, 24);
- this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
- this.lab_paperBillNo.TextSize = new System.Drawing.Size(60, 14);
- //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -991,7 +998,13 @@
this.gridColumn16,
this.gridColumn2,
this.gridColumn17,
- this.gridColumn18});
+ this.gridColumn18,
+ this.gridColumn4,
+ this.gridColumn19,
+ this.gridColumn20,
+ gv_remainingReceivedQty,
+ this.gv_sourceDocumentId,
+ this.gv_demandDocumentId});
this.gvMx1.DetailHeight = 272;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
@@ -1052,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
//
@@ -1094,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
//
@@ -1107,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
//
@@ -1130,7 +1143,7 @@
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 32;
+ this.gridColumn8.Width = 22;
//
// gvMx1boardStyle
//
@@ -1143,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
//
@@ -1156,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
//
@@ -1169,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
//
@@ -1182,10 +1195,10 @@
this.gvMx1quantity.FieldName = "quantity";
this.gvMx1quantity.MinWidth = 22;
this.gvMx1quantity.Name = "gvMx1quantity";
- this.gvMx1quantity.Tag = "yz_quantity_0_edit";
+ 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
//
@@ -1201,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
//
@@ -1215,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
//
@@ -1245,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
//
@@ -1256,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
//
@@ -1267,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
//
@@ -1277,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
//
@@ -1287,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
//
@@ -1297,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
//
@@ -1307,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
//
@@ -1328,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
//
@@ -1357,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
//
@@ -1367,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
//
@@ -1377,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
//
@@ -1387,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
//
@@ -1409,6 +1422,33 @@
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Width = 82;
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浠撳簱缂栫爜";
+ this.gridColumn4.FieldName = "depotCode";
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 27;
+ this.gridColumn4.Width = 22;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn19.FieldName = "depotName";
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ 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
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1420,6 +1460,33 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gv_remainingReceivedQty
+ //
+ 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
//
@@ -1464,6 +1531,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1477,7 +1545,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1587,5 +1654,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo;
+ 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
--
Gitblit v1.9.3