From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs | 279 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 276 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs
index 419e149..066b752 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs
@@ -28,11 +28,284 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_supplierItemName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1056, 639);
+ this.gcMain.TabIndex = 4;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
+ this.gv_guid,
+ this.gridColumn4,
+ this.gv_supplierItemCode,
+ this.gv_supplierItemName,
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn9,
+ this.gv_purchaseUnit,
+ this.gridColumn10,
+ this.gridColumn2,
+ this.gridColumn1});
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.MinWidth = 25;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 94;
+ //
+ // 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.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.OptionsColumn.ReadOnly = true;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "閿�鍞崟鍙�";
+ this.gridColumn4.FieldName = "billNo";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 94;
+ //
+ // gv_supplierItemCode
+ //
+ this.gv_supplierItemCode.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemCode.Caption = "鐗╂枡缂栫爜";
+ this.gv_supplierItemCode.FieldName = "itemNo";
+ this.gv_supplierItemCode.Name = "gv_supplierItemCode";
+ this.gv_supplierItemCode.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemCode.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemCode.Tag = "query_a.SUPPLIER_ITEM_CODE";
+ this.gv_supplierItemCode.Visible = true;
+ this.gv_supplierItemCode.VisibleIndex = 2;
+ this.gv_supplierItemCode.Width = 100;
+ //
+ // gv_supplierItemName
+ //
+ this.gv_supplierItemName.AppearanceCell.Options.UseFont = true;
+ this.gv_supplierItemName.Caption = "鐗╂枡鍚嶇О";
+ this.gv_supplierItemName.FieldName = "itemName";
+ this.gv_supplierItemName.Name = "gv_supplierItemName";
+ this.gv_supplierItemName.OptionsColumn.AllowEdit = false;
+ this.gv_supplierItemName.OptionsColumn.ReadOnly = true;
+ this.gv_supplierItemName.Tag = "query_a.SUPPLIER_ITEM_NAME";
+ this.gv_supplierItemName.Visible = true;
+ this.gv_supplierItemName.VisibleIndex = 6;
+ this.gv_supplierItemName.Width = 120;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.OptionsColumn.ReadOnly = true;
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.Width = 250;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "閿�鍞崟浣�";
+ this.gridColumn6.FieldName = "xxdw";
+ this.gridColumn6.MaxWidth = 50;
+ this.gridColumn6.MinWidth = 50;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.OptionsColumn.ReadOnly = true;
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 50;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn7.Caption = "閿�鍞崟鏁伴噺";
+ this.gridColumn7.FieldName = "qty";
+ this.gridColumn7.MaxWidth = 50;
+ this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.ReadOnly = true;
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.Width = 50;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn9.Caption = "渚涘簲缁勭粐";
+ this.gridColumn9.FieldName = "gyOrg";
+ this.gridColumn9.MaxWidth = 50;
+ this.gridColumn9.MinWidth = 50;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.OptionsColumn.ReadOnly = true;
+ this.gridColumn9.Width = 50;
+ //
+ // gv_purchaseUnit
+ //
+ this.gv_purchaseUnit.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gv_purchaseUnit.AppearanceCell.Options.UseFont = true;
+ this.gv_purchaseUnit.AppearanceCell.Options.UseForeColor = true;
+ this.gv_purchaseUnit.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gv_purchaseUnit.AppearanceHeader.Options.UseForeColor = true;
+ this.gv_purchaseUnit.Caption = "搴撳瓨缁勭粐";
+ this.gv_purchaseUnit.FieldName = "kcOrg";
+ this.gv_purchaseUnit.MaxWidth = 50;
+ this.gv_purchaseUnit.MinWidth = 50;
+ this.gv_purchaseUnit.Name = "gv_purchaseUnit";
+ this.gv_purchaseUnit.OptionsColumn.AllowEdit = false;
+ this.gv_purchaseUnit.OptionsColumn.ReadOnly = true;
+ this.gv_purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
+ this.gv_purchaseUnit.Width = 50;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn10.Caption = "鏈彂璐ф暟閲�";
+ this.gridColumn10.FieldName = "syQty";
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 4;
+ this.gridColumn10.Width = 125;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "閿�鍞粍缁�";
+ this.gridColumn2.FieldName = "salesOrgName";
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 8;
+ this.gridColumn2.Width = 250;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "璁′环鍗曚綅";
+ this.gridColumn1.FieldName = "jjdw";
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.ReadOnly = true;
+ this.gridColumn1.Width = 94;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(0, 639);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1056, 43);
+ this.panelControl1.TabIndex = 5;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+ this.btnIn.Location = new System.Drawing.Point(960, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // Frm_SalesDeliverSelect
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Text = "Frm_SalesDeliverSelect";
- }
+ this.ClientSize = new System.Drawing.Size(1056, 682);
+ this.Controls.Add(this.gcMain);
+ this.Controls.Add(this.panelControl1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "Frm_SalesDeliverSelect";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨閿�鍞崟鏄庣粏";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ this.ResumeLayout(false);
+ }
#endregion
+
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
}
}
\ No newline at end of file
--
Gitblit v1.9.3