From e72209e7deabcea4545e374e2b9335566650aa74 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 18 九月 2025 16:18:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.resx | 120 +++++
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 70 ++
DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.cs | 100 ++++
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.Designer.cs | 59 ++
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs | 498 +++++++++++++----------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.cs | 10
DevApp/Gs.DevApp/Gs.DevApp.csproj | 27 +
DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.Designer.cs | 254 ++++++++++++
DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.resx | 120 +++++
9 files changed, 1,030 insertions(+), 228 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.Designer.cs
new file mode 100644
index 0000000..35d9d77
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.Designer.cs
@@ -0,0 +1,59 @@
+/* Create By GS EasyCode */
+namespace Gs.DevApp.DevFrm
+{
+ partial class Frm_WwLl
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.ucBlcl1 = new Gs.DevApp.DevFrm.WW.WwBlcl("濮斿棰嗘枡");
+ this.SuspendLayout();
+ //
+ // ucBlcl1
+ //
+ this.ucBlcl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.ucBlcl1.Location = new System.Drawing.Point(0, 0);
+ this.ucBlcl1.Name = "ucBlcl1";
+ this.ucBlcl1.Size = new System.Drawing.Size(1128, 682);
+ this.ucBlcl1.TabIndex = 0;
+
+ //
+ // Frm_WwBl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.ucBlcl1);
+ this.Name = "Frm_WwBl";
+ this.Text = "濮斿棰嗘枡鐢宠";
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private Gs.DevApp.DevFrm.WW.WwBlcl ucBlcl1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.cs
new file mode 100644
index 0000000..0c0cac4
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.cs
@@ -0,0 +1,10 @@
+namespace Gs.DevApp.DevFrm
+{
+ public partial class Frm_WwLl : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_WwLl()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.resx b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLl.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.Designer.cs
new file mode 100644
index 0000000..2244e54
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.Designer.cs
@@ -0,0 +1,254 @@
+锘縩amespace Gs.DevApp.DevFrm.Ck
+{
+ partial class UcWwBlclSelect
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // panelControl2
+ //
+ this.panelControl2.Controls.Add(this.gcMain);
+ this.panelControl2.Controls.Add(this.panelControl1);
+ this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Margin = new System.Windows.Forms.Padding(4);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(1410, 834);
+ this.panelControl2.TabIndex = 4;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain.Location = new System.Drawing.Point(2, 2);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Margin = new System.Windows.Forms.Padding(4);
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(1406, 777);
+ this.gcMain.TabIndex = 2;
+ 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 = 61;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn1,
+ this.gridColumn7,
+ this.gridColumn11});
+ this.gridView1.DetailHeight = 428;
+ this.gridView1.GridControl = this.gcMain;
+ this.gridView1.IndicatorWidth = 62;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsSelection.CheckBoxSelectorColumnWidth = 75;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // colChkInt
+ //
+ this.colChkInt.Caption = ".";
+ this.colChkInt.FieldName = "chkInt";
+ this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.colChkInt.MinWidth = 31;
+ this.colChkInt.Name = "colChkInt";
+ this.colChkInt.Visible = true;
+ this.colChkInt.VisibleIndex = 0;
+ this.colChkInt.Width = 117;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鐗╂枡ID";
+ this.gridColumn2.FieldName = "itemId";
+ this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 117;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 117;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn4.FieldName = "itemName";
+ this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 3;
+ this.gridColumn4.Width = 117;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 31;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 4;
+ this.gridColumn5.Width = 117;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍗曚綅";
+ this.gridColumn6.FieldName = "dwName";
+ this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 117;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "dabGuid";
+ this.gridColumn11.FieldName = "dabGuid";
+ this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn11.Width = 117;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(2, 779);
+ this.panelControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(1406, 53);
+ 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.zoom100_16x16;
+ this.btnIn.Location = new System.Drawing.Point(1286, 2);
+ this.btnIn.Margin = new System.Windows.Forms.Padding(4);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(118, 49);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "闇�棰嗙敤閲�";
+ this.gridColumn1.FieldName = "dab006";
+ this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 6;
+ this.gridColumn1.Width = 112;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "宸查鏁伴噺";
+ this.gridColumn7.FieldName = "dab007";
+ this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 7;
+ this.gridColumn7.Width = 112;
+ //
+ // UcWwBlclSelect
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.Controls.Add(this.panelControl2);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(4);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "UcWwBlclSelect";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨鐗╂枡锛屽彧鏄剧ず鏈敹鏁伴噺澶т簬0鐨�";
+ this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
+ ((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.XtraEditors.PanelControl panelControl2;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.cs b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.cs
new file mode 100644
index 0000000..3377121
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.cs
@@ -0,0 +1,100 @@
+锘縰sing Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Ck
+{
+ public partial class UcWwBlclSelect : DevExpress.XtraEditors.XtraForm
+ {
+ private readonly string _webServiceName = "WWBlManager/";
+ private string daaId = "";
+ private string orgId = "";
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_daaGuid">daaGuid</param>
+ /// <param name="_orgId">鐢熶骇缁勭粐</param>
+ public UcWwBlclSelect(string _daaGuid, string _orgId)
+ {
+ InitializeComponent();
+ this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+ this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+ this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+ this.colChkInt.OptionsFilter.AllowFilter = false;
+ this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+ this.daaId = _daaGuid;
+ this.orgId = _orgId;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ getPageList(1);
+ btnIn.Click += (s, e) =>
+ {
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ var list = new List<dynamic>();
+ DataTable dt = this.gcMain.DataSource as DataTable;
+ {
+ foreach (DataRow dr in dt.Rows)
+ {
+ string checkBox = dr["chkInt"].ToString();
+ string _guid = dr["guid"].ToString();
+ if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+ {
+ list.Add(new
+ {
+ dabGuid = _guid,
+ dwName = dr["dwName"].ToString(),
+ itemModel = dr["itemModel"].ToString(),
+ itemName = dr["itemName"].ToString(),
+ itemNo = dr["itemNo"].ToString(),
+ dab006 = dr["dab006"].ToString(),
+ dab007 = dr["dab007"].ToString(),
+ });
+ }
+ }
+ }
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list }); Close();
+ };
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _obj = new
+ {
+ currentPage = 1,
+ everyPageSize = 999999,
+ sortName = "",
+ keyWhere = "",
+ inP1 = daaId
+ };
+ var json = JsonConvert.SerializeObject(_obj);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "SelectFormMx", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.resx b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/WW/UcWwBlclSelect.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
index d8b30c3..72aa0a3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.Designer.cs
@@ -37,6 +37,7 @@
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = 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();
@@ -90,9 +91,9 @@
this.txt_bl002 = new DevExpress.XtraEditors.TextEdit();
this.txt_bl018 = new DevExpress.XtraEditors.CheckEdit();
this.txt_bl017 = new DevExpress.XtraEditors.TextEdit();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -107,6 +108,8 @@
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -114,7 +117,6 @@
this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1mid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1bld001 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1bld012 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -173,7 +175,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl017.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -188,6 +189,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -208,9 +211,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -218,10 +222,11 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+ this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -230,8 +235,9 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -240,6 +246,7 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -252,17 +259,19 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.Size = new System.Drawing.Size(1408, 698);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1408, 635);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -272,7 +281,7 @@
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.ColumnPanelRowHeight = 61;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_id,
this.gv_bl018,
@@ -296,8 +305,9 @@
this.gridColumn11,
this.gridColumn12,
this.gridColumn13});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
+ this.gridView1.IndicatorWidth = 62;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -308,294 +318,295 @@
this.gv_id.AppearanceCell.Options.UseFont = true;
this.gv_id.Caption = "涓婚敭GUID";
this.gv_id.FieldName = "guid";
- this.gv_id.MinWidth = 50;
+ this.gv_id.MinWidth = 62;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
- this.gv_id.Width = 94;
+ this.gv_id.Width = 117;
//
// gv_bl018
//
this.gv_bl018.AppearanceCell.Options.UseFont = true;
this.gv_bl018.Caption = "瀹℃牳鐘舵�� ";
this.gv_bl018.FieldName = "bl018";
- this.gv_bl018.MaxWidth = 50;
- this.gv_bl018.MinWidth = 50;
+ this.gv_bl018.MaxWidth = 62;
+ this.gv_bl018.MinWidth = 62;
this.gv_bl018.Name = "gv_bl018";
this.gv_bl018.OptionsColumn.AllowEdit = false;
this.gv_bl018.Tag = "query_a.bl018";
this.gv_bl018.UnboundDataType = typeof(bool);
this.gv_bl018.Visible = true;
this.gv_bl018.VisibleIndex = 0;
- this.gv_bl018.Width = 50;
+ this.gv_bl018.Width = 62;
//
// gv_bl019
//
this.gv_bl019.AppearanceCell.Options.UseFont = true;
this.gv_bl019.Caption = "瀹岀粨鏍囪瘑 ";
this.gv_bl019.FieldName = "bl019";
- this.gv_bl019.MaxWidth = 50;
- this.gv_bl019.MinWidth = 50;
+ this.gv_bl019.MaxWidth = 62;
+ this.gv_bl019.MinWidth = 62;
this.gv_bl019.Name = "gv_bl019";
this.gv_bl019.OptionsColumn.AllowEdit = false;
this.gv_bl019.Tag = "query_a.bl019";
this.gv_bl019.UnboundDataType = typeof(bool);
this.gv_bl019.Visible = true;
this.gv_bl019.VisibleIndex = 1;
- this.gv_bl019.Width = 50;
+ this.gv_bl019.Width = 62;
//
// gv_blNo
//
this.gv_blNo.AppearanceCell.Options.UseFont = true;
this.gv_blNo.Caption = "琛ユ枡鍗曞彿 ";
this.gv_blNo.FieldName = "blNo";
- this.gv_blNo.MinWidth = 100;
+ this.gv_blNo.MinWidth = 125;
this.gv_blNo.Name = "gv_blNo";
this.gv_blNo.OptionsColumn.AllowEdit = false;
this.gv_blNo.Tag = "query_a.bl_no";
this.gv_blNo.Visible = true;
this.gv_blNo.VisibleIndex = 2;
- this.gv_blNo.Width = 100;
+ this.gv_blNo.Width = 125;
//
// gv_bl001
//
this.gv_bl001.AppearanceCell.Options.UseFont = true;
this.gv_bl001.Caption = "濮斿宸ュ崟 ";
this.gv_bl001.FieldName = "bl001";
- this.gv_bl001.MinWidth = 100;
+ this.gv_bl001.MinWidth = 125;
this.gv_bl001.Name = "gv_bl001";
this.gv_bl001.OptionsColumn.AllowEdit = false;
this.gv_bl001.Tag = "query_a.bl001";
this.gv_bl001.Visible = true;
this.gv_bl001.VisibleIndex = 3;
- this.gv_bl001.Width = 100;
+ this.gv_bl001.Width = 125;
//
// gv_bl002
//
this.gv_bl002.AppearanceCell.Options.UseFont = true;
this.gv_bl002.Caption = "浜у搧缂栧彿 ";
this.gv_bl002.FieldName = "bl002";
- this.gv_bl002.MinWidth = 80;
+ this.gv_bl002.MinWidth = 100;
this.gv_bl002.Name = "gv_bl002";
this.gv_bl002.OptionsColumn.AllowEdit = false;
this.gv_bl002.Tag = "query_a.bl002";
this.gv_bl002.Visible = true;
this.gv_bl002.VisibleIndex = 4;
- this.gv_bl002.Width = 94;
+ this.gv_bl002.Width = 117;
//
// gv_bl014
//
this.gv_bl014.AppearanceCell.Options.UseFont = true;
this.gv_bl014.Caption = "浜у搧鍚嶇О ";
this.gv_bl014.FieldName = "bl014";
- this.gv_bl014.MinWidth = 50;
+ this.gv_bl014.MinWidth = 62;
this.gv_bl014.Name = "gv_bl014";
this.gv_bl014.OptionsColumn.AllowEdit = false;
this.gv_bl014.Tag = "query_a.bl014";
this.gv_bl014.Visible = true;
this.gv_bl014.VisibleIndex = 5;
- this.gv_bl014.Width = 94;
+ this.gv_bl014.Width = 117;
//
// gv_bl015
//
this.gv_bl015.AppearanceCell.Options.UseFont = true;
this.gv_bl015.Caption = "浜у搧鍨嬪彿 ";
this.gv_bl015.FieldName = "bl015";
- this.gv_bl015.MinWidth = 50;
+ this.gv_bl015.MinWidth = 62;
this.gv_bl015.Name = "gv_bl015";
this.gv_bl015.OptionsColumn.AllowEdit = false;
this.gv_bl015.Tag = "query_a.bl015";
this.gv_bl015.Visible = true;
this.gv_bl015.VisibleIndex = 6;
- this.gv_bl015.Width = 94;
+ this.gv_bl015.Width = 117;
//
// gv_bl004
//
this.gv_bl004.AppearanceCell.Options.UseFont = true;
this.gv_bl004.Caption = "鐢宠浜� ";
this.gv_bl004.FieldName = "bl004";
- this.gv_bl004.MinWidth = 50;
+ this.gv_bl004.MinWidth = 62;
this.gv_bl004.Name = "gv_bl004";
this.gv_bl004.OptionsColumn.AllowEdit = false;
this.gv_bl004.Tag = "query_a.bl004";
this.gv_bl004.Visible = true;
this.gv_bl004.VisibleIndex = 7;
- this.gv_bl004.Width = 94;
+ this.gv_bl004.Width = 117;
//
// gv_bl005
//
this.gv_bl005.AppearanceCell.Options.UseFont = true;
this.gv_bl005.Caption = "鐢宠鏃ユ湡 ";
this.gv_bl005.FieldName = "bl005";
- this.gv_bl005.MinWidth = 50;
+ this.gv_bl005.MinWidth = 62;
this.gv_bl005.Name = "gv_bl005";
this.gv_bl005.OptionsColumn.AllowEdit = false;
this.gv_bl005.Tag = "query_a.bl005";
this.gv_bl005.Visible = true;
this.gv_bl005.VisibleIndex = 8;
- this.gv_bl005.Width = 94;
+ this.gv_bl005.Width = 117;
//
// gv_bl016
//
this.gv_bl016.AppearanceCell.Options.UseFont = true;
this.gv_bl016.Caption = "瀹℃牳浜� ";
this.gv_bl016.FieldName = "bl016";
- this.gv_bl016.MinWidth = 50;
+ this.gv_bl016.MinWidth = 62;
this.gv_bl016.Name = "gv_bl016";
this.gv_bl016.OptionsColumn.AllowEdit = false;
this.gv_bl016.Tag = "query_a.bl016";
this.gv_bl016.Visible = true;
this.gv_bl016.VisibleIndex = 14;
- this.gv_bl016.Width = 94;
+ this.gv_bl016.Width = 117;
//
// gv_bl006
//
this.gv_bl006.AppearanceCell.Options.UseFont = true;
this.gv_bl006.Caption = "瀹℃牳鏃ユ湡 ";
this.gv_bl006.FieldName = "bl006";
- this.gv_bl006.MinWidth = 50;
+ this.gv_bl006.MinWidth = 62;
this.gv_bl006.Name = "gv_bl006";
this.gv_bl006.OptionsColumn.AllowEdit = false;
this.gv_bl006.Tag = "query_a.bl006";
this.gv_bl006.Visible = true;
this.gv_bl006.VisibleIndex = 9;
- this.gv_bl006.Width = 94;
+ this.gv_bl006.Width = 117;
//
// gv_bl007
//
this.gv_bl007.AppearanceCell.Options.UseFont = true;
this.gv_bl007.Caption = "琛ユ枡鍘熷洜 ";
this.gv_bl007.FieldName = "bl007";
- this.gv_bl007.MinWidth = 50;
+ this.gv_bl007.MinWidth = 62;
this.gv_bl007.Name = "gv_bl007";
this.gv_bl007.OptionsColumn.AllowEdit = false;
this.gv_bl007.Tag = "query_a.bl007";
this.gv_bl007.Visible = true;
this.gv_bl007.VisibleIndex = 10;
- this.gv_bl007.Width = 94;
+ this.gv_bl007.Width = 117;
//
// gv_bl009
//
this.gv_bl009.AppearanceCell.Options.UseFont = true;
this.gv_bl009.Caption = "涓氬姟绫诲瀷 ";
this.gv_bl009.FieldName = "bl009";
- this.gv_bl009.MinWidth = 50;
+ this.gv_bl009.MinWidth = 62;
this.gv_bl009.Name = "gv_bl009";
this.gv_bl009.OptionsColumn.AllowEdit = false;
this.gv_bl009.Tag = "query_a.bl009";
this.gv_bl009.Visible = true;
this.gv_bl009.VisibleIndex = 11;
- this.gv_bl009.Width = 94;
+ this.gv_bl009.Width = 117;
//
// gv_bl010
//
this.gv_bl010.AppearanceCell.Options.UseFont = true;
this.gv_bl010.Caption = "鍙戞枡浠� ";
this.gv_bl010.FieldName = "ckName";
- this.gv_bl010.MinWidth = 50;
+ this.gv_bl010.MinWidth = 62;
this.gv_bl010.Name = "gv_bl010";
this.gv_bl010.OptionsColumn.AllowEdit = false;
this.gv_bl010.Tag = "query_a.bl010";
this.gv_bl010.Visible = true;
this.gv_bl010.VisibleIndex = 12;
- this.gv_bl010.Width = 94;
+ this.gv_bl010.Width = 117;
//
// gv_bl013
//
this.gv_bl013.AppearanceCell.Options.UseFont = true;
this.gv_bl013.Caption = "鎶曟枡鍗曞彿 ";
this.gv_bl013.FieldName = "bl013";
- this.gv_bl013.MinWidth = 50;
+ this.gv_bl013.MinWidth = 62;
this.gv_bl013.Name = "gv_bl013";
this.gv_bl013.OptionsColumn.AllowEdit = false;
this.gv_bl013.Tag = "query_a.bl013";
this.gv_bl013.Visible = true;
this.gv_bl013.VisibleIndex = 13;
- this.gv_bl013.Width = 94;
+ this.gv_bl013.Width = 117;
//
// gv_wcUser
//
this.gv_wcUser.AppearanceCell.Options.UseFont = true;
this.gv_wcUser.Caption = "瀹屾垚浜� ";
this.gv_wcUser.FieldName = "wcUser";
- this.gv_wcUser.MinWidth = 50;
+ this.gv_wcUser.MinWidth = 62;
this.gv_wcUser.Name = "gv_wcUser";
this.gv_wcUser.OptionsColumn.AllowEdit = false;
this.gv_wcUser.Tag = "query_a.wc_user";
this.gv_wcUser.Visible = true;
this.gv_wcUser.VisibleIndex = 15;
- this.gv_wcUser.Width = 94;
+ this.gv_wcUser.Width = 117;
//
// gv_wcTime
//
this.gv_wcTime.AppearanceCell.Options.UseFont = true;
this.gv_wcTime.Caption = "瀹屾垚鏃堕棿 ";
this.gv_wcTime.FieldName = "wcTime";
- this.gv_wcTime.MinWidth = 50;
+ this.gv_wcTime.MinWidth = 62;
this.gv_wcTime.Name = "gv_wcTime";
this.gv_wcTime.OptionsColumn.AllowEdit = false;
this.gv_wcTime.Tag = "query_a.wc_time";
this.gv_wcTime.Visible = true;
this.gv_wcTime.VisibleIndex = 16;
- this.gv_wcTime.Width = 94;
+ this.gv_wcTime.Width = 117;
//
// gridColumn10
//
this.gridColumn10.Caption = "濮斿缁勭粐";
this.gridColumn10.FieldName = "wwOrgTxt";
- this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.MinWidth = 31;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 17;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.Width = 117;
//
// gridColumn11
//
this.gridColumn11.Caption = "鍙戞枡缁勭粐";
this.gridColumn11.FieldName = "orgIdTxt";
- this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.MinWidth = 31;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 18;
- this.gridColumn11.Width = 94;
+ this.gridColumn11.Width = 117;
//
// gridColumn12
//
this.gridColumn12.Caption = "濮斿渚涘簲鍟�";
this.gridColumn12.FieldName = "wwGys";
- this.gridColumn12.MinWidth = 25;
+ this.gridColumn12.MinWidth = 31;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 19;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.Width = 117;
//
// gridColumn13
//
this.gridColumn13.Caption = "浠诲姟鍗曞彿";
this.gridColumn13.FieldName = "erpProductionOrderNo";
- this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.MinWidth = 31;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 20;
- this.gridColumn13.Width = 94;
+ this.gridColumn13.Width = 117;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 519);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -603,6 +614,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -615,8 +627,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 141;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 213;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -637,22 +649,25 @@
this.layoutMx1.Controls.Add(this.txt_bl002);
this.layoutMx1.Controls.Add(this.txt_bl018);
this.layoutMx1.Controls.Add(this.txt_bl017);
+ this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem16});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(663, 385, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 141);
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 213);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(825, 108);
+ this.lbGuid.Location = new System.Drawing.Point(1031, 132);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(268, 28);
+ this.lbGuid.Size = new System.Drawing.Size(335, 34);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -660,86 +675,94 @@
// txt_bl010
//
this.txt_bl010.IsReadly = false;
- this.txt_bl010.Location = new System.Drawing.Point(84, 102);
+ this.txt_bl010.Location = new System.Drawing.Point(96, 127);
this.txt_bl010.Margin = new System.Windows.Forms.Padding(0);
this.txt_bl010.Name = "txt_bl010";
- this.txt_bl010.Size = new System.Drawing.Size(200, 24);
+ this.txt_bl010.Size = new System.Drawing.Size(259, 28);
this.txt_bl010.TabIndex = 281;
//
// txt_orgId
//
this.txt_orgId.IsReadly = false;
- this.txt_orgId.Location = new System.Drawing.Point(84, 72);
+ this.txt_orgId.Location = new System.Drawing.Point(96, 88);
+ this.txt_orgId.Margin = new System.Windows.Forms.Padding(5);
this.txt_orgId.Name = "txt_orgId";
- this.txt_orgId.Size = new System.Drawing.Size(200, 24);
+ this.txt_orgId.Size = new System.Drawing.Size(259, 28);
this.txt_orgId.TabIndex = 294;
//
// txt_wwGys
//
- this.txt_wwGys.Location = new System.Drawing.Point(636, 42);
+ this.txt_wwGys.Location = new System.Drawing.Point(790, 50);
+ this.txt_wwGys.Margin = new System.Windows.Forms.Padding(4);
this.txt_wwGys.Name = "txt_wwGys";
this.txt_wwGys.Properties.Appearance.Options.UseFont = true;
- this.txt_wwGys.Size = new System.Drawing.Size(200, 24);
+ this.txt_wwGys.Size = new System.Drawing.Size(259, 28);
this.txt_wwGys.StyleController = this.layoutMx1;
this.txt_wwGys.TabIndex = 293;
this.txt_wwGys.Tag = "readonly";
//
// txt_bl007
//
- this.txt_bl007.Location = new System.Drawing.Point(360, 102);
+ this.txt_bl007.Location = new System.Drawing.Point(443, 127);
+ this.txt_bl007.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl007.Name = "txt_bl007";
this.txt_bl007.Properties.Appearance.Options.UseFont = true;
- this.txt_bl007.Size = new System.Drawing.Size(200, 24);
+ this.txt_bl007.Size = new System.Drawing.Size(259, 28);
this.txt_bl007.StyleController = this.layoutMx1;
this.txt_bl007.TabIndex = 228;
//
// txt_bl015
//
- this.txt_bl015.Location = new System.Drawing.Point(636, 102);
+ this.txt_bl015.Location = new System.Drawing.Point(790, 127);
+ this.txt_bl015.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl015.Name = "txt_bl015";
this.txt_bl015.Properties.Appearance.Options.UseFont = true;
- this.txt_bl015.Size = new System.Drawing.Size(200, 24);
+ this.txt_bl015.Size = new System.Drawing.Size(259, 28);
this.txt_bl015.StyleController = this.layoutMx1;
this.txt_bl015.TabIndex = 262;
this.txt_bl015.Tag = "readonly";
//
// txt_blNo
//
- this.txt_blNo.Location = new System.Drawing.Point(84, 12);
+ this.txt_blNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_blNo.Margin = new System.Windows.Forms.Padding(4);
this.txt_blNo.Name = "txt_blNo";
this.txt_blNo.Properties.Appearance.Options.UseFont = true;
this.txt_blNo.Properties.Tag = "readOnly";
- this.txt_blNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_blNo.Size = new System.Drawing.Size(259, 28);
this.txt_blNo.StyleController = this.layoutMx1;
this.txt_blNo.TabIndex = 211;
this.txt_blNo.Tag = "readonly";
//
// txt_wwOrgTxt
//
- this.txt_wwOrgTxt.Location = new System.Drawing.Point(360, 42);
+ this.txt_wwOrgTxt.Location = new System.Drawing.Point(443, 50);
+ this.txt_wwOrgTxt.Margin = new System.Windows.Forms.Padding(4);
this.txt_wwOrgTxt.Name = "txt_wwOrgTxt";
this.txt_wwOrgTxt.Properties.Appearance.Options.UseFont = true;
- this.txt_wwOrgTxt.Size = new System.Drawing.Size(200, 24);
+ this.txt_wwOrgTxt.Size = new System.Drawing.Size(259, 28);
this.txt_wwOrgTxt.StyleController = this.layoutMx1;
this.txt_wwOrgTxt.TabIndex = 291;
this.txt_wwOrgTxt.Tag = "readonly";
//
// txt_bl014
//
- this.txt_bl014.Location = new System.Drawing.Point(636, 72);
+ this.txt_bl014.Location = new System.Drawing.Point(790, 88);
+ this.txt_bl014.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl014.Name = "txt_bl014";
this.txt_bl014.Properties.Appearance.Options.UseFont = true;
- this.txt_bl014.Size = new System.Drawing.Size(200, 24);
+ this.txt_bl014.Size = new System.Drawing.Size(259, 28);
this.txt_bl014.StyleController = this.layoutMx1;
this.txt_bl014.TabIndex = 258;
this.txt_bl014.Tag = "readonly";
//
// txt_bl013
//
- this.txt_bl013.Location = new System.Drawing.Point(360, 12);
+ this.txt_bl013.Location = new System.Drawing.Point(443, 12);
+ this.txt_bl013.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl013.Name = "txt_bl013";
this.txt_bl013.Properties.Appearance.Options.UseFont = true;
- this.txt_bl013.Size = new System.Drawing.Size(200, 24);
+ this.txt_bl013.Size = new System.Drawing.Size(259, 28);
this.txt_bl013.StyleController = this.layoutMx1;
this.txt_bl013.TabIndex = 252;
this.txt_bl013.Tag = "readonly";
@@ -747,59 +770,76 @@
// txt_aboutGuid
//
this.txt_aboutGuid.IsReadly = false;
- this.txt_aboutGuid.Location = new System.Drawing.Point(84, 42);
+ this.txt_aboutGuid.Location = new System.Drawing.Point(96, 50);
+ this.txt_aboutGuid.Margin = new System.Windows.Forms.Padding(5);
this.txt_aboutGuid.Name = "txt_aboutGuid";
- this.txt_aboutGuid.Size = new System.Drawing.Size(200, 24);
+ this.txt_aboutGuid.Size = new System.Drawing.Size(259, 28);
this.txt_aboutGuid.TabIndex = 287;
//
// txt_bl006
//
- this.txt_bl006.Location = new System.Drawing.Point(912, 42);
+ this.txt_bl006.Location = new System.Drawing.Point(1137, 50);
+ this.txt_bl006.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl006.Name = "txt_bl006";
this.txt_bl006.Properties.Appearance.Options.UseFont = true;
- this.txt_bl006.Size = new System.Drawing.Size(202, 24);
+ this.txt_bl006.Size = new System.Drawing.Size(259, 28);
this.txt_bl006.StyleController = this.layoutMx1;
this.txt_bl006.TabIndex = 226;
this.txt_bl006.Tag = "readonly";
//
// txt_bl016
//
- this.txt_bl016.Location = new System.Drawing.Point(912, 12);
+ this.txt_bl016.Location = new System.Drawing.Point(1137, 12);
+ this.txt_bl016.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl016.Name = "txt_bl016";
this.txt_bl016.Properties.Appearance.Options.UseFont = true;
- this.txt_bl016.Size = new System.Drawing.Size(202, 24);
+ this.txt_bl016.Size = new System.Drawing.Size(259, 28);
this.txt_bl016.StyleController = this.layoutMx1;
this.txt_bl016.TabIndex = 267;
this.txt_bl016.Tag = "readonly";
//
// txt_bl002
//
- this.txt_bl002.Location = new System.Drawing.Point(360, 72);
+ this.txt_bl002.Location = new System.Drawing.Point(443, 88);
+ this.txt_bl002.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl002.Name = "txt_bl002";
this.txt_bl002.Properties.Appearance.Options.UseFont = true;
- this.txt_bl002.Size = new System.Drawing.Size(200, 24);
+ this.txt_bl002.Size = new System.Drawing.Size(259, 28);
this.txt_bl002.StyleController = this.layoutMx1;
this.txt_bl002.TabIndex = 216;
this.txt_bl002.Tag = "readonly";
//
// txt_bl018
//
- this.txt_bl018.Location = new System.Drawing.Point(840, 72);
+ this.txt_bl018.Location = new System.Drawing.Point(1053, 88);
+ this.txt_bl018.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl018.Name = "txt_bl018";
this.txt_bl018.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_bl018.Size = new System.Drawing.Size(274, 24);
+ this.txt_bl018.Size = new System.Drawing.Size(343, 27);
this.txt_bl018.StyleController = this.layoutMx1;
this.txt_bl018.TabIndex = 295;
//
// txt_bl017
//
this.txt_bl017.Enabled = false;
- this.txt_bl017.Location = new System.Drawing.Point(636, 12);
+ this.txt_bl017.Location = new System.Drawing.Point(790, 12);
+ this.txt_bl017.Margin = new System.Windows.Forms.Padding(4);
this.txt_bl017.Name = "txt_bl017";
- this.txt_bl017.Size = new System.Drawing.Size(200, 24);
+ this.txt_bl017.Size = new System.Drawing.Size(259, 28);
this.txt_bl017.StyleController = this.layoutMx1;
this.txt_bl017.TabIndex = 296;
this.txt_bl017.Tag = "readonly";
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(12, 166);
+ this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(146, 34);
+ this.btnSelect.StyleController = this.layoutMx1;
+ this.btnSelect.TabIndex = 444;
+ this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
// layoutControlItem16
//
@@ -818,7 +858,6 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem4,
this.layoutControlItem5,
@@ -832,7 +871,9 @@
this.layoutControlItem12,
this.layoutControlItem3,
this.layoutControlItem15,
- this.layoutControlItem8});
+ this.layoutControlItem8,
+ this.layoutControlItem17,
+ this.layoutControlItem1});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -856,158 +897,152 @@
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition4.Height = 100D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
- rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1126, 141);
+ rowDefinition4,
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1408, 213);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_blNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 30);
- this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_bl013;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(347, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem2.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_bl016;
- this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(1041, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem4.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_aboutGuid;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 38);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem5.Text = "濮斿宸ュ崟";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_wwOrgTxt;
- this.layoutControlItem6.Location = new System.Drawing.Point(276, 30);
+ this.layoutControlItem6.Location = new System.Drawing.Point(347, 38);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem6.Text = "濮斿缁勭粐";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_wwGys;
- this.layoutControlItem7.Location = new System.Drawing.Point(552, 30);
+ this.layoutControlItem7.Location = new System.Drawing.Point(694, 38);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem7.Text = "渚涘簲鍟�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_orgId;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 60);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 76);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem9.Text = "鍙戞枡缁勭粐";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_bl002;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 60);
+ this.layoutControlItem10.Location = new System.Drawing.Point(347, 76);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem10.Text = "浜у搧缂栧彿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_bl014;
- this.layoutControlItem11.Location = new System.Drawing.Point(552, 60);
+ this.layoutControlItem11.Location = new System.Drawing.Point(694, 76);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem11.Text = "浜у搧鍚嶇О";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_bl010;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 90);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 115);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem13.Text = "鍙戞枡浠�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_bl007;
- this.layoutControlItem14.Location = new System.Drawing.Point(276, 90);
+ this.layoutControlItem14.Location = new System.Drawing.Point(347, 115);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem14.Text = "琛ユ枡鍘熷洜";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_bl015;
- this.layoutControlItem12.Location = new System.Drawing.Point(552, 90);
+ this.layoutControlItem12.Location = new System.Drawing.Point(694, 115);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem12.Text = "浜у搧鍨嬪彿";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_bl006;
- this.layoutControlItem3.Location = new System.Drawing.Point(828, 30);
+ this.layoutControlItem3.Location = new System.Drawing.Point(1041, 38);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_bl018;
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 60);
+ this.layoutControlItem15.Location = new System.Drawing.Point(1041, 76);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
+ this.layoutControlItem15.Size = new System.Drawing.Size(347, 39);
this.layoutControlItem15.Text = "瀹℃牳鐘舵��";
this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem15.TextVisible = false;
@@ -1015,20 +1050,44 @@
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_bl017;
- this.layoutControlItem8.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(694, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 38);
this.layoutControlItem8.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.btnSelect;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 154);
+ this.layoutControlItem17.MaxSize = new System.Drawing.Size(150, 38);
+ this.layoutControlItem17.MinSize = new System.Drawing.Size(119, 38);
+ this.layoutControlItem17.Name = "layoutControlItem13";
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(347, 39);
+ this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem17.Text = "閫夋嫨鐗╂枡";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_blNo;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 38);
+ this.layoutControlItem1.Text = "鐢宠鍗曞彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Margin = new System.Windows.Forms.Padding(4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 417);
+ this.tabMx.Size = new System.Drawing.Size(1408, 470);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1036,20 +1095,23 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 385);
+ this.tabMxPage1.Size = new System.Drawing.Size(1406, 432);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemSearchLookUpEdit1,
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 385);
+ this.gcMx1.Size = new System.Drawing.Size(1406, 432);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1060,7 +1122,6 @@
this.gvMx1id,
this.gvMx1mid,
this.gvMx1bld001,
- this.gvMx1bld012,
this.gvMx1bld002,
this.gvMx1bld003,
this.gvMx1bld004,
@@ -1073,6 +1134,7 @@
this.dabGuid,
this.gvMxDel,
this.gridColumn9});
+ this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1085,49 +1147,33 @@
this.gvMx1id.AppearanceCell.Options.UseFont = true;
this.gvMx1id.Caption = "ID ";
this.gvMx1id.FieldName = "guid";
- this.gvMx1id.MinWidth = 50;
+ this.gvMx1id.MinWidth = 62;
this.gvMx1id.Name = "gvMx1id";
this.gvMx1id.OptionsColumn.ReadOnly = true;
this.gvMx1id.Tag = "query_a.id";
- this.gvMx1id.Width = 94;
+ this.gvMx1id.Width = 117;
//
// gvMx1mid
//
this.gvMx1mid.AppearanceCell.Options.UseFont = true;
this.gvMx1mid.Caption = "MID ";
this.gvMx1mid.FieldName = "mid";
- this.gvMx1mid.MinWidth = 50;
+ this.gvMx1mid.MinWidth = 62;
this.gvMx1mid.Name = "gvMx1mid";
this.gvMx1mid.OptionsColumn.ReadOnly = true;
this.gvMx1mid.Tag = "query_a.mid";
- this.gvMx1mid.Width = 94;
+ this.gvMx1mid.Width = 117;
//
// gvMx1bld001
//
this.gvMx1bld001.AppearanceCell.Options.UseFont = true;
this.gvMx1bld001.Caption = "宸ュ崟鍙� ";
this.gvMx1bld001.FieldName = "bld001";
- this.gvMx1bld001.MinWidth = 50;
+ this.gvMx1bld001.MinWidth = 62;
this.gvMx1bld001.Name = "gvMx1bld001";
this.gvMx1bld001.OptionsColumn.ReadOnly = true;
this.gvMx1bld001.Tag = "query_a.bld001";
- this.gvMx1bld001.Width = 94;
- //
- // gvMx1bld012
- //
- this.gvMx1bld012.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1bld012.AppearanceCell.Options.UseFont = true;
- this.gvMx1bld012.AppearanceCell.Options.UseForeColor = true;
- this.gvMx1bld012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gvMx1bld012.AppearanceHeader.Options.UseForeColor = true;
- this.gvMx1bld012.Caption = "閫夋嫨鐗╂枡";
- this.gvMx1bld012.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
- this.gvMx1bld012.MinWidth = 50;
- this.gvMx1bld012.Name = "gvMx1bld012";
- this.gvMx1bld012.Tag = "edit";
- this.gvMx1bld012.Visible = true;
- this.gvMx1bld012.VisibleIndex = 0;
- this.gvMx1bld012.Width = 94;
+ this.gvMx1bld001.Width = 117;
//
// repositoryItemSearchLookUpEdit1
//
@@ -1139,7 +1185,6 @@
this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
this.repositoryItemSearchLookUpEdit1.ValueMember = "itemId";
- this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
//
// gridView2
//
@@ -1152,6 +1197,7 @@
this.gridColumn7,
this.gridColumn6,
this.gridColumn8});
+ this.gridView2.DetailHeight = 428;
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -1161,111 +1207,127 @@
//
this.gridColumn1.Caption = "dabGuid";
this.gridColumn1.FieldName = "dabGuid";
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡ID";
this.gridColumn2.FieldName = "itemId";
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡缂栫爜";
this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
+ this.gridColumn3.Width = 94;
//
// gridColumn4
//
this.gridColumn4.Caption = "鐗╂枡鍚嶇О";
this.gridColumn4.FieldName = "itemName";
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 94;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 94;
//
// gridColumn7
//
this.gridColumn7.Caption = "闇�棰嗙敤閲�";
this.gridColumn7.FieldName = "dab006";
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "宸查鐢ㄩ噺";
this.gridColumn6.FieldName = "dab007";
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
+ this.gridColumn6.Width = 94;
//
// gridColumn8
//
this.gridColumn8.Caption = "鍗曚綅";
this.gridColumn8.FieldName = "dwName";
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 4;
+ this.gridColumn8.Width = 94;
//
// gvMx1bld002
//
this.gvMx1bld002.AppearanceCell.Options.UseFont = true;
this.gvMx1bld002.Caption = "鐗╂枡缂栧彿 ";
this.gvMx1bld002.FieldName = "bld002";
- this.gvMx1bld002.MinWidth = 100;
+ this.gvMx1bld002.MinWidth = 125;
this.gvMx1bld002.Name = "gvMx1bld002";
this.gvMx1bld002.OptionsColumn.ReadOnly = true;
this.gvMx1bld002.Tag = "query_a.bld002";
this.gvMx1bld002.Visible = true;
- this.gvMx1bld002.VisibleIndex = 1;
- this.gvMx1bld002.Width = 100;
+ this.gvMx1bld002.VisibleIndex = 0;
+ this.gvMx1bld002.Width = 125;
//
// gvMx1bld003
//
this.gvMx1bld003.AppearanceCell.Options.UseFont = true;
this.gvMx1bld003.Caption = "鐗╂枡鍚嶇О ";
this.gvMx1bld003.FieldName = "bld003";
- this.gvMx1bld003.MinWidth = 120;
+ this.gvMx1bld003.MinWidth = 150;
this.gvMx1bld003.Name = "gvMx1bld003";
this.gvMx1bld003.OptionsColumn.ReadOnly = true;
this.gvMx1bld003.Tag = "query_a.bld003";
this.gvMx1bld003.Visible = true;
- this.gvMx1bld003.VisibleIndex = 2;
- this.gvMx1bld003.Width = 120;
+ this.gvMx1bld003.VisibleIndex = 1;
+ this.gvMx1bld003.Width = 150;
//
// gvMx1bld004
//
this.gvMx1bld004.AppearanceCell.Options.UseFont = true;
this.gvMx1bld004.Caption = "瑙勬牸鍨嬪彿 ";
this.gvMx1bld004.FieldName = "bld004";
- this.gvMx1bld004.MinWidth = 120;
+ this.gvMx1bld004.MinWidth = 150;
this.gvMx1bld004.Name = "gvMx1bld004";
this.gvMx1bld004.OptionsColumn.ReadOnly = true;
this.gvMx1bld004.Tag = "query_a.bld004";
this.gvMx1bld004.Visible = true;
- this.gvMx1bld004.VisibleIndex = 3;
- this.gvMx1bld004.Width = 120;
+ this.gvMx1bld004.VisibleIndex = 2;
+ this.gvMx1bld004.Width = 150;
//
// gvMx1bld006
//
this.gvMx1bld006.AppearanceCell.Options.UseFont = true;
this.gvMx1bld006.Caption = "璁″垝鏁伴噺 ";
this.gvMx1bld006.FieldName = "bld006";
- this.gvMx1bld006.MinWidth = 80;
+ this.gvMx1bld006.MinWidth = 100;
this.gvMx1bld006.Name = "gvMx1bld006";
this.gvMx1bld006.OptionsColumn.ReadOnly = true;
this.gvMx1bld006.Tag = "query_a.bld006";
- this.gvMx1bld006.Width = 94;
+ this.gvMx1bld006.Width = 117;
//
// gvMx1bld007
//
@@ -1276,38 +1338,38 @@
this.gvMx1bld007.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1bld007.Caption = "鐢宠鏁伴噺 ";
this.gvMx1bld007.FieldName = "bld007";
- this.gvMx1bld007.MinWidth = 80;
+ this.gvMx1bld007.MinWidth = 100;
this.gvMx1bld007.Name = "gvMx1bld007";
this.gvMx1bld007.Tag = "yz_quantity_0_edit";
this.gvMx1bld007.Visible = true;
- this.gvMx1bld007.VisibleIndex = 4;
- this.gvMx1bld007.Width = 94;
+ this.gvMx1bld007.VisibleIndex = 3;
+ this.gvMx1bld007.Width = 117;
//
// gvMx1bld008
//
this.gvMx1bld008.AppearanceCell.Options.UseFont = true;
this.gvMx1bld008.Caption = "宸查鏁伴噺 ";
this.gvMx1bld008.FieldName = "bld008";
- this.gvMx1bld008.MinWidth = 80;
+ this.gvMx1bld008.MinWidth = 100;
this.gvMx1bld008.Name = "gvMx1bld008";
this.gvMx1bld008.OptionsColumn.ReadOnly = true;
this.gvMx1bld008.Tag = "query_a.bld008";
this.gvMx1bld008.Visible = true;
- this.gvMx1bld008.VisibleIndex = 5;
- this.gvMx1bld008.Width = 94;
+ this.gvMx1bld008.VisibleIndex = 4;
+ this.gvMx1bld008.Width = 117;
//
// gvMx1bld009
//
this.gvMx1bld009.AppearanceCell.Options.UseFont = true;
this.gvMx1bld009.Caption = "鍗曚綅 ";
this.gvMx1bld009.FieldName = "bld009";
- this.gvMx1bld009.MinWidth = 50;
+ this.gvMx1bld009.MinWidth = 62;
this.gvMx1bld009.Name = "gvMx1bld009";
this.gvMx1bld009.OptionsColumn.ReadOnly = true;
this.gvMx1bld009.Tag = "query_a.bld009";
this.gvMx1bld009.Visible = true;
- this.gvMx1bld009.VisibleIndex = 6;
- this.gvMx1bld009.Width = 94;
+ this.gvMx1bld009.VisibleIndex = 5;
+ this.gvMx1bld009.Width = 117;
//
// gvMx1bld010
//
@@ -1318,40 +1380,40 @@
this.gvMx1bld010.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1bld010.Caption = "澶囨敞 ";
this.gvMx1bld010.FieldName = "bld010";
- this.gvMx1bld010.MinWidth = 150;
+ this.gvMx1bld010.MinWidth = 187;
this.gvMx1bld010.Name = "gvMx1bld010";
this.gvMx1bld010.Tag = "edit";
this.gvMx1bld010.Visible = true;
- this.gvMx1bld010.VisibleIndex = 7;
- this.gvMx1bld010.Width = 150;
+ this.gvMx1bld010.VisibleIndex = 6;
+ this.gvMx1bld010.Width = 187;
//
// gvMx1bld014
//
this.gvMx1bld014.AppearanceCell.Options.UseFont = true;
this.gvMx1bld014.Caption = "ERP鎶曟枡鍗曡id ";
this.gvMx1bld014.FieldName = "bld014";
- this.gvMx1bld014.MinWidth = 50;
+ this.gvMx1bld014.MinWidth = 62;
this.gvMx1bld014.Name = "gvMx1bld014";
this.gvMx1bld014.Tag = "query_a.bld014";
- this.gvMx1bld014.Width = 94;
+ this.gvMx1bld014.Width = 117;
//
// dabGuid
//
this.dabGuid.Caption = "gridColumn1";
this.dabGuid.FieldName = "dabGuid";
- this.dabGuid.MinWidth = 25;
+ this.dabGuid.MinWidth = 31;
this.dabGuid.Name = "dabGuid";
- this.dabGuid.Width = 94;
+ this.dabGuid.Width = 117;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
+ this.gvMxDel.MinWidth = 31;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.VisibleIndex = 7;
+ this.gvMxDel.Width = 117;
//
// repositoryItemButtonEdit1
//
@@ -1368,16 +1430,17 @@
//
this.gridColumn9.Caption = "鐗╂枡ID";
this.gridColumn9.FieldName = "bld012";
- this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.MinWidth = 31;
this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Width = 94;
+ this.gridColumn9.Width = 117;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(988, 55);
+ this.picCheckBox.Location = new System.Drawing.Point(1235, 67);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.Size = new System.Drawing.Size(125, 61);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 7;
this.picCheckBox.TabStop = false;
@@ -1385,13 +1448,14 @@
//
// WwBlcl
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "WwBlcl";
- this.Size = new System.Drawing.Size(1128, 682);
+ this.Size = new System.Drawing.Size(1410, 834);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -1425,7 +1489,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_bl017.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
@@ -1440,6 +1503,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1501,7 +1566,6 @@
private DevExpress.XtraEditors.TextEdit txt_blNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
@@ -1521,7 +1585,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1mid;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld001;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1bld012;
private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
@@ -1551,5 +1614,8 @@
private DevExpress.XtraEditors.TextEdit txt_bl017;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index 65203c5..09fe9b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -1,4 +1,6 @@
锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraLayout.Utils;
+using Gs.DevApp.DevFrm.Ck;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -25,6 +27,10 @@
strType = _strType;
txt_bl017.Text = _strType;
txt_bl017.Tag = "moren." + _strType;
+ if(_strType == "濮斿棰嗘枡")
+ {
+ layoutControlItem14.Visibility = LayoutVisibility.Never;
+ }
}
protected override void OnCreateControl()
{
@@ -92,6 +98,58 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
+ };
+
+ //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
+ btnSelect.Click += (s, e) =>
+ {
+ if (string.IsNullOrEmpty(this.txt_orgId.GetId()))
+ {
+ MsgHelper.ShowError("璇烽�夋嫨鐢熶骇缁勭粐锛�");
+ txt_orgId.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(this.txt_aboutGuid.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨鐢熶骇宸ュ崟锛�");
+ return;
+ }
+ var frm = new UcWwBlclSelect(txt_aboutGuid.GetId(), this.txt_orgId.GetId());
+ //璧嬪�肩粰鏄庣粏琛�
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ int idx = 1;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["bld002"] = dym.itemNo;//鐗╂枡缂栧彿
+ _row["bld003"] = dym.itemName;//鐗╂枡鍚嶇О
+ _row["bld004"] = dym.itemModel;//瑙勬牸鍨嬪彿
+ _row["dabGuid"] = dym.dabGuid;
+ _row["bld008"] = dym.dab007;//椤规
+ _row["bld009"] = dym.dwName;//椤规
+ _Table.Rows.Add(_row);
+
+ idx++;
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -556,18 +614,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- }
-
- private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
- {
- SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
- DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
- gvMx1.SetFocusedRowCellValue("bld002", SelectedDataRow["itemNo"]);
- gvMx1.SetFocusedRowCellValue("bld003", SelectedDataRow["itemName"]);
- gvMx1.SetFocusedRowCellValue("bld004", SelectedDataRow["itemModel"]);
- gvMx1.SetFocusedRowCellValue("dabGuid", SelectedDataRow["dabGuid"]);
- gvMx1.SetFocusedRowCellValue("bld008", SelectedDataRow["dab007"]);//宸查鐢ㄩ噺
- gvMx1.SetFocusedRowCellValue("bld009", SelectedDataRow["dwName"]);//鍗曚綅
}
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index ede0be8..22bd9d8 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -806,6 +806,12 @@
<Compile Include="DevFrm\Rpt\QLCX.Designer.cs">
<DependentUpon>QLCX.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\RptQT.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\RptQT.Designer.cs">
+ <DependentUpon>RptQT.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\UcRptCgdhd.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1179,11 +1185,23 @@
<Compile Include="DevFrm\Work\Frm_WorkTechniqueShow.Designer.cs">
<DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\WW\Frm_WwLl.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WW\Frm_WwLl.Designer.cs">
+ <DependentUpon>Frm_WwLl.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\WW\showWwZhongTai.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DevFrm\WW\showWwZhongTai.Designer.cs">
<DependentUpon>showWwZhongTai.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\WW\UcWwBlclSelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\WW\UcWwBlclSelect.Designer.cs">
+ <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -1888,6 +1906,9 @@
<EmbeddedResource Include="DevFrm\Rpt\QLCX.resx">
<DependentUpon>QLCX.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\RptQT.resx">
+ <DependentUpon>RptQT.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx">
<DependentUpon>UcRptCgdhd.cs</DependentUpon>
</EmbeddedResource>
@@ -2066,9 +2087,15 @@
<EmbeddedResource Include="DevFrm\Work\Frm_WorkTechniqueShow.resx">
<DependentUpon>Frm_WorkTechniqueShow.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\Frm_WwLl.resx">
+ <DependentUpon>Frm_WwLl.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
<DependentUpon>showWwZhongTai.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\WW\UcWwBlclSelect.resx">
+ <DependentUpon>UcWwBlclSelect.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\CopyXls.resx">
<DependentUpon>CopyXls.cs</DependentUpon>
</EmbeddedResource>
--
Gitblit v1.9.3