From 8ecbedaeb1a0b438f83c36f4f19f50b03e2723dc Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期五, 25 七月 2025 08:38:57 +0800
Subject: [PATCH] 1、仓库新增打印模板切换、排序 2、检验样本数保存逻辑更改 3、采购模块新增入库类型
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 144 ++++++++++++++++++++++++++++++-----------------
1 files changed, 91 insertions(+), 53 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index 8ee892f..cea5c95 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -78,8 +78,8 @@
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_description = new DevExpress.XtraEditors.TextEdit();
this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -88,7 +88,6 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -105,6 +104,9 @@
this.bandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_DepotModel = new DevExpress.XtraEditors.ComboBoxEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -132,8 +134,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -142,7 +144,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -150,6 +151,9 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -495,6 +499,7 @@
this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_description);
this.layoutMx1.Controls.Add(this.txt_depottype);
+ this.layoutMx1.Controls.Add(this.txt_DepotModel);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
@@ -529,98 +534,109 @@
//
// txt_isFkc
//
- this.txt_isFkc.Location = new System.Drawing.Point(897, 12);
+ this.txt_isFkc.Location = new System.Drawing.Point(909, 12);
this.txt_isFkc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isFkc.Name = "txt_isFkc";
this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
- this.txt_isFkc.Size = new System.Drawing.Size(197, 20);
+ this.txt_isFkc.Size = new System.Drawing.Size(185, 20);
this.txt_isFkc.StyleController = this.layoutMx1;
this.txt_isFkc.TabIndex = 291;
this.txt_isFkc.Tag = "readonly";
//
// txt_isNg
//
- this.txt_isNg.Location = new System.Drawing.Point(897, 43);
+ this.txt_isNg.Location = new System.Drawing.Point(909, 43);
this.txt_isNg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_isNg.Name = "txt_isNg";
this.txt_isNg.Properties.Appearance.Options.UseFont = true;
- this.txt_isNg.Size = new System.Drawing.Size(197, 20);
+ this.txt_isNg.Size = new System.Drawing.Size(185, 20);
this.txt_isNg.StyleController = this.layoutMx1;
this.txt_isNg.TabIndex = 267;
this.txt_isNg.Tag = "readonly";
//
// txt_depotCode
//
- this.txt_depotCode.Location = new System.Drawing.Point(84, 12);
+ this.txt_depotCode.Location = new System.Drawing.Point(96, 12);
this.txt_depotCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depotCode.Name = "txt_depotCode";
this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotCode.Size = new System.Drawing.Size(195, 20);
+ this.txt_depotCode.Size = new System.Drawing.Size(183, 20);
this.txt_depotCode.StyleController = this.layoutMx1;
this.txt_depotCode.TabIndex = 213;
this.txt_depotCode.Tag = "readonly";
//
// txt_zuid
//
- this.txt_zuid.Location = new System.Drawing.Point(626, 43);
+ this.txt_zuid.Location = new System.Drawing.Point(638, 43);
this.txt_zuid.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_zuid.Name = "txt_zuid";
this.txt_zuid.Properties.Appearance.Options.UseFont = true;
- this.txt_zuid.Size = new System.Drawing.Size(195, 20);
+ this.txt_zuid.Size = new System.Drawing.Size(183, 20);
this.txt_zuid.StyleController = this.layoutMx1;
this.txt_zuid.TabIndex = 285;
this.txt_zuid.Tag = "readonly";
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(355, 12);
+ this.txt_depotName.Location = new System.Drawing.Point(367, 12);
this.txt_depotName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(195, 20);
+ this.txt_depotName.Size = new System.Drawing.Size(183, 20);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 216;
this.txt_depotName.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(626, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(638, 12);
this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(195, 20);
+ this.txt_createBy.Size = new System.Drawing.Size(183, 20);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 219;
this.txt_createBy.Tag = "readonly";
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(84, 43);
+ this.txt_description.Location = new System.Drawing.Point(96, 43);
this.txt_description.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
- this.txt_description.Size = new System.Drawing.Size(195, 20);
+ this.txt_description.Size = new System.Drawing.Size(183, 20);
this.txt_description.StyleController = this.layoutMx1;
this.txt_description.TabIndex = 217;
this.txt_description.Tag = "readonly";
//
// txt_depottype
//
- this.txt_depottype.Location = new System.Drawing.Point(355, 43);
+ this.txt_depottype.Location = new System.Drawing.Point(367, 43);
this.txt_depottype.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txt_depottype.Name = "txt_depottype";
this.txt_depottype.Properties.Appearance.Options.UseFont = true;
- this.txt_depottype.Size = new System.Drawing.Size(195, 20);
+ this.txt_depottype.Size = new System.Drawing.Size(183, 20);
this.txt_depottype.StyleController = this.layoutMx1;
this.txt_depottype.TabIndex = 231;
this.txt_depottype.Tag = "readonly";
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.lbGuid;
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem9.Size = new System.Drawing.Size(273, 31);
+ this.layoutControlItem9.Text = "lbGuid";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem9.TextVisible = false;
//
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
@@ -628,7 +644,9 @@
this.layoutControlItem6,
this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem10});
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem1});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -657,15 +675,6 @@
this.Root.Size = new System.Drawing.Size(1106, 113);
this.Root.TextVisible = false;
//
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_depotCode;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
- this.layoutControlItem1.Text = "浠撳簱缂栫爜";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 14);
- //
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_depotName;
@@ -674,7 +683,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem3
//
@@ -684,7 +693,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "浠撳簱璐熻矗浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem4
//
@@ -694,7 +703,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "澶囨敞";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem5
//
@@ -705,7 +714,7 @@
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "浠撳簱绫诲瀷";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem6
//
@@ -716,7 +725,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem6.Text = "鍒嗙粍";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem7
//
@@ -726,7 +735,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.Size = new System.Drawing.Size(273, 31);
this.layoutControlItem7.Text = "鍏佽璐熷簱瀛�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem8
//
@@ -737,7 +746,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(273, 31);
this.layoutControlItem8.Text = "绂佺敤鐘舵��";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 14);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem10
//
@@ -750,18 +759,6 @@
this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.lbGuid;
- this.layoutControlItem9.Location = new System.Drawing.Point(813, 62);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(273, 31);
- this.layoutControlItem9.Text = "lbGuid";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
//
// tabMx
//
@@ -936,6 +933,43 @@
this.gridBand1.Name = "gridBand1";
this.gridBand1.VisibleIndex = 0;
//
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_DepotModel;
+ this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem11.CustomizationFormText = "閫夋嫨搴撲綅妯℃澘";
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem11.Text = "閫夋嫨搴撲綅妯℃澘";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_depotCode;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Text = "浠撳簱缂栫爜";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // txt_DepotModel
+ //
+ this.txt_DepotModel.Location = new System.Drawing.Point(367, 74);
+ this.txt_DepotModel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.txt_DepotModel.Name = "txt_DepotModel";
+ this.txt_DepotModel.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.txt_DepotModel.Properties.Items.AddRange(new object[] {
+ "搴撲綅鐮侊紙灏忥級",
+ "搴撲綅鐮侊紙澶э級"});
+ this.txt_DepotModel.Size = new System.Drawing.Size(183, 20);
+ this.txt_DepotModel.StyleController = this.layoutMx1;
+ this.txt_DepotModel.TabIndex = 272;
+ this.txt_DepotModel.Tag = "readOnly-1";
+ //
// Frm_MesDepot
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -973,8 +1007,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -983,7 +1017,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -991,6 +1024,9 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_DepotModel.Properties)).EndInit();
this.ResumeLayout(false);
}
@@ -1027,7 +1063,6 @@
private DevExpress.XtraEditors.TextEdit txt_description;
private DevExpress.XtraEditors.TextEdit txt_depotName;
private DevExpress.XtraEditors.TextEdit txt_depotCode;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
@@ -1058,5 +1093,8 @@
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_iCount_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3