From 3c84755b07eabfb5e87ade9d020a4d3399ab2a53 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 13 八月 2025 17:37:12 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 130 +++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 78 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index e0ed264..88cfa51 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -48,11 +48,6 @@
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.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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -105,6 +100,7 @@
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -156,6 +152,7 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -172,10 +169,7 @@
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -220,6 +214,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -263,8 +258,6 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -381,7 +374,7 @@
// gv_urgentFlag
//
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
- this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
+ this.gv_urgentFlag.Caption = "鎬ユ枡";
this.gv_urgentFlag.FieldName = "urgentFlag";
this.gv_urgentFlag.MaxWidth = 50;
this.gv_urgentFlag.MinWidth = 50;
@@ -394,7 +387,7 @@
//
// gridColumn25
//
- this.gridColumn25.Caption = "濮斿鏍囪瘑";
+ this.gridColumn25.Caption = "濮斿";
this.gridColumn25.FieldName = "fType";
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
@@ -893,7 +886,7 @@
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem12.Size = new System.Drawing.Size(662, 30);
- this.layoutControlItem12.Text = "澶囨敞";
+ this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
@@ -919,6 +912,17 @@
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_barcodeProgress;
+ this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
+ this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -936,7 +940,7 @@
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1342, 386);
- this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏";
+ this.tabMxPage1.Text = "鏉ユ枡鏄庣粏";
//
// split99
//
@@ -956,7 +960,7 @@
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split99.Size = new System.Drawing.Size(1342, 386);
- this.split99.SplitterPosition = 116;
+ this.split99.SplitterPosition = 136;
this.split99.TabIndex = 2;
//
// layout99
@@ -979,7 +983,7 @@
this.layout99.Name = "layout99";
this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1342, 116);
+ this.layout99.Size = new System.Drawing.Size(1342, 136);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -1071,17 +1075,18 @@
//
// ucBtnPrint1
//
+ this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1030, 42);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(340, 32);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1033, 10);
+ this.radOut.Location = new System.Drawing.Point(1030, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1089,7 +1094,8 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
- this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.radOut.Size = new System.Drawing.Size(340, 32);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
@@ -1298,13 +1304,10 @@
//
this.layoutControlItem22.Control = this.radOut;
this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0);
- this.layoutControlItem22.MaxSize = new System.Drawing.Size(230, 28);
- this.layoutControlItem22.MinSize = new System.Drawing.Size(230, 28);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
- this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1316,7 +1319,7 @@
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
@@ -1340,7 +1343,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1342, 258);
+ this.gcMx1.Size = new System.Drawing.Size(1342, 238);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1365,13 +1368,15 @@
this.gridColumn7,
this.gridColumn15,
this.gridColumn19,
- this.gridColumn12});
+ this.gridColumn12,
+ this.gridColumn27});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFilter.AllowFilterEditor = false;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
this.gvMx1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsView.ShowFooter = true;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvAbtGuid
@@ -1459,6 +1464,8 @@
this.gridColumn8.FieldName = "quantity";
this.gridColumn8.MinWidth = 50;
this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
this.gridColumn8.Width = 83;
@@ -1510,8 +1517,6 @@
this.gridColumn5.MinWidth = 50;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 9;
this.gridColumn5.Width = 159;
//
// gridColumn9
@@ -1522,7 +1527,7 @@
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.OptionsColumn.ReadOnly = true;
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 10;
+ this.gridColumn9.VisibleIndex = 9;
this.gridColumn9.Width = 83;
//
// gridColumn7
@@ -1532,8 +1537,6 @@
this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.OptionsColumn.ReadOnly = true;
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 11;
this.gridColumn7.Width = 83;
//
// gridColumn15
@@ -1543,7 +1546,7 @@
this.gridColumn15.MinWidth = 50;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 12;
+ this.gridColumn15.VisibleIndex = 10;
this.gridColumn15.Width = 83;
//
// gridColumn19
@@ -1553,25 +1556,33 @@
this.gridColumn19.MinWidth = 50;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 13;
+ this.gridColumn19.VisibleIndex = 11;
this.gridColumn19.Width = 91;
//
// gridColumn12
//
- this.gridColumn12.Caption = "鍒ゅ畾缁撴灉";
- this.gridColumn12.FieldName = "pdjg";
+ this.gridColumn12.Caption = "澶勭悊鎰忚";
+ this.gridColumn12.FieldName = "clyj";
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 14;
+ this.gridColumn12.VisibleIndex = 12;
this.gridColumn12.Width = 94;
+ //
+ // gridColumn27
+ //
+ this.gridColumn27.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
+ this.gridColumn27.FieldName = "mrtmsl";
+ this.gridColumn27.MinWidth = 25;
+ this.gridColumn27.Name = "gridColumn27";
+ this.gridColumn27.Width = 94;
//
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
this.tabMxPage2.Size = new System.Drawing.Size(1342, 386);
- this.tabMxPage2.Text = "宸叉墦鏉＄爜淇℃伅";
+ this.tabMxPage2.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
//
@@ -1579,8 +1590,6 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.rptChongDa});
this.gcMx2.Size = new System.Drawing.Size(1342, 386);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1605,8 +1614,7 @@
this.gridColumn17,
this.gridColumn22,
this.gridColumn23,
- this.gridColumn24,
- this.gvBtnAlawys});
+ this.gridColumn24});
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1750,38 +1758,6 @@
this.gridColumn24.VisibleIndex = 11;
this.gridColumn24.Width = 94;
//
- // gvBtnAlawys
- //
- this.gvBtnAlawys.Caption = "閲嶆墦";
- this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
- this.gvBtnAlawys.MinWidth = 25;
- this.gvBtnAlawys.Name = "gvBtnAlawys";
- this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 12;
- this.gvBtnAlawys.Width = 94;
- //
- // rptChongDa
- //
- this.rptChongDa.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.rptChongDa.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)});
- this.rptChongDa.Name = "rptChongDa";
- this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(662, 60);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
- this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1835,6 +1811,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1878,8 +1855,6 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
this.ResumeLayout(false);
}
@@ -1975,8 +1950,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
- private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
@@ -2007,5 +1980,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
}
}
\ No newline at end of file
--
Gitblit v1.9.3