From f09ac29b50b114b56ad9c26435b482339cf79057 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 17:00:06 +0800
Subject: [PATCH] 过站
---
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs | 13
DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.Designer.cs | 208 ++++++++++++
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 312 ++++++++++--------
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs | 68 +++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs | 3
DevApp/Gs.DevApp/App.config | 5
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx | 17 +
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 69 +++-
/dev/null | 123 -------
DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.resx | 3
DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.cs | 124 +++++++
DevApp/Gs.DevApp/Program.cs | 4
DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs | 18 +
14 files changed, 670 insertions(+), 306 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 973ebc5..3a2e3c0 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -35,9 +35,9 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://localhost:5263/" />
<!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
@@ -46,6 +46,7 @@
<add key="AutoUpdaterXml" value="http://192.168.1.145:86/AutoUpdater/AutoUpdater.xml" />
<add key="ToastSeconds" value="5" />
<add key="AsyncSeconds" value="2" />
+ <add key="IsWater" value="0" />
</appSettings>
<userSettings>
<Gs.DevApp.Properties.Settings>
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs
deleted file mode 100644
index b579993..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.Designer.cs
+++ /dev/null
@@ -1,1440 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.BarCode
-{
- partial class Frm_BoxCode
- {
- /// <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.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- 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.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.gcMain1 = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_org = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_isZxbg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.txt_orgId = new Gs.DevApp.UserControl.UcLookOrg();
- this.txt_taskNo = new DevExpress.XtraEditors.ButtonEdit();
- this.txt_cusId = new Gs.DevApp.UserControl.UcLookCustomer();
- this.txt_isSource = new DevExpress.XtraEditors.RadioGroup();
- this.lbGuid = new System.Windows.Forms.Label();
- this.txt_dwmc = new DevExpress.XtraEditors.TextEdit();
- this.txt_lotNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_memo = new DevExpress.XtraEditors.TextEdit();
- this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_daaSumQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_daaSyQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_quantity = new DevExpress.XtraEditors.TextEdit();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.txt_cusDh = new DevExpress.XtraEditors.TextEdit();
- this.txt_saleDh = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
- this.txt_extDate = new DevExpress.XtraEditors.DateEdit();
- this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.瀹㈡埛鍚嶇О = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
- this.split1.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
- this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- this.xtraTabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
- this.splitMx1.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
- this.splitMx1.Panel2.SuspendLayout();
- this.splitMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
- this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isSource.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dwmc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daaSumQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daaSyQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cusDh.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_saleDh.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.瀹㈡埛鍚嶇О)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- this.SuspendLayout();
- //
- // toolBarMenu1
- //
- this.toolBarMenu1.chkParameter = null;
- this.toolBarMenu1.currentAction = null;
- this.toolBarMenu1.defaultActions = null;
- this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
- this.toolBarMenu1.guidKey = null;
- this.toolBarMenu1.isSetBtn = false;
- this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
- this.toolBarMenu1.TabIndex = 0;
- this.toolBarMenu1.xlsInService = null;
- this.toolBarMenu1.xlsOutParameter = null;
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
- //
- // split1
- //
- this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.split1.Horizontal = false;
- this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Name = "split1";
- //
- // split1.Panel1
- //
- this.split1.Panel1.Controls.Add(this.gcMain1);
- this.split1.Panel1.Controls.Add(this.pageBar1);
- this.split1.Panel1.Text = "Panel1";
- //
- // split1.Panel2
- //
- this.split1.Panel2.Text = "Panel2";
- this.split1.Size = new System.Drawing.Size(1126, 570);
- this.split1.SplitterPosition = 558;
- this.split1.TabIndex = 0;
- //
- // gcMain1
- //
- this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Location = new System.Drawing.Point(0, 0);
- this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1126, 519);
- this.gcMain1.TabIndex = 2;
- this.gcMain1.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.gv_org,
- this.gridColumn1,
- this.gv_lineNo,
- this.gv_name,
- this.gv_remark,
- this.gv_createBy,
- this.gv_createDate,
- this.gv_lastupdateBy,
- this.gv_lastupdateDate,
- this.gv_lineType,
- this.gv_isZxbg});
- this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gv_org
- //
- this.gv_org.AppearanceCell.Options.UseFont = true;
- this.gv_org.Caption = "浣跨敤缁勭粐";
- this.gv_org.FieldName = "fSubsidiary";
- this.gv_org.MinWidth = 50;
- this.gv_org.Name = "gv_org";
- this.gv_org.OptionsColumn.AllowEdit = false;
- this.gv_org.Tag = "org.fnamber";
- this.gv_org.Visible = true;
- this.gv_org.VisibleIndex = 0;
- this.gv_org.Width = 254;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "鎵�鍦ㄩ儴闂�";
- this.gridColumn1.FieldName = "departName";
- this.gridColumn1.MinWidth = 60;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Tag = "query_a.departName";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
- //
- // gv_lineNo
- //
- this.gv_lineNo.AppearanceCell.Options.UseFont = true;
- this.gv_lineNo.Caption = "浜х嚎缂栧彿";
- this.gv_lineNo.FieldName = "lineNo";
- this.gv_lineNo.MinWidth = 50;
- this.gv_lineNo.Name = "gv_lineNo";
- this.gv_lineNo.OptionsColumn.AllowEdit = false;
- this.gv_lineNo.Tag = "query_a.line_no";
- this.gv_lineNo.Visible = true;
- this.gv_lineNo.VisibleIndex = 2;
- this.gv_lineNo.Width = 82;
- //
- // gv_name
- //
- this.gv_name.AppearanceCell.Options.UseFont = true;
- this.gv_name.Caption = "浜х嚎鍚嶇О";
- this.gv_name.FieldName = "name";
- this.gv_name.MinWidth = 60;
- this.gv_name.Name = "gv_name";
- this.gv_name.OptionsColumn.AllowEdit = false;
- this.gv_name.Tag = "query_a.name";
- this.gv_name.Visible = true;
- this.gv_name.VisibleIndex = 3;
- this.gv_name.Width = 100;
- //
- // gv_remark
- //
- this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞";
- this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
- this.gv_remark.Name = "gv_remark";
- this.gv_remark.OptionsColumn.AllowEdit = false;
- this.gv_remark.Tag = "query_a.remark";
- this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 4;
- this.gv_remark.Width = 79;
- //
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "寤虹珛鑰�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
- this.gv_createBy.Width = 63;
- //
- // gv_createDate
- //
- this.gv_createDate.AppearanceCell.Options.UseFont = true;
- this.gv_createDate.Caption = "寤虹珛鏃堕棿";
- this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 180;
- this.gv_createDate.Name = "gv_createDate";
- this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "query_a.create_date";
- this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 6;
- this.gv_createDate.Width = 180;
- //
- // gv_lastupdateBy
- //
- this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateBy.Caption = "鏇存柊鑰�";
- this.gv_lastupdateBy.FieldName = "lastupdateBy";
- this.gv_lastupdateBy.MinWidth = 50;
- this.gv_lastupdateBy.Name = "gv_lastupdateBy";
- this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 7;
- this.gv_lastupdateBy.Width = 63;
- //
- // gv_lastupdateDate
- //
- this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿";
- this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 180;
- this.gv_lastupdateDate.Name = "gv_lastupdateDate";
- this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
- this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 8;
- this.gv_lastupdateDate.Width = 180;
- //
- // gv_lineType
- //
- this.gv_lineType.AppearanceCell.Options.UseFont = true;
- this.gv_lineType.Caption = "绾夸綋绫诲埆";
- this.gv_lineType.FieldName = "lineType";
- this.gv_lineType.MinWidth = 80;
- this.gv_lineType.Name = "gv_lineType";
- this.gv_lineType.OptionsColumn.AllowEdit = false;
- this.gv_lineType.Tag = "query_a.line_type";
- this.gv_lineType.Visible = true;
- this.gv_lineType.VisibleIndex = 9;
- this.gv_lineType.Width = 80;
- //
- // gv_isZxbg
- //
- this.gv_isZxbg.AppearanceCell.Options.UseFont = true;
- this.gv_isZxbg.Caption = "鏁寸嚎鎶ュ伐";
- this.gv_isZxbg.FieldName = "isZxbg";
- this.gv_isZxbg.MinWidth = 50;
- this.gv_isZxbg.Name = "gv_isZxbg";
- this.gv_isZxbg.OptionsColumn.AllowEdit = false;
- this.gv_isZxbg.Tag = "query_a.is_zxbg";
- this.gv_isZxbg.Visible = true;
- this.gv_isZxbg.VisibleIndex = 10;
- this.gv_isZxbg.Width = 50;
- //
- // 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.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
- //
- // splitMx1
- //
- this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitMx1.Horizontal = false;
- this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";
- //
- // splitMx1.Panel1
- //
- this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
- this.splitMx1.Panel1.Text = "Panel1";
- //
- // splitMx1.Panel2
- //
- this.splitMx1.Panel2.Controls.Add(this.tabMx);
- this.splitMx1.Panel2.Text = "Panel2";
- this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 201;
- this.splitMx1.TabIndex = 0;
- //
- // layoutMx1
- //
- this.layoutMx1.Controls.Add(this.txt_orgId);
- this.layoutMx1.Controls.Add(this.txt_taskNo);
- this.layoutMx1.Controls.Add(this.txt_cusId);
- this.layoutMx1.Controls.Add(this.txt_isSource);
- this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_dwmc);
- this.layoutMx1.Controls.Add(this.txt_lotNo);
- this.layoutMx1.Controls.Add(this.txt_lastupdateDate);
- this.layoutMx1.Controls.Add(this.txt_memo);
- this.layoutMx1.Controls.Add(this.txt_lastupdateBy);
- this.layoutMx1.Controls.Add(this.txt_daaSumQty);
- this.layoutMx1.Controls.Add(this.txt_daaSyQty);
- this.layoutMx1.Controls.Add(this.txt_quantity);
- this.layoutMx1.Controls.Add(this.txt_psnQty_1);
- this.layoutMx1.Controls.Add(this.txt_iCount_1);
- this.layoutMx1.Controls.Add(this.txt_cusDh);
- this.layoutMx1.Controls.Add(this.txt_saleDh);
- this.layoutMx1.Controls.Add(this.txt_itemId);
- this.layoutMx1.Controls.Add(this.txt_itemName);
- this.layoutMx1.Controls.Add(this.txt_itemModel);
- this.layoutMx1.Controls.Add(this.txt_extDate);
- this.layoutMx1.Controls.Add(this.txt_itemNo);
- this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem9});
- this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(713, 530, 812, 500);
- this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 201);
- this.layoutMx1.TabIndex = 0;
- this.layoutMx1.Text = "layoutControl1";
- //
- // txt_orgId
- //
- this.txt_orgId.IsReadly = false;
- this.txt_orgId.Location = new System.Drawing.Point(99, 12);
- this.txt_orgId.Name = "txt_orgId";
- this.txt_orgId.Size = new System.Drawing.Size(180, 24);
- this.txt_orgId.TabIndex = 549;
- //
- // txt_taskNo
- //
- this.txt_taskNo.Location = new System.Drawing.Point(99, 76);
- this.txt_taskNo.Name = "txt_taskNo";
- this.txt_taskNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_taskNo.Size = new System.Drawing.Size(180, 24);
- this.txt_taskNo.StyleController = this.layoutMx1;
- this.txt_taskNo.TabIndex = 546;
- //
- // txt_cusId
- //
- this.txt_cusId.IsReadly = false;
- this.txt_cusId.Location = new System.Drawing.Point(641, 12);
- this.txt_cusId.Name = "txt_cusId";
- this.txt_cusId.Size = new System.Drawing.Size(180, 24);
- this.txt_cusId.TabIndex = 545;
- //
- // txt_isSource
- //
- this.txt_isSource.EditValue = "1";
- this.txt_isSource.Location = new System.Drawing.Point(99, 42);
- this.txt_isSource.Margin = new System.Windows.Forms.Padding(0);
- this.txt_isSource.MaximumSize = new System.Drawing.Size(0, 26);
- this.txt_isSource.Name = "txt_isSource";
- this.txt_isSource.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
- new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夊伐鍗�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犲伐鍗�")});
- this.txt_isSource.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_isSource.Size = new System.Drawing.Size(180, 26);
- this.txt_isSource.StyleController = this.layoutMx1;
- this.txt_isSource.TabIndex = 534;
- //
- // lbGuid
- //
- this.lbGuid.Location = new System.Drawing.Point(554, 107);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(267, 28);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Text = "lbGuid";
- this.lbGuid.Visible = false;
- //
- // txt_dwmc
- //
- this.txt_dwmc.Location = new System.Drawing.Point(641, 108);
- this.txt_dwmc.Name = "txt_dwmc";
- this.txt_dwmc.Properties.Appearance.Options.UseFont = true;
- this.txt_dwmc.Size = new System.Drawing.Size(180, 24);
- this.txt_dwmc.StyleController = this.layoutMx1;
- this.txt_dwmc.TabIndex = 216;
- this.txt_dwmc.Tag = "readonly";
- //
- // txt_lotNo
- //
- this.txt_lotNo.Location = new System.Drawing.Point(370, 140);
- this.txt_lotNo.Name = "txt_lotNo";
- this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(180, 24);
- this.txt_lotNo.StyleController = this.layoutMx1;
- this.txt_lotNo.TabIndex = 217;
- //
- // txt_lastupdateDate
- //
- this.txt_lastupdateDate.Location = new System.Drawing.Point(912, 44);
- this.txt_lastupdateDate.Name = "txt_lastupdateDate";
- this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(181, 24);
- this.txt_lastupdateDate.StyleController = this.layoutMx1;
- this.txt_lastupdateDate.TabIndex = 231;
- this.txt_lastupdateDate.Tag = "readonly";
- //
- // txt_memo
- //
- this.txt_memo.Location = new System.Drawing.Point(912, 76);
- this.txt_memo.Name = "txt_memo";
- this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(181, 24);
- this.txt_memo.StyleController = this.layoutMx1;
- this.txt_memo.TabIndex = 219;
- //
- // txt_lastupdateBy
- //
- this.txt_lastupdateBy.Location = new System.Drawing.Point(912, 12);
- this.txt_lastupdateBy.Name = "txt_lastupdateBy";
- this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(181, 24);
- this.txt_lastupdateBy.StyleController = this.layoutMx1;
- this.txt_lastupdateBy.TabIndex = 228;
- this.txt_lastupdateBy.Tag = "readonly";
- //
- // txt_daaSumQty
- //
- this.txt_daaSumQty.Location = new System.Drawing.Point(99, 108);
- this.txt_daaSumQty.Name = "txt_daaSumQty";
- this.txt_daaSumQty.Size = new System.Drawing.Size(180, 24);
- this.txt_daaSumQty.StyleController = this.layoutMx1;
- this.txt_daaSumQty.TabIndex = 535;
- this.txt_daaSumQty.Tag = "readonly";
- //
- // txt_daaSyQty
- //
- this.txt_daaSyQty.Location = new System.Drawing.Point(99, 140);
- this.txt_daaSyQty.Name = "txt_daaSyQty";
- this.txt_daaSyQty.Size = new System.Drawing.Size(180, 24);
- this.txt_daaSyQty.StyleController = this.layoutMx1;
- this.txt_daaSyQty.TabIndex = 536;
- this.txt_daaSyQty.Tag = "readonly";
- //
- // txt_quantity
- //
- this.txt_quantity.Location = new System.Drawing.Point(99, 172);
- this.txt_quantity.Name = "txt_quantity";
- this.txt_quantity.Size = new System.Drawing.Size(180, 24);
- this.txt_quantity.StyleController = this.layoutMx1;
- this.txt_quantity.TabIndex = 537;
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(370, 172);
- this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Size = new System.Drawing.Size(180, 24);
- this.txt_psnQty_1.StyleController = this.layoutMx1;
- this.txt_psnQty_1.TabIndex = 538;
- //
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(641, 172);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Size = new System.Drawing.Size(180, 24);
- this.txt_iCount_1.StyleController = this.layoutMx1;
- this.txt_iCount_1.TabIndex = 539;
- //
- // txt_cusDh
- //
- this.txt_cusDh.Location = new System.Drawing.Point(641, 44);
- this.txt_cusDh.Name = "txt_cusDh";
- this.txt_cusDh.Size = new System.Drawing.Size(180, 24);
- this.txt_cusDh.StyleController = this.layoutMx1;
- this.txt_cusDh.TabIndex = 540;
- //
- // txt_saleDh
- //
- this.txt_saleDh.Location = new System.Drawing.Point(641, 76);
- this.txt_saleDh.Name = "txt_saleDh";
- this.txt_saleDh.Size = new System.Drawing.Size(180, 24);
- this.txt_saleDh.StyleController = this.layoutMx1;
- this.txt_saleDh.TabIndex = 541;
- //
- // txt_itemId
- //
- this.txt_itemId.Location = new System.Drawing.Point(370, 12);
- this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_itemId.Size = new System.Drawing.Size(180, 24);
- this.txt_itemId.StyleController = this.layoutMx1;
- this.txt_itemId.TabIndex = 542;
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(370, 76);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(180, 24);
- this.txt_itemName.StyleController = this.layoutMx1;
- this.txt_itemName.TabIndex = 543;
- this.txt_itemName.Tag = "readonly";
- //
- // txt_itemModel
- //
- this.txt_itemModel.Location = new System.Drawing.Point(370, 108);
- this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(180, 24);
- this.txt_itemModel.StyleController = this.layoutMx1;
- this.txt_itemModel.TabIndex = 544;
- this.txt_itemModel.Tag = "readonly";
- //
- // txt_extDate
- //
- this.txt_extDate.EditValue = null;
- this.txt_extDate.Location = new System.Drawing.Point(641, 140);
- this.txt_extDate.Name = "txt_extDate";
- this.txt_extDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_extDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_extDate.Size = new System.Drawing.Size(180, 24);
- this.txt_extDate.StyleController = this.layoutMx1;
- this.txt_extDate.TabIndex = 547;
- //
- // txt_itemNo
- //
- this.txt_itemNo.Location = new System.Drawing.Point(370, 44);
- this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(180, 24);
- this.txt_itemNo.StyleController = this.layoutMx1;
- this.txt_itemNo.TabIndex = 548;
- this.txt_itemNo.Tag = "readonly";
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.lbGuid;
- this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem9.Text = "lbGuid";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem9.TextVisible = false;
- //
- // Root
- //
- this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- this.Root.GroupBordersVisible = false;
- this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem7,
- this.layoutControlItem5,
- this.layoutControlItem6,
- this.layoutControlItem12,
- this.layoutControlItem1,
- this.layoutControlItem11,
- this.layoutControlItem21,
- this.layoutControlItem15,
- this.layoutControlItem19,
- this.layoutControlItem8,
- this.layoutControlItem20,
- this.瀹㈡埛鍚嶇О,
- this.layoutControlItem17,
- this.layoutControlItem18,
- this.layoutControlItem2,
- this.layoutControlItem16,
- this.layoutControlItem13,
- this.layoutControlItem14,
- this.layoutControlItem3,
- this.layoutControlItem10,
- this.layoutControlItem4});
- this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
- this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- 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;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1105, 212);
- this.Root.TextVisible = false;
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_itemId;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem7.Text = "閫夋嫨浜у搧";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_lastupdateBy;
- this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem5.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_lastupdateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(813, 32);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem6.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_daaSumQty;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem12.Text = "宸ュ崟鎬婚噺";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem1
- //
- this.layoutControlItem1.Control = this.txt_taskNo;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem1.Text = "閫夋嫨宸ュ崟";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_isSource;
- this.layoutControlItem11.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem11.Text = "閫夋嫨鏉ユ簮";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_orgId;
- this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem21.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_psnQty_1;
- this.layoutControlItem15.Location = new System.Drawing.Point(271, 160);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "鍐呭寘瑁呮暟閲�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem19
- //
- this.layoutControlItem19.Control = this.txt_itemModel;
- this.layoutControlItem19.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem19.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_itemName;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem8.Text = "浜у搧鍚嶇О";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_itemNo;
- this.layoutControlItem20.Location = new System.Drawing.Point(271, 32);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem20.Text = "浜у搧缂栫爜";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
- //
- // 瀹㈡埛鍚嶇О
- //
- this.瀹㈡埛鍚嶇О.Control = this.txt_cusId;
- this.瀹㈡埛鍚嶇О.Location = new System.Drawing.Point(542, 0);
- this.瀹㈡埛鍚嶇О.Name = "瀹㈡埛鍚嶇О";
- this.瀹㈡埛鍚嶇О.OptionsTableLayoutItem.ColumnIndex = 2;
- this.瀹㈡埛鍚嶇О.Size = new System.Drawing.Size(271, 32);
- this.瀹㈡埛鍚嶇О.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_cusDh;
- this.layoutControlItem17.Location = new System.Drawing.Point(542, 32);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem17.Text = "瀹㈡埛鍗曞彿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_saleDh;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem18.Text = "閿�鍞崟鍙�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_dwmc;
- this.layoutControlItem2.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem2.Text = "鍗曚綅";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_iCount_1;
- this.layoutControlItem16.Location = new System.Drawing.Point(542, 160);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem16.Text = "鎵撳嵃鏁伴噺";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_daaSyQty;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 128);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem13.Text = "鍓╀綑鏁伴噺";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_quantity;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 160);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem14.Text = "鐢熶骇鏁伴噺";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 128);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem3.Text = "鐢熶骇鎵规";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_extDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(542, 128);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem10.Text = "鐢熶骇鏃ユ湡";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_memo;
- this.layoutControlItem4.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem4.Text = "鏍囪";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
- //
- // tabMx
- //
- this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 357);
- this.tabMx.TabIndex = 4;
- this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
- //
- // tabMxPage1
- //
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 325);
- this.tabMxPage1.Text = "娴佹按鐮佹槑缁�";
- //
- // gcMx1
- //
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
- this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Name = "gcMx1";
- this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 325);
- this.gcMx1.TabIndex = 1;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
- //
- // gvMx1
- //
- this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.Appearance.Row.Options.UseFont = true;
- this.gvMx1.ColumnPanelRowHeight = 50;
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx2guid,
- this.gridColumn20,
- this.gridColumn19,
- this.gvMx2itemBarcode,
- this.gvMx2quantity,
- this.gvMx2unit,
- this.gridColumn18,
- this.gvMx2itemSname,
- this.gridColumn17,
- this.gvMx2createBy,
- this.gvMx2createDate,
- this.gridColumn28,
- this.gridColumn29,
- this.gridColumn30,
- this.gridColumn31,
- this.gridColumn32,
- this.gvBtnAlawys});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
- //
- // gvMx2guid
- //
- this.gvMx2guid.AppearanceCell.Options.UseFont = true;
- this.gvMx2guid.Caption = "guid ";
- this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 50;
- this.gvMx2guid.Name = "gvMx2guid";
- this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 94;
- //
- // gridColumn20
- //
- this.gridColumn20.Caption = "鎶ュ伐鏍囪瘑";
- this.gridColumn20.FieldName = "isBg";
- this.gridColumn20.MaxWidth = 50;
- this.gridColumn20.MinWidth = 50;
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 0;
- this.gridColumn20.Width = 50;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
- this.gridColumn19.FieldName = "isRk";
- this.gridColumn19.MaxWidth = 50;
- this.gridColumn19.MinWidth = 50;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 1;
- this.gridColumn19.Width = 50;
- //
- // gvMx2itemBarcode
- //
- this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜 ";
- this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 50;
- this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
- this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
- this.gvMx2itemBarcode.Visible = true;
- this.gvMx2itemBarcode.VisibleIndex = 2;
- this.gvMx2itemBarcode.Width = 94;
- //
- // gvMx2quantity
- //
- this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
- this.gvMx2quantity.Caption = "鏁伴噺 ";
- this.gvMx2quantity.FieldName = "quantity";
- this.gvMx2quantity.MinWidth = 50;
- this.gvMx2quantity.Name = "gvMx2quantity";
- this.gvMx2quantity.Tag = "query_a.QUANTITY";
- this.gvMx2quantity.Visible = true;
- this.gvMx2quantity.VisibleIndex = 3;
- this.gvMx2quantity.Width = 94;
- //
- // gvMx2unit
- //
- this.gvMx2unit.AppearanceCell.Options.UseFont = true;
- this.gvMx2unit.Caption = "鍗曚綅 ";
- this.gvMx2unit.FieldName = "dwName";
- this.gvMx2unit.MinWidth = 50;
- this.gvMx2unit.Name = "gvMx2unit";
- this.gvMx2unit.Tag = "query_a.UNIT";
- this.gvMx2unit.Visible = true;
- this.gvMx2unit.VisibleIndex = 4;
- this.gvMx2unit.Width = 94;
- //
- // gridColumn18
- //
- this.gridColumn18.Caption = "鐗╂枡缂栫爜";
- this.gridColumn18.FieldName = "itemNo";
- this.gridColumn18.MinWidth = 25;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 5;
- this.gridColumn18.Width = 94;
- //
- // gvMx2itemSname
- //
- this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
- this.gvMx2itemSname.FieldName = "itemName";
- this.gvMx2itemSname.MinWidth = 50;
- this.gvMx2itemSname.Name = "gvMx2itemSname";
- this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
- this.gvMx2itemSname.Visible = true;
- this.gvMx2itemSname.VisibleIndex = 6;
- this.gvMx2itemSname.Width = 94;
- //
- // gridColumn17
- //
- this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn17.FieldName = "itemModel";
- this.gridColumn17.MinWidth = 25;
- this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 7;
- this.gridColumn17.Width = 94;
- //
- // gvMx2createBy
- //
- this.gvMx2createBy.AppearanceCell.Options.UseFont = true;
- this.gvMx2createBy.Caption = "鍒涘缓浜� ";
- this.gvMx2createBy.FieldName = "createBy";
- this.gvMx2createBy.MinWidth = 50;
- this.gvMx2createBy.Name = "gvMx2createBy";
- this.gvMx2createBy.Tag = "query_a.CREATE_BY";
- this.gvMx2createBy.Visible = true;
- this.gvMx2createBy.VisibleIndex = 8;
- this.gvMx2createBy.Width = 94;
- //
- // gvMx2createDate
- //
- this.gvMx2createDate.AppearanceCell.Options.UseFont = true;
- this.gvMx2createDate.Caption = "鍒涘缓鏃堕棿 ";
- this.gvMx2createDate.FieldName = "createDate";
- this.gvMx2createDate.MinWidth = 50;
- this.gvMx2createDate.Name = "gvMx2createDate";
- this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
- this.gvMx2createDate.Visible = true;
- this.gvMx2createDate.VisibleIndex = 9;
- this.gvMx2createDate.Width = 94;
- //
- // gridColumn28
- //
- this.gridColumn28.Caption = "鎶ュ伐浜�";
- this.gridColumn28.FieldName = "bgYg";
- this.gridColumn28.MinWidth = 25;
- this.gridColumn28.Name = "gridColumn28";
- this.gridColumn28.Visible = true;
- this.gridColumn28.VisibleIndex = 10;
- this.gridColumn28.Width = 94;
- //
- // gridColumn29
- //
- this.gridColumn29.Caption = "鎶ュ伐鏃堕棿";
- this.gridColumn29.FieldName = "bgTime";
- this.gridColumn29.MinWidth = 25;
- this.gridColumn29.Name = "gridColumn29";
- this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 11;
- this.gridColumn29.Width = 94;
- //
- // gridColumn30
- //
- this.gridColumn30.Caption = "鍏ュ簱浜�";
- this.gridColumn30.FieldName = "rkUser";
- this.gridColumn30.MinWidth = 25;
- this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 12;
- this.gridColumn30.Width = 94;
- //
- // gridColumn31
- //
- this.gridColumn31.Caption = "鍏ュ簱鏃ユ湡";
- this.gridColumn31.FieldName = "rkDate";
- this.gridColumn31.MinWidth = 25;
- this.gridColumn31.Name = "gridColumn31";
- this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 13;
- this.gridColumn31.Width = 94;
- //
- // gridColumn32
- //
- this.gridColumn32.Caption = "鍏ュ簱浣�";
- this.gridColumn32.FieldName = "rkPositon";
- this.gridColumn32.MinWidth = 25;
- this.gridColumn32.Name = "gridColumn32";
- this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 14;
- this.gridColumn32.Width = 94;
- //
- // gvBtnAlawys
- //
- this.gvBtnAlawys.Caption = "绉诲嚭";
- this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvBtnAlawys.MinWidth = 25;
- this.gvBtnAlawys.Name = "gvBtnAlawys";
- this.gvBtnAlawys.Visible = true;
- this.gvBtnAlawys.VisibleIndex = 15;
- this.gvBtnAlawys.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- //
- // Frm_BoxCode
- //
- 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.xtraTabControl1);
- this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_BoxCode";
- this.Text = "鎵樻澘鐮佺鐞�";
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
- this.split1.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
- this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- this.xtraTabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
- this.splitMx1.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
- this.splitMx1.Panel2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
- this.splitMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
- this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_taskNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isSource.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_dwmc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lotNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daaSumQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daaSyQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cusDh.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_saleDh.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties.CalendarTimeProperties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_extDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.瀹㈡埛鍚嶇О)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- this.ResumeLayout(false);
-
- }
- #endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraEditors.SplitContainerControl split1;
- private DevExpress.XtraGrid.GridControl gcMain1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_org;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lineNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_name;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isZxbg;
- private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private DevExpress.XtraEditors.SplitContainerControl splitMx1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
- private DevExpress.XtraEditors.TextEdit txt_memo;
- private DevExpress.XtraEditors.TextEdit txt_lotNo;
- private DevExpress.XtraEditors.TextEdit txt_dwmc;
- private DevExpress.XtraLayout.LayoutControl layoutMx1;
- private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.RadioGroup txt_isSource;
- private DevExpress.XtraEditors.TextEdit txt_daaSumQty;
- private DevExpress.XtraEditors.TextEdit txt_daaSyQty;
- private DevExpress.XtraEditors.TextEdit txt_quantity;
- private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.TextEdit txt_cusDh;
- private DevExpress.XtraEditors.TextEdit txt_saleDh;
- private DevExpress.XtraEditors.ButtonEdit txt_itemId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private UserControl.UcLookCustomer txt_cusId;
- private DevExpress.XtraEditors.TextEdit txt_itemName;
- private DevExpress.XtraEditors.TextEdit txt_itemModel;
- private DevExpress.XtraEditors.ButtonEdit txt_taskNo;
- private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
- private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraEditors.DateEdit txt_extDate;
- private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private UserControl.UcLookOrg txt_orgId;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem 瀹㈡埛鍚嶇О;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs
deleted file mode 100644
index aa3aa73..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.cs
+++ /dev/null
@@ -1,415 +0,0 @@
-锘縰sing Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.BarCode
-{
- public partial class Frm_BoxCode : DevExpress.XtraEditors.XtraForm
- {
- string _webServiceName = "Box/";
- List<FilterEntity> _filterList = new List<FilterEntity>();
- public Frm_BoxCode()
- {
- InitializeComponent();
- this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
- this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
- this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- }, tips);
- Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
- {
- getModel(value);
- }, (value) =>
- {
- getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
- getPageList(1);
- pageBar1.PagerEvent += PageBar1_PagerEvent;
- txt_itemId.Click += (s, e) =>
- {
- string _orgId = txt_orgId.GetId();
- var frm = new SelectBoxItem(_orgId);
- frm.UpdateParent += (ss, ee) =>
- {
- try
- {
- var lst = new List<dynamic>();
- lst = ee.DynamicList;
- txt_itemId.Text = lst[0].itemId;
- txt_itemModel.Text = lst[0].itemModel;
- txt_itemName.Text = lst[0].itemName;
- txt_itemNo.Text = lst[0].itemNo;
- txt_lotNo.Text = lst[0].gdbh;
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- };
- frm.ShowDialog();
- };
- txt_taskNo.Click += (s, e) =>
- {
- string _orgId = txt_orgId.GetId();
- var frm = new SelectBoxDaa(_orgId);
- frm.UpdateParent += (ss, ee) =>
- {
- try
- {
- var lst = new List<dynamic>();
- lst = ee.DynamicList;
- txt_itemId.Text = lst[0].itemId;
- txt_itemModel.Text = lst[0].itemModel;
- txt_itemName.Text = lst[0].itemName;
- txt_itemNo.Text = lst[0].itemNo;
- txt_lotNo.Text = lst[0].gdbh;
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message);
- }
- };
- frm.ShowDialog();
- };
- }
- private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- await Task.Delay(100);
- getPageList(1);
- }
-
- /// <summary>
- /// 鍒嗛〉浜嬩欢
- /// </summary>
- /// <param name="curPage"></param>
- /// <param name="pageSize"></param>
- private void PageBar1_PagerEvent(int curPage, int pageSize)
- {
- getPageList(curPage);
- }
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
- }
-
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
- }
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_dwmc, gridView1, "lineNo");
- if (string.IsNullOrEmpty(rowGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
- return;
- List<dynamic> lst = new List<dynamic>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- { }
- else
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
- getPageList(this.pageBar1.CurrentPage);
- }
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
- {
- //_filterList.Clear();
- //if (gridView1.ActiveFilter.Count > 0)
- //{
- // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- // gridView1.ActiveFilter.Clear();
- // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- //}
- //getPageList(1);
- getPageList(this.pageBar1.CurrentPage);
- }
- }
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_lotNo, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- {
- getModel(rowGuid);
- }
- else
- {
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
- }
- }
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- lbGuid.Text = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
- UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
- }
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- string _txt_orgId = txt_orgId.GetId();
- string _txt_taskNo = txt_taskNo.Text.Trim();
- string _txt_itemId = txt_itemId.Text.Trim();
- string _txt_lotNo = txt_lotNo.Text.Trim();
- string _txt_cusId = txt_cusId.GetId();
- string _txt_cusDh = txt_cusDh.Text.Trim();
- string _txt_saleDh = txt_saleDh.Text.Trim();
- string _txt_memo = txt_memo.Text.Trim();
- string _txt_extDate = txt_extDate.Text;
- string _txt_quantity = txt_quantity.Text.Trim();
- string _txt_psnQty_1 = txt_psnQty_1.Text.Trim();
- string _txt_iCount_1 = txt_iCount_1.Text.Trim();
- if (string.IsNullOrEmpty(_txt_orgId.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("缁勭粐涓嶈兘涓虹┖锛�");
- txt_orgId.Focus();
- return;
- }
- if (txt_isSource.SelectedIndex == 0)
- {
- if (_txt_taskNo.Trim().Length <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨宸ュ崟锛�");
- txt_taskNo.Focus();
- return;
- }
- }
- if (string.IsNullOrEmpty(_txt_itemId.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("浜у搧ID涓嶈兘涓虹┖锛�");
- txt_itemId.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_quantity.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鐢熶骇鏁伴噺涓嶈兘涓虹┖锛�");
- txt_quantity.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_psnQty_1.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鍐呭寘瑁呮暟閲忎笉鑳戒负绌猴紒");
- txt_psnQty_1.Focus();
- return;
- }
- if (string.IsNullOrEmpty(_txt_iCount_1.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("鎵撳嵃鏁伴噺涓嶈兘涓虹┖锛�");
- txt_iCount_1.Focus();
- return;
- }
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- orgId = _txt_orgId,
- taskNo = _txt_taskNo,
- itemId = _txt_itemId,
- lotNo = _txt_lotNo,
- cusId = _txt_cusId,
- cusDh = _txt_cusDh,
- saleDh = _txt_saleDh,
- memo = _txt_memo,
- extDate = _txt_extDate,
- //
- quantity = _txt_quantity,
- psnQty_1 = _txt_psnQty_1,
- iCount_1 = _txt_iCount_1,
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData.outGuid;
- toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
- toolBarMenu1.currentAction = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,c.departmentcode asc,a.line_no",
- "asc", "", _sbSqlWhere.ToString());
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain1.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- if (dt.Rows.Count > 0)
- {
- gcMain1.DataSource = dt;
- gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- }
- else
- UtilityHelper.SetDefaultTable(gcMain1, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- /// <summary>
- ///
- /// </summary>
- /// <param name="strGuid">涓婚敭</param>
- /// <param name="isEdit">鏄惁鍙紪杈�</param>
- /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
- private void getModel(string strGuid)
- {
- bool isEdit = false;
- if (toolBarMenu1.currentAction == "add") return;
- if (toolBarMenu1.currentAction == "edit") isEdit = true;
- if (string.IsNullOrEmpty(strGuid))
- {
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- var _obj = new
- {
- guid = strGuid,//涓诲缓
- };
- try
- {
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- dynamic dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
- UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
- }
- else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs
deleted file mode 100644
index bd76296..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.Designer.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.BarCode
-{
- partial class SelectBoxDaa
- {
- /// <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()
- {
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn1 = 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.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
- this.gcMain.Size = new System.Drawing.Size(581, 489);
- this.gcMain.TabIndex = 3;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn7,
- this.gridColumn1,
- this.gridColumn2,
- this.gridColumn3,
- this.gridColumn4,
- this.gridColumn5,
- this.gridColumn6,
- this.gv_Btn});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gv_Btn
- //
- this.gv_Btn.Caption = "閫夋嫨";
- this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gv_Btn.MinWidth = 25;
- this.gv_Btn.Name = "gv_Btn";
- this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 6;
- this.gv_Btn.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "浜х嚎";
- this.gridColumn1.FieldName = "lineName";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "宸ュ崟缂栧彿";
- this.gridColumn2.FieldName = "gdbh";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "浜у搧ID";
- this.gridColumn3.FieldName = "itemId";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "浜у搧缂栫爜";
- this.gridColumn4.FieldName = "itemNo";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 4;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "浜у搧鍚嶇О";
- this.gridColumn5.FieldName = "itemName";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 94;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "涓婚敭Guid";
- this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 25;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 94;
- //
- // SelectFqcItem
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(581, 489);
- this.Controls.Add(this.gcMain);
- this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "SelectFqcItem";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨缁勭粐";
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- 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 gridColumn7;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs
deleted file mode 100644
index 395930e..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxDaa.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Windows.Forms;
-
-
-namespace Gs.DevApp.DevFrm.BarCode
-{
- public partial class SelectBoxDaa : DevExpress.XtraEditors.XtraForm
- {
- private readonly string _webServiceName = "FqcManager/";
- string orgId = "";
- public SelectBoxDaa(string _orgIdId)
- {
- InitializeComponent();
- this.orgId = _orgIdId;
- getPageList(1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
- }
-
- /// <summary>
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
- var _obj = new
- {
- currentPage = curPage,
- everyPageSize = 999999,
- sortName = "",
- keyWhere = "",
- lineId = this.orgId
- };
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "SelectFqcItem", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- if (dt.Rows.Count > 0)
- {
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- }
- else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- var rowhandle = gridView1.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gridView1.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (string.IsNullOrEmpty(mxGuid))
- {
- return;
- }
- var list = new List<dynamic>();
- list.Add(new
- {
- guid = dr["guid"].ToString(),
- itemId = dr["itemId"].ToString(),
- itemName = dr["itemName"].ToString(),
- itemNo = dr["itemNo"].ToString(),
- itemModel = dr["itemModel"].ToString(),
- gdbh = dr["gdbh"].ToString(),
- });
- UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
- Close();
- }
- }
-
- /// <summary>
- /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
- /// </summary>
- public event EventHandler<UpdateParentEventArgs> UpdateParent;
-
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs
deleted file mode 100644
index 76f3b9c..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.Designer.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.BarCode
-{
- partial class SelectBoxItem
- {
- /// <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()
- {
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn1 = 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.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- 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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
- this.gcMain.Size = new System.Drawing.Size(581, 489);
- this.gcMain.TabIndex = 3;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn7,
- this.gridColumn1,
- this.gridColumn2,
- this.gridColumn3,
- this.gridColumn4,
- this.gridColumn5,
- this.gridColumn6,
- this.gv_Btn});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gv_Btn
- //
- this.gv_Btn.Caption = "閫夋嫨";
- this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gv_Btn.MinWidth = 25;
- this.gv_Btn.Name = "gv_Btn";
- this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 6;
- this.gv_Btn.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x162;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "浜х嚎";
- this.gridColumn1.FieldName = "lineName";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "宸ュ崟缂栧彿";
- this.gridColumn2.FieldName = "gdbh";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
- this.gridColumn2.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "浜у搧ID";
- this.gridColumn3.FieldName = "itemId";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 3;
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "浜у搧缂栫爜";
- this.gridColumn4.FieldName = "itemNo";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 4;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "浜у搧鍚嶇О";
- this.gridColumn5.FieldName = "itemName";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 5;
- this.gridColumn5.Width = 94;
- //
- // gridColumn6
- //
- this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 25;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 6;
- this.gridColumn6.Width = 94;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "涓婚敭Guid";
- this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 25;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 94;
- //
- // SelectFqcItem
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(581, 489);
- this.Controls.Add(this.gcMain);
- this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "SelectFqcItem";
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夋嫨缁勭粐";
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- 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 gridColumn7;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs b/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs
deleted file mode 100644
index cea91de..0000000
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/SelectBoxItem.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-
-namespace Gs.DevApp.DevFrm.BarCode
-{
- public partial class SelectBoxItem : DevExpress.XtraEditors.XtraForm
- {
- private readonly string _webServiceName = "FqcManager/";
- string orgId = "";
- public SelectBoxItem(string _orgIdId)
- {
- InitializeComponent();
- this.orgId = _orgIdId;
- getPageList(1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
- }
-
- /// <summary>
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
- var _obj = new
- {
- currentPage = curPage,
- everyPageSize = 999999,
- sortName = "",
- keyWhere = "",
- lineId = this.orgId
- };
- var json = JsonConvert.SerializeObject(_obj);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "SelectFqcItem", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- if (dt.Rows.Count > 0)
- {
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- }
- else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
- {
- var rowhandle = gridView1.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gridView1.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (string.IsNullOrEmpty(mxGuid))
- {
- return;
- }
- var list = new List<dynamic>();
- list.Add(new
- {
- guid = dr["guid"].ToString(),
- itemId = dr["itemId"].ToString(),
- itemName = dr["itemName"].ToString(),
- itemNo = dr["itemNo"].ToString(),
- itemModel = dr["itemModel"].ToString(),
- gdbh = dr["gdbh"].ToString(),
- });
- UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
- Close();
- }
- }
-
- /// <summary>
- /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
- /// </summary>
- public event EventHandler<UpdateParentEventArgs> UpdateParent;
-
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
index 22d6a1e..536fb7e 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.Designer.cs
@@ -46,6 +46,12 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_UserBind));
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -54,11 +60,6 @@
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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -69,6 +70,11 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
this.isLocked = new DevExpress.XtraGrid.Columns.GridColumn();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -90,6 +96,8 @@
this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -154,6 +162,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -279,7 +288,8 @@
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit2,
this.repositoryItemButtonEdit3,
- this.repositoryItemButtonEdit4});
+ this.repositoryItemButtonEdit4,
+ this.repositoryItemButtonEdit1});
this.gcMain1.Size = new System.Drawing.Size(1002, 562);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -303,7 +313,8 @@
this.gridColumn3,
this.gridColumn4,
this.gridColumn1,
- this.gridColumn5});
+ this.gridColumn5,
+ this.gridColumn14});
gridFormatRule1.Column = this.isLocked;
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
@@ -483,6 +494,28 @@
this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit4.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit4_ButtonClick);
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "杩囩珯缁戝畾绾夸綋";
+ this.gridColumn14.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.ShowButtonMode = DevExpress.XtraGrid.Views.Base.ShowButtonModeEnum.ShowAlways;
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 12;
+ this.gridColumn14.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "杩囩珯缁戝畾绾夸綋", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
// pageBar1
//
@@ -881,10 +914,10 @@
// rptDel1
//
this.rptDel1.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel1.Name = "rptDel1";
this.rptDel1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel1_ButtonClick);
@@ -955,10 +988,10 @@
// rptDel2
//
this.rptDel2.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel2.Name = "rptDel2";
this.rptDel2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel2_ButtonClick);
@@ -1047,10 +1080,10 @@
// rptDel3
//
this.rptDel3.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptDel3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDel3.Name = "rptDel3";
this.rptDel3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptDel3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDel3_ButtonClick);
@@ -1077,6 +1110,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
@@ -1197,5 +1231,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDel3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
index a567822..7ca3a5a 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.cs
@@ -300,7 +300,22 @@
frm.ShowDialog();
}
}
-
+ /// <summary>
+ /// 杩囩珯鏃剁粦瀹氱嚎浣�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ if (e.Button.Index == 0)
+ {
+ var rowhandle = gridView1.FocusedRowHandle;
+ var dr = gridView1.GetDataRow(rowhandle);
+ var userGuid = dr["guid"].ToString();
+ var frm = new SelectLine(userGuid);
+ frm.ShowDialog();
+ }
+ }
/// <summary>
/// 鍒犻櫎pda
/// </summary>
@@ -364,5 +379,6 @@
}
}
}
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx
index 5160e8b..2f358ef 100644
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBind.resx
@@ -117,6 +117,23 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0VGl0
+ bGUAU2VjdGlvbkJyZWFrc0xpc3Q7Geg62AAAAlxJREFUOE+FkutLk3EUxx90blMqL9WLFhFBCBH0IvoP
+ CjRrYUH5wpFtuTIbY2uVZmUQRZSuZEhKhWUQQjeIgqKW05nZRe1C+DKCUteWm2v3Lfh2znPZi8egA1+e
+ C7/v5xx+3yMAyIuq8PzdKXoFEpk/iJO+h+KoPfEE0VRO1Hwyh8B8Co6eN2zQqAGaswNf2J8HsHlHy+MF
+ AFv3azZo1YCiM3c+s180x9I5/CbTtqOPyJgVFUlkMUuAJs8rNujUAO2p2x/Znzd/C8ZQ5XyIr4EYItQ9
+ TICZSAqNl/1s0KsButa+SfaLZh65yvEAW+z3sdl2D3PxLH6RpglgcQ+xoVhoH9iE/e5Kg6WzkgF61/X3
+ SNH4wWgaARKPOxtJUldJ06Qfc0k0XPIxoERovbkRVvc6NFxYa6AfWptn5KX96hgOd4/ikGcUB7tGYL3i
+ pybDsHQOYV+HD3svDqL+3NNBOq8TnL0b0POiGrXHVzGxgKcgLSGVySonVchaRlouPxeTNEJz13rsblsN
+ o2slT1Bwun/yOV9k260PaOmbwLEb43BdewdH71vwZBxfM03W2OH10XmdUNe+BjVOg6HGsYK+haKT/VIK
+ /ys5hUXqFLTclStKMXLuU9YD+GQ2Y7zeRClkEIplECSZ6T7ofKkaoDtC43IpSxNOZETj2J46hChCNv+M
+ ZpQUytQAvZ12nEsyZzFhMolm/66dojEgi5Og8+VqQDHHxxWmbkpH3gmv0UgAaTdmImkFUKEG6Jsody4F
+ MEydvcbteFa99V+ABXdQSCohcca8C6Wy1PuwVPonaP4C++yEHJDPge4AAAAASUVORK5CYII=
+</value>
+ </data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
deleted file mode 100644
index 81fc567..0000000
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.Designer.cs
+++ /dev/null
@@ -1,304 +0,0 @@
-锘縩amespace Gs.DevApp.DevFrm.PDA
-{
- partial class Frm_UserBindLst
- {
- /// <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.components = new System.ComponentModel.Container();
- DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
- DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.gcMain1 = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.account = new DevExpress.XtraGrid.Columns.GridColumn();
- this.userName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
- this.split1.Panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
- this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
- this.SuspendLayout();
- //
- // toolBarMenu1
- //
- this.toolBarMenu1.chkParameter = null;
- this.toolBarMenu1.currentAction = null;
- this.toolBarMenu1.defaultActions = null;
- this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
- this.toolBarMenu1.guidKey = null;
- this.toolBarMenu1.isSetBtn = false;
- this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.rptParameter = "rpt_User{}";
- this.toolBarMenu1.Size = new System.Drawing.Size(1004, 80);
- this.toolBarMenu1.TabIndex = 0;
- this.toolBarMenu1.xlsInService = null;
- this.toolBarMenu1.xlsOutParameter = null;
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1004, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1002, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
- //
- // split1
- //
- this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.split1.Horizontal = false;
- this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Name = "split1";
- //
- // split1.Panel1
- //
- this.split1.Panel1.Controls.Add(this.gcMain1);
- this.split1.Panel1.Controls.Add(this.pageBar1);
- this.split1.Panel1.Text = "Panel1";
- //
- // split1.Panel2
- //
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1002, 570);
- this.split1.SplitterPosition = 0;
- this.split1.TabIndex = 0;
- //
- // gcMain1
- //
- this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.Location = new System.Drawing.Point(0, 0);
- this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Name = "gcMain1";
- this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit4});
- this.gcMain1.Size = new System.Drawing.Size(1002, 519);
- this.gcMain1.TabIndex = 2;
- this.gcMain1.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.account,
- this.userName,
- this.gridColumn3,
- this.gridColumn1,
- this.gridColumn2,
- this.gridColumn4,
- this.gridColumn5});
- gridFormatRule1.Name = "Format0";
- formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Red;
- formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
- formatConditionRuleExpression1.Expression = "[isStatusTxt] = [绂佺敤]";
- formatConditionRuleExpression1.PredefinedName = "Red Text";
- gridFormatRule1.Rule = formatConditionRuleExpression1;
- this.gridView1.FormatRules.Add(gridFormatRule1);
- this.gridView1.GridControl = this.gcMain1;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // account
- //
- this.account.AppearanceCell.Options.UseFont = true;
- this.account.Caption = "鐢ㄦ埛璐﹀彿";
- this.account.FieldName = "account";
- this.account.MinWidth = 50;
- this.account.Name = "account";
- this.account.OptionsColumn.AllowEdit = false;
- this.account.Tag = "query_ACCOUNT";
- this.account.Visible = true;
- this.account.VisibleIndex = 0;
- this.account.Width = 94;
- //
- // userName
- //
- this.userName.AppearanceCell.Options.UseFont = true;
- this.userName.Caption = "鐢ㄦ埛鍚嶇О";
- this.userName.FieldName = "userName";
- this.userName.MinWidth = 50;
- this.userName.Name = "userName";
- this.userName.OptionsColumn.AllowEdit = false;
- this.userName.Tag = "query_USER_NAME";
- this.userName.Visible = true;
- this.userName.VisibleIndex = 1;
- this.userName.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "缁戝畾瀵瑰儚(椤甸潰/鎵撳嵃鏈�/浠撳簱)";
- this.gridColumn3.FieldName = "gnName";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 94;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "缁戝畾绫诲瀷";
- this.gridColumn1.FieldName = "fType";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
- this.gridColumn1.Width = 94;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "缁戝畾鑰�";
- this.gridColumn2.FieldName = "createBy";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
- this.gridColumn2.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "缁戝畾鏃堕棿";
- this.gridColumn4.FieldName = "createDate";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 5;
- this.gridColumn4.Width = 94;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "绉诲嚭缁戝畾";
- this.gridColumn5.ColumnEdit = this.repositoryItemButtonEdit4;
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 6;
- this.gridColumn5.Width = 94;
- //
- // repositoryItemButtonEdit4
- //
- this.repositoryItemButtonEdit4.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
- this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- this.repositoryItemButtonEdit4.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit4_ButtonClick);
- //
- // 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.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1002, 39);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
- //
- // Frm_UserBindLst
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1004, 682);
- this.Controls.Add(this.xtraTabControl1);
- this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_UserBindLst";
- this.Text = "鐢ㄦ埛缁戝畾";
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
- this.split1.Panel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
- this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraEditors.SplitContainerControl split1;
- private DevExpress.XtraGrid.GridControl gcMain1;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn account;
- private DevExpress.XtraGrid.Columns.GridColumn userName;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
- private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.Utils.ToolTipController tips;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
deleted file mode 100644
index cf127d8..0000000
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.cs
+++ /dev/null
@@ -1,192 +0,0 @@
-锘縰sing DevExpress.XtraEditors.Controls;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.DevFrm.PDA
-{
- public partial class Frm_UserBindLst : DevExpress.XtraEditors.XtraForm
- {
- private List<FilterEntity> _filterList = new List<FilterEntity>();
- public Frm_UserBindLst()
- {
- InitializeComponent();
- toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- this.toolBarMenu1.getXmlConfig();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
- {
-
- }, tips);
- Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
- {
-
- }, (value) =>
- {
- getPageList(this.pageBar1.CurrentPage);
- });
- getPageList(1);
- pageBar1.PagerEvent += PageBar1_PagerEvent;
- }
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
- {
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- Task.Delay(100);
- getPageList(1);
- }
-
- /// <summary>
- /// 鍒嗛〉浜嬩欢
- /// </summary>
- /// <param name="curPage"></param>
- /// <param name="pageSize"></param>
- private void PageBar1_PagerEvent(int curPage, int pageSize)
- {
- getPageList(curPage);
- }
-
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
-
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
- }
-
-
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- { }
- else
- {
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
- }
- }
-
-
- /// <summary>
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.fType",
- "desc", "", _sbSqlWhere.ToString());
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn =
- UtilityHelper.HttpPost("", "MesSysPageviewManager/GetUserBindListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- if (dd.rtnCode > 0)
- {
- DataTable dt = dd.rtnData.list;
- gcMain1.BindingContext = new BindingContext();
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- if (dt.Rows.Count > 0)
- {
- gcMain1.DataSource = dt;
- gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
- }
- else
- UtilityHelper.SetDefaultTable(gcMain1, gridView1);
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
- pageBar1.CurrentPage = curPage;//褰撳墠椤�
- pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
- }
- else
- {
- ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- ///绉诲嚭
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void repositoryItemButtonEdit4_ButtonClick(object sender, ButtonPressedEventArgs e)
- {
- var rowhandle = gridView1.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gridView1.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- var _obj = new
- {
- guidList = mxGuid,
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "MesSysPageviewManager/" + "DeleteUserBind",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- if (_rtn.rtnCode > 0)
- {
- getPageList(this.pageBar1.CurrentPage);
- //int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], mxGuid);
- //gridView1.FocusedRowHandle = rowHandle;
- }
- }
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.resx b/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.resx
deleted file mode 100644
index 5160e8b..0000000
--- a/DevApp/Gs.DevApp/DevFrm/PDA/Frm_UserBindLst.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-锘�<?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>
- <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.Designer.cs
new file mode 100644
index 0000000..c2a0992
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.Designer.cs
@@ -0,0 +1,208 @@
+锘縩amespace Gs.DevApp.DevFrm.PDA
+{
+ partial class SelectLine
+ {
+ /// <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.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ ((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.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(595, 691);
+ this.panelControl2.TabIndex = 4;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Location = new System.Drawing.Point(2, 2);
+ this.gcMain.MainView = this.gridView1;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.Size = new System.Drawing.Size(591, 644);
+ this.gcMain.TabIndex = 6;
+ 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 = 60;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.colChkInt,
+ this.gv_depotCode,
+ this.gv_depottype,
+ this.gv_createBy,
+ this.gv_isNg});
+ 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_depotCode
+ //
+ this.gv_depotCode.AppearanceCell.Options.UseFont = true;
+ this.gv_depotCode.Caption = "绾夸綋缂栧彿";
+ this.gv_depotCode.FieldName = "lineNo";
+ this.gv_depotCode.MinWidth = 50;
+ this.gv_depotCode.Name = "gv_depotCode";
+ this.gv_depotCode.OptionsColumn.AllowEdit = false;
+ this.gv_depotCode.Tag = "query_a.depot_code";
+ this.gv_depotCode.Visible = true;
+ this.gv_depotCode.VisibleIndex = 1;
+ this.gv_depotCode.Width = 50;
+ //
+ // gv_depottype
+ //
+ this.gv_depottype.AppearanceCell.Options.UseFont = true;
+ this.gv_depottype.Caption = "绾夸綋鍚嶇О";
+ this.gv_depottype.FieldName = "name";
+ this.gv_depottype.MinWidth = 50;
+ this.gv_depottype.Name = "gv_depottype";
+ this.gv_depottype.OptionsColumn.AllowEdit = false;
+ this.gv_depottype.Tag = "query_a.depottype";
+ this.gv_depottype.Visible = true;
+ this.gv_depottype.VisibleIndex = 2;
+ this.gv_depottype.Width = 80;
+ //
+ // gv_createBy
+ //
+ this.gv_createBy.AppearanceCell.Options.UseFont = true;
+ this.gv_createBy.Caption = "绾夸綋澶囨敞";
+ this.gv_createBy.FieldName = "remark";
+ this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.Name = "gv_createBy";
+ this.gv_createBy.OptionsColumn.AllowEdit = false;
+ this.gv_createBy.Tag = "query_a.create_by";
+ this.gv_createBy.Visible = true;
+ this.gv_createBy.VisibleIndex = 3;
+ this.gv_createBy.Width = 71;
+ //
+ // gv_isNg
+ //
+ this.gv_isNg.AppearanceCell.Options.UseFont = true;
+ this.gv_isNg.Caption = "鎵撳嵃鏈哄娉�";
+ this.gv_isNg.FieldName = "remark";
+ this.gv_isNg.MinWidth = 50;
+ this.gv_isNg.Name = "gv_isNg";
+ this.gv_isNg.OptionsColumn.AllowEdit = false;
+ this.gv_isNg.Tag = "query_a.is_ng";
+ this.gv_isNg.Visible = true;
+ this.gv_isNg.VisibleIndex = 4;
+ this.gv_isNg.Width = 100;
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.btnIn);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(2, 646);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(591, 43);
+ this.panelControl1.TabIndex = 5;
+ //
+ // btnIn
+ //
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
+ this.btnIn.Appearance.Options.UseBackColor = true;
+ this.btnIn.AppearancePressed.BackColor = System.Drawing.Color.White;
+ this.btnIn.AppearancePressed.Options.UseBackColor = true;
+ this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.selectvaluespivottable_16x16;
+ this.btnIn.Location = new System.Drawing.Point(495, 2);
+ this.btnIn.Name = "btnIn";
+ this.btnIn.Size = new System.Drawing.Size(94, 39);
+ this.btnIn.TabIndex = 4;
+ this.btnIn.Text = "纭畾淇濆瓨";
+ //
+ // SelectLine
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(595, 691);
+ this.Controls.Add(this.panelControl2);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SelectLine";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "閫夋嫨绾夸綋";
+ 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.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
+ private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.cs b/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.cs
new file mode 100644
index 0000000..5a0e65b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.cs
@@ -0,0 +1,124 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+
+namespace Gs.DevApp.DevFrm.PDA
+{
+ public partial class SelectLine : DevExpress.XtraEditors.XtraForm
+ {
+ private readonly string _webServiceName = "MesWorkshopLineManager/";
+ private string userGuid = "";
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_suppId">渚涘簲鍟�</param>
+ /// <param name="_receiveOrgId">鏀舵枡缁勭粐</param>
+ /// <param name="_isWw">鏄惁濮斿</param>
+ public SelectLine(string _userGuid)
+ {
+ 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.userGuid = _userGuid;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ getPageList(1);
+ btnIn.Click += (s, e) =>
+ {
+ gridView1.PostEditor();
+ gridView1.UpdateCurrentRow();
+ System.Text.StringBuilder sbList = new System.Text.StringBuilder();
+ 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))
+ {
+ if (sbList.Length > 0)
+ sbList.Append(",");
+ sbList.Append(_guid);
+ }
+ }
+ }
+ var _obj = new
+ {
+ userGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(userGuid),
+ bindGuidslist = sbList.ToString(),
+ fType = "杩囩珯鏃剁粦瀹氱嚎浣�",
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ "MesSysPageviewManager/SetUserBind",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ this.Close();
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ var _sbSqlWhere = "";
+ var pgq = new PageQueryModel(curPage, 999999, "a.line_no", "asc", "", _sbSqlWhere.ToString(), userGuid);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage2", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx b/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.resx
similarity index 96%
rename from DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx
rename to DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.resx
index 5160e8b..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/BarCode/Frm_BoxCode.resx
+++ b/DevApp/Gs.DevApp/DevFrm/PDA/SelectLine.resx
@@ -117,7 +117,4 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index 76328e5..d959c87 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -42,6 +42,7 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.lbCollectGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
this.txt_gx = new DevExpress.XtraEditors.TextEdit();
this.txt_collectBy = new DevExpress.XtraEditors.TextEdit();
@@ -70,7 +71,13 @@
this.layShuiJian = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -126,12 +133,7 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -172,7 +174,13 @@
((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -186,12 +194,7 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
this.SuspendLayout();
//
// splitMx1
@@ -212,7 +215,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1367, 619);
- this.splitMx1.SplitterPosition = 191;
+ this.splitMx1.SplitterPosition = 221;
this.splitMx1.TabIndex = 0;
//
// splitTop1
@@ -241,12 +244,13 @@
this.splitTop1.Panel2.Controls.Add(this.panel1);
this.splitTop1.Panel2.Text = "Panel2";
this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitTop1.Size = new System.Drawing.Size(1367, 191);
+ this.splitTop1.Size = new System.Drawing.Size(1367, 221);
this.splitTop1.SplitterPosition = 527;
this.splitTop1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.lbCollectGuid);
this.layoutMx1.Controls.Add(this.txt_gdbh);
this.layoutMx1.Controls.Add(this.txt_gx);
this.layoutMx1.Controls.Add(this.txt_collectBy);
@@ -265,13 +269,24 @@
this.layoutMx1.Controls.Add(this.btnBad);
this.layoutMx1.Controls.Add(this.txt_dianJianPath);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(828, 191);
+ this.layoutMx1.Size = new System.Drawing.Size(828, 221);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // lbCollectGuid
+ //
+ this.lbCollectGuid.Location = new System.Drawing.Point(214, 177);
+ this.lbCollectGuid.Name = "lbCollectGuid";
+ this.lbCollectGuid.Size = new System.Drawing.Size(79, 18);
+ this.lbCollectGuid.StyleController = this.layoutMx1;
+ this.lbCollectGuid.TabIndex = 22;
+ this.lbCollectGuid.Text = "lbCollectGuid";
//
// txt_gdbh
//
@@ -284,7 +299,7 @@
//
// txt_gx
//
- this.txt_gx.Location = new System.Drawing.Point(111, 40);
+ this.txt_gx.Location = new System.Drawing.Point(111, 45);
this.txt_gx.Name = "txt_gx";
this.txt_gx.Properties.ReadOnly = true;
this.txt_gx.Size = new System.Drawing.Size(99, 24);
@@ -293,7 +308,7 @@
//
// txt_collectBy
//
- this.txt_collectBy.Location = new System.Drawing.Point(111, 68);
+ this.txt_collectBy.Location = new System.Drawing.Point(111, 78);
this.txt_collectBy.Name = "txt_collectBy";
this.txt_collectBy.Properties.ReadOnly = true;
this.txt_collectBy.Size = new System.Drawing.Size(99, 24);
@@ -302,7 +317,7 @@
//
// txt_barCode
//
- this.txt_barCode.Location = new System.Drawing.Point(111, 96);
+ this.txt_barCode.Location = new System.Drawing.Point(111, 111);
this.txt_barCode.Name = "txt_barCode";
this.txt_barCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.txt_barCode.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
@@ -314,7 +329,7 @@
//
// txt_currentBarCode
//
- this.txt_currentBarCode.Location = new System.Drawing.Point(111, 124);
+ this.txt_currentBarCode.Location = new System.Drawing.Point(111, 144);
this.txt_currentBarCode.Name = "txt_currentBarCode";
this.txt_currentBarCode.Properties.ReadOnly = true;
this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24);
@@ -323,7 +338,7 @@
//
// txt_gongWei
//
- this.txt_gongWei.Location = new System.Drawing.Point(111, 152);
+ this.txt_gongWei.Location = new System.Drawing.Point(111, 177);
this.txt_gongWei.Name = "txt_gongWei";
this.txt_gongWei.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.txt_gongWei.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
@@ -344,7 +359,7 @@
//
// txt_bc
//
- this.txt_bc.Location = new System.Drawing.Point(313, 40);
+ this.txt_bc.Location = new System.Drawing.Point(313, 45);
this.txt_bc.Name = "txt_bc";
this.txt_bc.Properties.ReadOnly = true;
this.txt_bc.Size = new System.Drawing.Size(99, 24);
@@ -353,7 +368,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(515, 40);
+ this.txt_itemName.Location = new System.Drawing.Point(515, 45);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.ReadOnly = true;
this.txt_itemName.Size = new System.Drawing.Size(99, 24);
@@ -371,7 +386,7 @@
//
// txt_sbNo
//
- this.txt_sbNo.Location = new System.Drawing.Point(313, 68);
+ this.txt_sbNo.Location = new System.Drawing.Point(313, 78);
this.txt_sbNo.Name = "txt_sbNo";
this.txt_sbNo.Properties.ReadOnly = true;
this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
@@ -380,7 +395,7 @@
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(515, 68);
+ this.txt_sjXt.Location = new System.Drawing.Point(515, 78);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
@@ -389,7 +404,7 @@
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(717, 40);
+ this.txt_yjDate.Location = new System.Drawing.Point(717, 45);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
this.txt_yjDate.Size = new System.Drawing.Size(99, 24);
@@ -398,7 +413,7 @@
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(717, 68);
+ this.txt_sjDate.Location = new System.Drawing.Point(717, 78);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
this.txt_sjDate.Size = new System.Drawing.Size(99, 24);
@@ -409,9 +424,9 @@
//
this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnGood.Appearance.Options.UseBackColor = true;
- this.btnGood.Location = new System.Drawing.Point(416, 96);
+ this.btnGood.Location = new System.Drawing.Point(416, 111);
this.btnGood.Name = "btnGood";
- this.btnGood.Size = new System.Drawing.Size(198, 83);
+ this.btnGood.Size = new System.Drawing.Size(198, 96);
this.btnGood.StyleController = this.layoutMx1;
this.btnGood.TabIndex = 19;
this.btnGood.Text = "鑹搧";
@@ -420,16 +435,16 @@
//
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
this.btnBad.Appearance.Options.UseBackColor = true;
- this.btnBad.Location = new System.Drawing.Point(618, 96);
+ this.btnBad.Location = new System.Drawing.Point(618, 111);
this.btnBad.Name = "btnBad";
- this.btnBad.Size = new System.Drawing.Size(198, 83);
+ this.btnBad.Size = new System.Drawing.Size(198, 96);
this.btnBad.StyleController = this.layoutMx1;
this.btnBad.TabIndex = 20;
this.btnBad.Text = "涓嶈壇鍝�";
//
// txt_dianJianPath
//
- this.txt_dianJianPath.Location = new System.Drawing.Point(313, 152);
+ this.txt_dianJianPath.Location = new System.Drawing.Point(313, 177);
this.txt_dianJianPath.Name = "txt_dianJianPath";
this.txt_dianJianPath.Properties.ReadOnly = true;
this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
@@ -451,13 +466,13 @@
this.layShuiJian,
this.layoutControlItem16,
this.layoutControlItem17,
- this.layDianJian,
this.layoutControlItem12,
this.layoutControlItem15,
this.layoutControlItem14,
this.layoutControlItem13,
this.layoutControlItem10,
- this.layoutControlItem11});
+ this.layoutControlItem11,
+ this.layDianJian});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -492,7 +507,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(828, 191);
+ this.Root.Size = new System.Drawing.Size(828, 221);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -500,17 +515,17 @@
this.layoutControlItem1.Control = this.txt_gdbh;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(202, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(202, 33);
this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_gx;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(202, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(202, 33);
this.layoutControlItem2.Text = "褰撳墠宸ュ簭";
this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
//
@@ -518,21 +533,21 @@
//
this.layoutControlItem3.Control = this.txt_collectBy;
this.layoutControlItem3.CustomizationFormText = "鎿嶄綔鍛樺伐";
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 66);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(202, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(202, 33);
this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_barCode;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 99);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(404, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(404, 33);
this.layoutControlItem4.Text = "鎵拷婧爜";
this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
//
@@ -542,53 +557,53 @@
this.layoutControlItem7.Location = new System.Drawing.Point(202, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(202, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(202, 33);
this.layoutControlItem7.Text = "浜у搧缂栫爜";
this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_bc;
- this.layoutControlItem8.Location = new System.Drawing.Point(202, 28);
+ this.layoutControlItem8.Location = new System.Drawing.Point(202, 33);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(202, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(202, 33);
this.layoutControlItem8.Text = "鐝";
this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_currentBarCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 132);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(404, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(404, 33);
this.layoutControlItem5.Text = "褰撳墠鏉＄爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
//
// layShuiJian
//
this.layShuiJian.Control = this.txt_gongWei;
- this.layShuiJian.Location = new System.Drawing.Point(0, 140);
+ this.layShuiJian.Location = new System.Drawing.Point(0, 165);
this.layShuiJian.Name = "layShuiJian";
this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layShuiJian.Size = new System.Drawing.Size(202, 31);
+ this.layShuiJian.Size = new System.Drawing.Size(202, 36);
this.layShuiJian.Text = "鎵伐浣嶇爜";
this.layShuiJian.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnGood;
- this.layoutControlItem16.Location = new System.Drawing.Point(404, 84);
+ this.layoutControlItem16.Location = new System.Drawing.Point(404, 99);
this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100);
this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(202, 87);
+ this.layoutControlItem16.Size = new System.Drawing.Size(202, 102);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "鑹搧鎸夐挳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -597,29 +612,97 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.btnBad;
- this.layoutControlItem17.Location = new System.Drawing.Point(606, 84);
+ this.layoutControlItem17.Location = new System.Drawing.Point(606, 99);
this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100);
this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(202, 87);
+ this.layoutControlItem17.Size = new System.Drawing.Size(202, 102);
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem17.Text = "涓嶈壇鍝佹寜閽�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
- // layDianJian
+ // layoutControlItem12
//
- this.layDianJian.Control = this.txt_dianJianPath;
- this.layDianJian.Location = new System.Drawing.Point(202, 140);
- this.layDianJian.Name = "layDianJian";
- this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layDianJian.Size = new System.Drawing.Size(202, 31);
- this.layDianJian.Text = "鐢垫璺緞";
- this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
+ this.layoutControlItem12.Control = this.txt_sbNo;
+ this.layoutControlItem12.Location = new System.Drawing.Point(202, 66);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem12.Text = "璁惧缂栫爜";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_sjDate;
+ this.layoutControlItem15.Location = new System.Drawing.Point(606, 66);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem15.Text = "Mes瀹為檯寮�宸�";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_yjDate;
+ this.layoutControlItem14.Location = new System.Drawing.Point(606, 33);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem14.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_sjXt;
+ this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
+ this.layoutControlItem13.Location = new System.Drawing.Point(404, 66);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_itemName;
+ this.layoutControlItem10.Location = new System.Drawing.Point(404, 33);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem10.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_itemModel;
+ this.layoutControlItem11.Location = new System.Drawing.Point(404, 0);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(404, 33);
+ this.layoutControlItem11.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.lbCollectGuid;
+ this.layoutControlItem6.Location = new System.Drawing.Point(202, 165);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem6.Size = new System.Drawing.Size(202, 36);
+ this.layoutControlItem6.Text = "閲囬泦琛実uid";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
//
// simpleButton7
//
@@ -797,7 +880,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1367, 416);
+ this.tabMx.Size = new System.Drawing.Size(1367, 386);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -807,7 +890,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1365, 384);
+ this.tabMxPage1.Size = new System.Drawing.Size(1365, 354);
this.tabMxPage1.Text = "鑹搧鍚嶇О";
//
// gcMx1
@@ -816,7 +899,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1365, 384);
+ this.gcMx1.Size = new System.Drawing.Size(1365, 354);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1002,7 +1085,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1365, 384);
+ this.tabMxPage2.Size = new System.Drawing.Size(1365, 354);
this.tabMxPage2.Text = "涓嶈壇鍝佹槑缁�";
//
// gcMx2
@@ -1011,7 +1094,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1365, 384);
+ this.gcMx2.Size = new System.Drawing.Size(1365, 354);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1205,72 +1288,16 @@
this.gridColumn25.VisibleIndex = 12;
this.gridColumn25.Width = 94;
//
- // layoutControlItem12
+ // layDianJian
//
- this.layoutControlItem12.Control = this.txt_sbNo;
- this.layoutControlItem12.Location = new System.Drawing.Point(202, 56);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem12.Text = "璁惧缂栫爜";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_sjDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(606, 56);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem15.Text = "Mes瀹為檯寮�宸�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_yjDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(606, 28);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_sjXt;
- this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
- this.layoutControlItem13.Location = new System.Drawing.Point(404, 56);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(404, 28);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(202, 28);
- this.layoutControlItem10.Text = "浜у搧鍚嶇О";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(404, 0);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(404, 28);
- this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
+ this.layDianJian.Control = this.txt_dianJianPath;
+ this.layDianJian.Location = new System.Drawing.Point(202, 165);
+ this.layDianJian.Name = "layDianJian";
+ this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layDianJian.Size = new System.Drawing.Size(202, 36);
+ this.layDianJian.Text = "鐢垫璺緞";
+ this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
//
// Frm_Work01
//
@@ -1324,7 +1351,13 @@
((System.ComponentModel.ISupportInitialize)(this.layShuiJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1342,12 +1375,7 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
this.ResumeLayout(false);
}
@@ -1438,7 +1466,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraEditors.TextEdit txt_dianJianPath;
- private DevExpress.XtraLayout.LayoutControlItem layDianJian;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
@@ -1447,5 +1474,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraEditors.LabelControl lbCollectGuid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layDianJian;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 2c5fe7f..55dc9e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -4,6 +4,7 @@
using DevExpress.XtraLayout.Utils;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NModbus;
@@ -22,6 +23,7 @@
{
public partial class Frm_Work01 : DevExpress.XtraEditors.XtraForm
{
+ string isWater = "0";
string hostName = "192.168.60.51";
int hostNamePoint = 502;
string strConn = "Data Source=192.168.1.146;Initial Catalog=GS_MES;User ID=mesUser;Password =qixi1qaz@WSXmes";
@@ -44,6 +46,16 @@
public Frm_Work01(string _fGx, string _fBc, string _strinOther)
{
InitializeComponent();
+ try
+ {
+ string _vanishingSeconds = ConfigurationManager.AppSettings["IsWater"];
+ if (!string.IsNullOrEmpty(_vanishingSeconds))
+ isWater = _vanishingSeconds;
+ }
+ catch (Exception)
+ {
+
+ }
gvMx1.IndicatorWidth = 60;
gvMx1.CustomDrawRowIndicator += (s, e) =>
{
@@ -62,7 +74,7 @@
if (e.KeyCode == Keys.Enter)
{
//濡傛灉鏄按妫�锛岃繕瑕佹壂宸ヤ綅
- if (txt_gx.Text.Trim() == fGxShouJian)
+ if (txt_gx.Text.Trim() == fGxShouJian && isWater == "1")
{
txt_gongWei.Focus();
}
@@ -95,14 +107,15 @@
};
btnBad.Click += (s, e) =>
{
- string _barCode = txt_barCode.Text.Trim();
- if (string.IsNullOrEmpty(_barCode))
+ string _collectGuid = lbCollectGuid.Text.Trim();
+ if (_collectGuid.Length < 30)
{
- Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
+ Toast vm = new Toast(-1, "~璇峰厛閫夋嫨杩芥函鐮亊");
vm.Show();
return;
}
- UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'");
+ string _msg = "浣犲噯澶囧皢銆�" + txt_gdbh.Text + "銆戙��" + txt_currentBarCode.Text.Trim() + "銆戝彉鏇翠负涓嶈壇";
+ UcDictionarySelect frm = new UcDictionarySelect("宸ュ簭涓嶈壇鎻忚堪", " a.s_type='宸ュ簭涓嶈壇鎻忚堪' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
frm.UpdateParent += (ss, ee) =>
{
System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
@@ -110,7 +123,7 @@
foreach (dynamic dym in lst)
{
if (stringBuilder.Length > 0)
- stringBuilder.Append("|");
+ stringBuilder.Append("&");
stringBuilder.Append(dym.dicTxt);
}
string _txt = stringBuilder.ToString();
@@ -120,12 +133,22 @@
vm.Show();
}
else
- addModel(badTag, _txt);
+ addModel(badTag, _txt, lbCollectGuid.Text.Trim());
};
frm.ShowDialog();
};
this.ActiveControl = this.txt_barCode;
txt_barCode.Focus();
+ gvMx1.FocusedRowChanged += (s, e) =>
+ {
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ txt_gdbh.Text = row["gdbh"].ToString();
+ txt_currentBarCode.Text = row["barCode"].ToString();
+ lbCollectGuid.Text = row["guid"].ToString();
+ }
+ };
}
/// <summary>
@@ -135,7 +158,7 @@
/// <param name="_checkResult">缁撴灉</param>
/// <param name="_badDescription">涓嶈壇鎻忚堪</param>
/// <returns></returns>
- private dynamic getObj(string _barCode, string _checkResult, string _badDescription = "")
+ private dynamic getObj(string _barCode, string _checkResult, string _badDescription = "", string _collectGuid = "")
{
dynamic _obj = new ExpandoObject();
_obj.barCode = _barCode;
@@ -144,6 +167,11 @@
_obj.banCi = txt_bc.Text.Trim();//鐝
_obj.gongWei = txt_gongWei.Text.Trim();//宸ヤ綅
_obj.badDescription = _badDescription.Trim();//涓嶈壇鎻忚堪
+ _obj.collectGuid = _collectGuid;
+ if (!string.IsNullOrEmpty(_collectGuid))
+ {
+ return _obj;
+ }
if (txt_gx.Text.Trim() == fGxTouRu)
{
return _obj;
@@ -200,6 +228,10 @@
//姘存
if (txt_gx.Text.Trim() == fGxShouJian)
{
+ if (isWater == "0")
+ {
+ return _obj;
+ }
string strCsl1 = "";//妯″紡1鍑烘按閲�
string strSw1 = "";//妯″紡1姘存俯
string strCsl2 = "";
@@ -241,18 +273,21 @@
/// </summary>
/// <param name="_checkResult">缁撴灉锛氣垰</param>
/// <param name="_badDescription">涓嶈壇鎻忚堪</param>
- private void addModel(string _checkResult, string _badDescription = "")
+ private void addModel(string _checkResult, string _badDescription = "", string _collectGuid = "")
{
string _barCode = txt_barCode.Text.Trim();
- if (string.IsNullOrEmpty(_barCode))
+ if (string.IsNullOrEmpty(_collectGuid))
{
- Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
- vm.Show();
- this.ActiveControl = this.txt_barCode;
- txt_barCode.Focus();
- return;
+ if (string.IsNullOrEmpty(_barCode))
+ {
+ Toast vm = new Toast(-1, "~璇峰厛鎵拷婧爜~");
+ vm.Show();
+ this.ActiveControl = this.txt_barCode;
+ txt_barCode.Focus();
+ return;
+ }
}
- dynamic _obj = getObj(_barCode, _checkResult, _badDescription);
+ dynamic _obj = getObj(_barCode, _checkResult, _badDescription, _collectGuid);
try
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
@@ -344,7 +379,7 @@
else
layDianJian.Visibility = LayoutVisibility.Never;
//鍙湁姘存鎵嶆樉绀�
- if (txt_gx.Text.Trim() == fGxShouJian)
+ if (txt_gx.Text.Trim() == fGxShouJian && isWater == "1")
layShuiJian.Visibility = LayoutVisibility.Always;
else
layShuiJian.Visibility = LayoutVisibility.Never;
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 16a9333..38862c9 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -500,6 +500,12 @@
<Compile Include="DevFrm\PDA\SelectItem.Designer.cs">
<DependentUpon>SelectItem.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\PDA\SelectLine.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\PDA\SelectLine.Designer.cs">
+ <DependentUpon>SelectLine.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\PDA\SelectPage.cs">
<SubType>Form</SubType>
</Compile>
@@ -1684,6 +1690,9 @@
<EmbeddedResource Include="DevFrm\PDA\SelectItem.resx">
<DependentUpon>SelectItem.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\PDA\SelectLine.resx">
+ <DependentUpon>SelectLine.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\PDA\SelectPage.resx">
<DependentUpon>SelectPage.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 801da22..fc5e41d 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -52,8 +52,8 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- //Application.Run(new DevFrm.User.SysMenu());
- //return;
+ Application.Run(new DevFrm.User.SysMenu());
+ return;
bool IsWeight = false;
try
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
index a538c36..2037b0d 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.Designer.cs
@@ -33,6 +33,7 @@
this.tlcActions = new DevExpress.XtraTreeList.Columns.TreeListColumn();
this.panel1 = new System.Windows.Forms.Panel();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.lbMsg = new DevExpress.XtraEditors.LabelControl();
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).BeginInit();
this.panel1.SuspendLayout();
this.SuspendLayout();
@@ -79,6 +80,7 @@
//
// panel1
//
+ this.panel1.Controls.Add(this.lbMsg);
this.panel1.Controls.Add(this.btnIn);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.panel1.Location = new System.Drawing.Point(0, 475);
@@ -98,6 +100,15 @@
this.btnIn.TabIndex = 5;
this.btnIn.Text = "纭畾閫夋嫨";
//
+ // lbMsg
+ //
+ this.lbMsg.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lbMsg.Location = new System.Drawing.Point(0, 0);
+ this.lbMsg.Name = "lbMsg";
+ this.lbMsg.Size = new System.Drawing.Size(81, 18);
+ this.lbMsg.TabIndex = 6;
+ this.lbMsg.Text = "labelControl1";
+ //
// UcDictionarySelect
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -113,6 +124,7 @@
this.Text = "璇烽�夋嫨";
((System.ComponentModel.ISupportInitialize)(this.tlMenu)).EndInit();
this.panel1.ResumeLayout(false);
+ this.panel1.PerformLayout();
this.ResumeLayout(false);
}
@@ -124,5 +136,6 @@
private DevExpress.XtraTreeList.Columns.TreeListColumn tlcActions;
private System.Windows.Forms.Panel panel1;
private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraEditors.LabelControl lbMsg;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
index 352f8b2..621b517 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionarySelect.cs
@@ -16,9 +16,10 @@
private List<dynamic> lstCheckedKeyID = new List<dynamic>();//閫夋嫨闆嗗悎
string strTitle = "";
string strWhere = "";
- public UcDictionarySelect(string _strTitle, string _strWhere)
+ public UcDictionarySelect(string _strTitle, string _strWhere,string _strMsg="")
{
InitializeComponent();
+ lbMsg.Text = _strMsg;
this.strTitle = _strTitle;
this.strWhere = _strWhere;
this.Text = _strTitle;
--
Gitblit v1.9.3