From 1498516cb98d75e8f0dcbbfe232f2a0f1ff00c9b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 12:45:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs | 202 +++++++++++++++++++++++++-------------------------
1 files changed, 101 insertions(+), 101 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
index bda4328..d515f67 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.Designer.cs
@@ -1,7 +1,7 @@
/* Create By GS EasyCode */
namespace Gs.DevApp.DevFrm
{
- partial class Frm_MesInvItemArn
+ partial class Frm_MesInvItemArn
{
/// <summary>
/// Required designer variable.
@@ -29,11 +29,11 @@
/// </summary>
private void InitializeComponent()
{
- 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();
+ 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.gvMx1states = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1returnFlag = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1cgRkqty = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -63,6 +63,7 @@
this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_thstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fType = new DevExpress.XtraEditors.LabelControl();
this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -98,6 +99,8 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
this.txt_depotsCode = new Gs.DevApp.UserControl.UcLookCk();
@@ -109,9 +112,6 @@
this.lbGuid = new System.Windows.Forms.Label();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
- this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -128,10 +128,10 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
this.SuspendLayout();
//
// gvMx1states
@@ -507,9 +507,8 @@
this.gvMx1states});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvAbtGuid
@@ -536,13 +535,22 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "閲囪喘鏃堕棿";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 3;
+ this.gridColumn3.Width = 94;
//
// gv_thstatus
//
@@ -1016,6 +1024,22 @@
this.panel1.Size = new System.Drawing.Size(1231, 155);
this.panel1.TabIndex = 1;
//
+ // txt_fType
+ //
+ this.txt_fType.Location = new System.Drawing.Point(685, 53);
+ this.txt_fType.Name = "txt_fType";
+ this.txt_fType.Properties.Caption = "";
+ this.txt_fType.Size = new System.Drawing.Size(35, 24);
+ this.txt_fType.TabIndex = 450;
+ //
+ // txt_urgentFlag
+ //
+ this.txt_urgentFlag.Location = new System.Drawing.Point(685, 16);
+ this.txt_urgentFlag.Name = "txt_urgentFlag";
+ this.txt_urgentFlag.Properties.Caption = "";
+ this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
+ this.txt_urgentFlag.TabIndex = 449;
+ //
// labelControl2
//
this.labelControl2.Location = new System.Drawing.Point(28, 128);
@@ -1026,10 +1050,11 @@
//
// txt_ischeck
//
+ this.txt_ischeck.Enabled = false;
this.txt_ischeck.Location = new System.Drawing.Point(685, 89);
this.txt_ischeck.Name = "txt_ischeck";
- this.txt_ischeck.Properties.Caption = "";
- this.txt_ischeck.Size = new System.Drawing.Size(27, 24);
+ this.txt_ischeck.Properties.Caption = "鏄惁鎻愪氦妫�楠�";
+ this.txt_ischeck.Size = new System.Drawing.Size(118, 24);
this.txt_ischeck.TabIndex = 447;
//
// txt_depotsCode
@@ -1117,31 +1142,6 @@
this.txt_remark.Size = new System.Drawing.Size(150, 28);
this.txt_remark.TabIndex = 240;
//
- // gridColumn3
- //
- this.gridColumn3.Caption = "閲囪喘鏃堕棿";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 94;
- //
- // txt_urgentFlag
- //
- this.txt_urgentFlag.Location = new System.Drawing.Point(685, 16);
- this.txt_urgentFlag.Name = "txt_urgentFlag";
- this.txt_urgentFlag.Properties.Caption = "";
- this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
- this.txt_urgentFlag.TabIndex = 449;
- //
- // txt_fType
- //
- this.txt_fType.Location = new System.Drawing.Point(685, 53);
- this.txt_fType.Name = "txt_fType";
- this.txt_fType.Properties.Caption = "";
- this.txt_fType.Size = new System.Drawing.Size(35, 24);
- this.txt_fType.TabIndex = 450;
- //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1167,15 +1167,15 @@
this.tabMx.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
this.ResumeLayout(false);
}
#endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
+ private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
@@ -1185,67 +1185,67 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
-
- //BQCreateConrolObejct
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1cgRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1dha001;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1fType;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1workLine;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkStates;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
-private DevExpress.XtraEditors.LabelControl lb_fType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
+ //BQCreateConrolObejct
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1states;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1cgRkqty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1dha001;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1isdepsIn;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fType;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1workLine;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1okQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ischeck;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkStates;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkRes;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1subQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnLine;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_thstatus;
-private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
+ private DevExpress.XtraEditors.LabelControl lb_fType;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
-private DevExpress.XtraEditors.LabelControl lb_ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
- private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkRes;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
+ private DevExpress.XtraEditors.LabelControl lb_urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_insby;
-private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
-private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraEditors.LabelControl lb_ischeck;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ischeck;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_suppNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotsCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkRes;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
-private DevExpress.XtraEditors.LabelControl lb_status;
-private DevExpress.XtraEditors.TextEdit txt_status;
+ private DevExpress.XtraEditors.LabelControl lb_paperBillNo;
+ private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_paperBillNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-private DevExpress.XtraEditors.LabelControl lb_billNo;
-private DevExpress.XtraEditors.TextEdit txt_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
+ private DevExpress.XtraEditors.LabelControl lb_status;
+ private DevExpress.XtraEditors.TextEdit txt_status;
+
+ private DevExpress.XtraEditors.LabelControl lb_billNo;
+ private DevExpress.XtraEditors.TextEdit txt_billNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraEditors.LabelControl labelControl1;
private UserControl.UcLookSupplier txt_suppNo;
private DevExpress.XtraEditors.SimpleButton btnSelect;
--
Gitblit v1.9.3