From d4a7c6729238148e9849081740e47e044eb9d313 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 30 十一月 2024 21:49:58 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 70 --
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs | 26 +
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 11
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs | 6
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.resx | 244 ++++++------
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 30 +
DevApp/Gs.DevApp/UserControl/UcLookUnit.Designer.cs | 124 ++++++
DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs | 23
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 35 +
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 293 ++------------
DevApp/Gs.DevApp/UserControl/UcLookUnit.cs | 108 +++++
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 24 +
DevApp/Gs.DevApp/UserControl/UcLookUnit.resx | 120 ++++++
DevApp/Gs.DevApp/UserControl/ShowFile.cs | 4
17 files changed, 677 insertions(+), 462 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index bcaad75..77ee15e 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <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" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index a82378a..92acf4d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -42,12 +42,10 @@
this.txt_froundtype = new DevExpress.XtraEditors.TextEdit();
this.gv_froundtype = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fbaseunit = new DevExpress.XtraEditors.LabelControl();
- this.txt_fbaseunit = new DevExpress.XtraEditors.TextEdit();
this.lb_fconvertnumerator = new DevExpress.XtraEditors.LabelControl();
this.txt_fconvertnumerator = new DevExpress.XtraEditors.TextEdit();
this.gv_fconvertnumerator = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fcurrentunitid = new DevExpress.XtraEditors.LabelControl();
- this.txt_fcurrentunitid = new DevExpress.XtraEditors.TextEdit();
this.lb_fconvertdenominator = new DevExpress.XtraEditors.LabelControl();
this.txt_fconvertdenominator = new DevExpress.XtraEditors.TextEdit();
this.gv_fconvertdenominator = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -60,26 +58,12 @@
this.lb_fnumber = new DevExpress.XtraEditors.LabelControl();
this.txt_fnumber = new DevExpress.XtraEditors.TextEdit();
this.gv_fnumber = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_lastupdate_by = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastupdate_date = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_create_by = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_create_date = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.lb_newqty = new DevExpress.XtraEditors.LabelControl();
this.txt_newqty = new DevExpress.XtraEditors.TextEdit();
- this.gv_newqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_oldqty = new DevExpress.XtraEditors.LabelControl();
this.txt_oldqty = new DevExpress.XtraEditors.TextEdit();
- this.gv_oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_newunit = new DevExpress.XtraEditors.LabelControl();
- this.txt_newunit = new DevExpress.XtraEditors.TextEdit();
- this.gv_newunit = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_oldunit = new DevExpress.XtraEditors.LabelControl();
- this.txt_oldunit = new DevExpress.XtraEditors.TextEdit();
- this.gv_oldunit = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_id = new DevExpress.XtraEditors.LabelControl();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -93,25 +77,21 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_oldunit = new Gs.DevApp.UserControl.UcLookUnit();
+ this.txt_newunit = new Gs.DevApp.UserControl.UcLookUnit();
+ this.txt_fbaseunit = new Gs.DevApp.UserControl.UcLookUnit();
+ this.txt_fcurrentunitid = new Gs.DevApp.UserControl.UcLookUnit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_froundtype.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbaseunit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fconvertnumerator.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcurrentunitid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fconvertdenominator.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_newunit.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_oldunit.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -264,15 +244,6 @@
this.lb_fbaseunit.TabIndex = 273;
this.lb_fbaseunit.Text = "鍩哄噯鍗曚綅锛�";
//
- // txt_fbaseunit
- //
- this.txt_fbaseunit.Location = new System.Drawing.Point(368, 119);
- this.txt_fbaseunit.Name = "txt_fbaseunit";
- this.txt_fbaseunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fbaseunit.Properties.Appearance.Options.UseFont = true;
- this.txt_fbaseunit.Size = new System.Drawing.Size(150, 28);
- this.txt_fbaseunit.TabIndex = 273;
- //
// lb_fconvertnumerator
//
this.lb_fconvertnumerator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -316,15 +287,6 @@
this.lb_fcurrentunitid.TabIndex = 262;
this.lb_fcurrentunitid.Text = "褰撳墠鍗曚綅锛�";
//
- // txt_fcurrentunitid
- //
- this.txt_fcurrentunitid.Location = new System.Drawing.Point(368, 160);
- this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
- this.txt_fcurrentunitid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fcurrentunitid.Properties.Appearance.Options.UseFont = true;
- this.txt_fcurrentunitid.Size = new System.Drawing.Size(150, 28);
- this.txt_fcurrentunitid.TabIndex = 262;
- //
// lb_fconvertdenominator
//
this.lb_fconvertdenominator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -362,7 +324,7 @@
//
this.lb_funitgroupid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_funitgroupid.Appearance.Options.UseFont = true;
- this.lb_funitgroupid.Location = new System.Drawing.Point(38, 204);
+ this.lb_funitgroupid.Location = new System.Drawing.Point(533, 164);
this.lb_funitgroupid.Name = "lb_funitgroupid";
this.lb_funitgroupid.Size = new System.Drawing.Size(85, 21);
this.lb_funitgroupid.TabIndex = 252;
@@ -370,7 +332,7 @@
//
// txt_funitgroupid
//
- this.txt_funitgroupid.Location = new System.Drawing.Point(123, 200);
+ this.txt_funitgroupid.Location = new System.Drawing.Point(618, 160);
this.txt_funitgroupid.Name = "txt_funitgroupid";
this.txt_funitgroupid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_funitgroupid.Properties.Appearance.Options.UseFont = true;
@@ -457,87 +419,11 @@
this.gv_fnumber.VisibleIndex = 1;
this.gv_fnumber.Width = 94;
//
- // lb_lastupdate_by
- //
- this.lb_lastupdate_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lastupdate_by.Appearance.Options.UseFont = true;
- this.lb_lastupdate_by.Location = new System.Drawing.Point(550, 244);
- this.lb_lastupdate_by.Name = "lb_lastupdate_by";
- this.lb_lastupdate_by.Size = new System.Drawing.Size(68, 21);
- this.lb_lastupdate_by.TabIndex = 231;
- this.lb_lastupdate_by.Text = "鏇存柊浜猴細";
- //
- // txt_lastupdateBy
- //
- this.txt_lastupdateBy.Location = new System.Drawing.Point(618, 240);
- this.txt_lastupdateBy.Name = "txt_lastupdateBy";
- this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
- this.txt_lastupdateBy.TabIndex = 231;
- //
- // lb_lastupdate_date
- //
- this.lb_lastupdate_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lastupdate_date.Appearance.Options.UseFont = true;
- this.lb_lastupdate_date.Location = new System.Drawing.Point(528, 278);
- this.lb_lastupdate_date.Name = "lb_lastupdate_date";
- this.lb_lastupdate_date.Size = new System.Drawing.Size(90, 21);
- this.lb_lastupdate_date.TabIndex = 228;
- this.lb_lastupdate_date.Text = "鏇存柊鏃堕棿 锛�";
- //
- // txt_lastupdateDate
- //
- this.txt_lastupdateDate.Location = new System.Drawing.Point(618, 274);
- this.txt_lastupdateDate.Name = "txt_lastupdateDate";
- this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
- this.txt_lastupdateDate.TabIndex = 228;
- //
- // lb_create_by
- //
- this.lb_create_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_create_by.Appearance.Options.UseFont = true;
- this.lb_create_by.Location = new System.Drawing.Point(550, 164);
- this.lb_create_by.Name = "lb_create_by";
- this.lb_create_by.Size = new System.Drawing.Size(68, 21);
- this.lb_create_by.TabIndex = 226;
- this.lb_create_by.Text = "鍒涘缓浜猴細";
- //
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(618, 160);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 28);
- this.txt_createBy.TabIndex = 226;
- //
- // lb_create_date
- //
- this.lb_create_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_create_date.Appearance.Options.UseFont = true;
- this.lb_create_date.Location = new System.Drawing.Point(533, 204);
- this.lb_create_date.Name = "lb_create_date";
- this.lb_create_date.Size = new System.Drawing.Size(85, 21);
- this.lb_create_date.TabIndex = 222;
- this.lb_create_date.Text = "鍒涘缓鏃堕棿锛�";
- //
- // txt_createDate
- //
- this.txt_createDate.Location = new System.Drawing.Point(618, 200);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 28);
- this.txt_createDate.TabIndex = 222;
- //
// lb_newqty
//
this.lb_newqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_newqty.Appearance.Options.UseFont = true;
- this.lb_newqty.Location = new System.Drawing.Point(4, 278);
+ this.lb_newqty.Location = new System.Drawing.Point(4, 244);
this.lb_newqty.Name = "lb_newqty";
this.lb_newqty.Size = new System.Drawing.Size(119, 21);
this.lb_newqty.TabIndex = 219;
@@ -545,26 +431,12 @@
//
// txt_newqty
//
- this.txt_newqty.Location = new System.Drawing.Point(123, 274);
+ this.txt_newqty.Location = new System.Drawing.Point(123, 240);
this.txt_newqty.Name = "txt_newqty";
this.txt_newqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_newqty.Properties.Appearance.Options.UseFont = true;
this.txt_newqty.Size = new System.Drawing.Size(150, 28);
this.txt_newqty.TabIndex = 219;
- //
- // gv_newqty
- //
- this.gv_newqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_newqty.AppearanceCell.Options.UseFont = true;
- this.gv_newqty.Caption = "鐩殑鍗曚綅鏁伴噺";
- this.gv_newqty.FieldName = "newqty";
- this.gv_newqty.MinWidth = 80;
- this.gv_newqty.Name = "gv_newqty";
- this.gv_newqty.OptionsColumn.AllowEdit = false;
- this.gv_newqty.Tag = "query_a.newqty";
- this.gv_newqty.Visible = true;
- this.gv_newqty.VisibleIndex = 13;
- this.gv_newqty.Width = 94;
//
// lb_oldqty
//
@@ -585,52 +457,15 @@
this.txt_oldqty.Size = new System.Drawing.Size(150, 28);
this.txt_oldqty.TabIndex = 217;
//
- // gv_oldqty
- //
- this.gv_oldqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_oldqty.AppearanceCell.Options.UseFont = true;
- this.gv_oldqty.Caption = "鍘熷崟浣嶆暟閲�";
- this.gv_oldqty.FieldName = "oldqty";
- this.gv_oldqty.MinWidth = 80;
- this.gv_oldqty.Name = "gv_oldqty";
- this.gv_oldqty.OptionsColumn.AllowEdit = false;
- this.gv_oldqty.Tag = "query_a.oldqty";
- this.gv_oldqty.Visible = true;
- this.gv_oldqty.VisibleIndex = 11;
- this.gv_oldqty.Width = 94;
- //
// lb_newunit
//
this.lb_newunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_newunit.Appearance.Options.UseFont = true;
- this.lb_newunit.Location = new System.Drawing.Point(38, 244);
+ this.lb_newunit.Location = new System.Drawing.Point(38, 204);
this.lb_newunit.Name = "lb_newunit";
this.lb_newunit.Size = new System.Drawing.Size(85, 21);
this.lb_newunit.TabIndex = 216;
this.lb_newunit.Text = "鐩殑鍗曚綅锛�";
- //
- // txt_newunit
- //
- this.txt_newunit.Location = new System.Drawing.Point(123, 240);
- this.txt_newunit.Name = "txt_newunit";
- this.txt_newunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_newunit.Properties.Appearance.Options.UseFont = true;
- this.txt_newunit.Size = new System.Drawing.Size(150, 28);
- this.txt_newunit.TabIndex = 216;
- //
- // gv_newunit
- //
- this.gv_newunit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_newunit.AppearanceCell.Options.UseFont = true;
- this.gv_newunit.Caption = "鐩殑鍗曚綅";
- this.gv_newunit.FieldName = "newunit";
- this.gv_newunit.MinWidth = 50;
- this.gv_newunit.Name = "gv_newunit";
- this.gv_newunit.OptionsColumn.AllowEdit = false;
- this.gv_newunit.Tag = "query_a.newunit";
- this.gv_newunit.Visible = true;
- this.gv_newunit.VisibleIndex = 12;
- this.gv_newunit.Width = 94;
//
// lb_oldunit
//
@@ -641,29 +476,6 @@
this.lb_oldunit.Size = new System.Drawing.Size(68, 21);
this.lb_oldunit.TabIndex = 213;
this.lb_oldunit.Text = "鍘熷崟浣嶏細";
- //
- // txt_oldunit
- //
- this.txt_oldunit.Location = new System.Drawing.Point(123, 119);
- this.txt_oldunit.Name = "txt_oldunit";
- this.txt_oldunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_oldunit.Properties.Appearance.Options.UseFont = true;
- this.txt_oldunit.Size = new System.Drawing.Size(150, 28);
- this.txt_oldunit.TabIndex = 213;
- //
- // gv_oldunit
- //
- this.gv_oldunit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_oldunit.AppearanceCell.Options.UseFont = true;
- this.gv_oldunit.Caption = "鍘熷崟浣�";
- this.gv_oldunit.FieldName = "oldunit";
- this.gv_oldunit.MinWidth = 50;
- this.gv_oldunit.Name = "gv_oldunit";
- this.gv_oldunit.OptionsColumn.AllowEdit = false;
- this.gv_oldunit.Tag = "query_a.oldunit";
- this.gv_oldunit.Visible = true;
- this.gv_oldunit.VisibleIndex = 10;
- this.gv_oldunit.Width = 94;
//
// lb_id
//
@@ -738,11 +550,7 @@
this.gv_froundtype,
this.gv_fprecision,
this.gv_fdescription,
- this.gv_fforbidstatus,
- this.gv_oldunit,
- this.gv_oldqty,
- this.gv_newunit,
- this.gv_newqty});
+ this.gv_fforbidstatus});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -794,6 +602,10 @@
// panel1
//
this.panel1.BackColor = System.Drawing.Color.White;
+ this.panel1.Controls.Add(this.txt_fcurrentunitid);
+ this.panel1.Controls.Add(this.txt_fbaseunit);
+ this.panel1.Controls.Add(this.txt_newunit);
+ this.panel1.Controls.Add(this.txt_oldunit);
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
this.panel1.Controls.Add(this.lb_fforbidstatus);
@@ -805,11 +617,9 @@
this.panel1.Controls.Add(this.lb_froundtype);
this.panel1.Controls.Add(this.txt_froundtype);
this.panel1.Controls.Add(this.lb_fbaseunit);
- this.panel1.Controls.Add(this.txt_fbaseunit);
this.panel1.Controls.Add(this.lb_fconvertnumerator);
this.panel1.Controls.Add(this.txt_fconvertnumerator);
this.panel1.Controls.Add(this.lb_fcurrentunitid);
- this.panel1.Controls.Add(this.txt_fcurrentunitid);
this.panel1.Controls.Add(this.lb_fconvertdenominator);
this.panel1.Controls.Add(this.txt_fconvertdenominator);
this.panel1.Controls.Add(this.lb_funitgroupid);
@@ -818,22 +628,12 @@
this.panel1.Controls.Add(this.txt_fname);
this.panel1.Controls.Add(this.lb_fnumber);
this.panel1.Controls.Add(this.txt_fnumber);
- this.panel1.Controls.Add(this.lb_lastupdate_by);
- this.panel1.Controls.Add(this.txt_lastupdateBy);
- this.panel1.Controls.Add(this.lb_lastupdate_date);
- this.panel1.Controls.Add(this.txt_lastupdateDate);
- this.panel1.Controls.Add(this.lb_create_by);
- this.panel1.Controls.Add(this.txt_createBy);
- this.panel1.Controls.Add(this.lb_create_date);
- this.panel1.Controls.Add(this.txt_createDate);
this.panel1.Controls.Add(this.lb_newqty);
this.panel1.Controls.Add(this.txt_newqty);
this.panel1.Controls.Add(this.lb_oldqty);
this.panel1.Controls.Add(this.txt_oldqty);
this.panel1.Controls.Add(this.lb_newunit);
- this.panel1.Controls.Add(this.txt_newunit);
this.panel1.Controls.Add(this.lb_oldunit);
- this.panel1.Controls.Add(this.txt_oldunit);
this.panel1.Controls.Add(this.lb_id);
this.panel1.Controls.Add(this.txt_id);
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -861,6 +661,38 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // txt_oldunit
+ //
+ this.txt_oldunit.IsReadly = false;
+ this.txt_oldunit.Location = new System.Drawing.Point(123, 119);
+ this.txt_oldunit.Name = "txt_oldunit";
+ this.txt_oldunit.Size = new System.Drawing.Size(150, 28);
+ this.txt_oldunit.TabIndex = 299;
+ //
+ // txt_newunit
+ //
+ this.txt_newunit.IsReadly = false;
+ this.txt_newunit.Location = new System.Drawing.Point(123, 200);
+ this.txt_newunit.Name = "txt_newunit";
+ this.txt_newunit.Size = new System.Drawing.Size(150, 28);
+ this.txt_newunit.TabIndex = 300;
+ //
+ // txt_fbaseunit
+ //
+ this.txt_fbaseunit.IsReadly = false;
+ this.txt_fbaseunit.Location = new System.Drawing.Point(368, 119);
+ this.txt_fbaseunit.Name = "txt_fbaseunit";
+ this.txt_fbaseunit.Size = new System.Drawing.Size(150, 28);
+ this.txt_fbaseunit.TabIndex = 301;
+ //
+ // txt_fcurrentunitid
+ //
+ this.txt_fcurrentunitid.IsReadly = false;
+ this.txt_fcurrentunitid.Location = new System.Drawing.Point(368, 160);
+ this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
+ this.txt_fcurrentunitid.Size = new System.Drawing.Size(150, 28);
+ this.txt_fcurrentunitid.TabIndex = 302;
+ //
// Frm_MesUnit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -873,21 +705,13 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_froundtype.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fbaseunit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fconvertnumerator.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcurrentunitid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fconvertdenominator.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_newunit.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_oldunit.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -929,14 +753,12 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_froundtype;
private DevExpress.XtraEditors.LabelControl lb_fbaseunit;
-private DevExpress.XtraEditors.TextEdit txt_fbaseunit;
private DevExpress.XtraEditors.LabelControl lb_fconvertnumerator;
private DevExpress.XtraEditors.TextEdit txt_fconvertnumerator;
private DevExpress.XtraGrid.Columns.GridColumn gv_fconvertnumerator;
private DevExpress.XtraEditors.LabelControl lb_fcurrentunitid;
-private DevExpress.XtraEditors.TextEdit txt_fcurrentunitid;
private DevExpress.XtraEditors.LabelControl lb_fconvertdenominator;
private DevExpress.XtraEditors.TextEdit txt_fconvertdenominator;
@@ -954,37 +776,22 @@
private DevExpress.XtraEditors.TextEdit txt_fnumber;
private DevExpress.XtraGrid.Columns.GridColumn gv_fnumber;
-private DevExpress.XtraEditors.LabelControl lb_lastupdate_by;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-
-private DevExpress.XtraEditors.LabelControl lb_lastupdate_date;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
-private DevExpress.XtraEditors.LabelControl lb_create_by;
-private DevExpress.XtraEditors.TextEdit txt_createBy;
-
-private DevExpress.XtraEditors.LabelControl lb_create_date;
-private DevExpress.XtraEditors.TextEdit txt_createDate;
-
private DevExpress.XtraEditors.LabelControl lb_newqty;
private DevExpress.XtraEditors.TextEdit txt_newqty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_newqty;
private DevExpress.XtraEditors.LabelControl lb_oldqty;
private DevExpress.XtraEditors.TextEdit txt_oldqty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_oldqty;
private DevExpress.XtraEditors.LabelControl lb_newunit;
-private DevExpress.XtraEditors.TextEdit txt_newunit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_newunit;
private DevExpress.XtraEditors.LabelControl lb_oldunit;
-private DevExpress.XtraEditors.TextEdit txt_oldunit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_oldunit;
private DevExpress.XtraEditors.LabelControl lb_id;
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-
+ private UserControl.UcLookUnit txt_oldunit;
+ private UserControl.UcLookUnit txt_newunit;
+ private UserControl.UcLookUnit txt_fcurrentunitid;
+ private UserControl.UcLookUnit txt_fbaseunit;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index 1be5fce..a4f8942 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -59,10 +59,8 @@
this.gv_telf1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_stras = new DevExpress.XtraEditors.LabelControl();
this.txt_stras = new DevExpress.XtraEditors.TextEdit();
- this.gv_stras = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_land1 = new DevExpress.XtraEditors.LabelControl();
this.txt_land1 = new DevExpress.XtraEditors.TextEdit();
- this.gv_land1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_suppSname = new DevExpress.XtraEditors.LabelControl();
this.txt_suppSname = new DevExpress.XtraEditors.TextEdit();
this.lb_suppName = new DevExpress.XtraEditors.LabelControl();
@@ -147,7 +145,7 @@
//
this.lb_fstaffid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fstaffid.Appearance.Options.UseFont = true;
- this.lb_fstaffid.Location = new System.Drawing.Point(289, 86);
+ this.lb_fstaffid.Location = new System.Drawing.Point(293, 86);
this.lb_fstaffid.Name = "lb_fstaffid";
this.lb_fstaffid.Size = new System.Drawing.Size(56, 21);
this.lb_fstaffid.TabIndex = 291;
@@ -180,7 +178,7 @@
//
this.lb_lxr.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lxr.Appearance.Options.UseFont = true;
- this.lb_lxr.Location = new System.Drawing.Point(289, 18);
+ this.lb_lxr.Location = new System.Drawing.Point(293, 18);
this.lb_lxr.Name = "lb_lxr";
this.lb_lxr.Size = new System.Drawing.Size(56, 21);
this.lb_lxr.TabIndex = 285;
@@ -270,7 +268,7 @@
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(71, 198);
+ this.lb_remark.Location = new System.Drawing.Point(74, 198);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 247;
@@ -305,13 +303,13 @@
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 130;
+ 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 = 13;
- this.gv_createDate.Width = 130;
+ this.gv_createDate.VisibleIndex = 11;
+ this.gv_createDate.Width = 180;
//
// gv_createBy
//
@@ -324,14 +322,14 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 12;
+ this.gv_createBy.VisibleIndex = 10;
this.gv_createBy.Width = 100;
//
// lb_telfx
//
this.lb_telfx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_telfx.Appearance.Options.UseFont = true;
- this.lb_telfx.Location = new System.Drawing.Point(306, 122);
+ this.lb_telfx.Location = new System.Drawing.Point(310, 122);
this.lb_telfx.Name = "lb_telfx";
this.lb_telfx.Size = new System.Drawing.Size(39, 21);
this.lb_telfx.TabIndex = 228;
@@ -383,7 +381,7 @@
//
this.lb_stras.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_stras.Appearance.Options.UseFont = true;
- this.lb_stras.Location = new System.Drawing.Point(306, 160);
+ this.lb_stras.Location = new System.Drawing.Point(310, 160);
this.lb_stras.Name = "lb_stras";
this.lb_stras.Size = new System.Drawing.Size(39, 21);
this.lb_stras.TabIndex = 222;
@@ -398,25 +396,11 @@
this.txt_stras.Size = new System.Drawing.Size(150, 28);
this.txt_stras.TabIndex = 222;
//
- // gv_stras
- //
- this.gv_stras.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_stras.AppearanceCell.Options.UseFont = true;
- this.gv_stras.Caption = "鍦板潃";
- this.gv_stras.FieldName = "stras";
- this.gv_stras.MinWidth = 100;
- this.gv_stras.Name = "gv_stras";
- this.gv_stras.OptionsColumn.AllowEdit = false;
- this.gv_stras.Tag = "query_a.stras";
- this.gv_stras.Visible = true;
- this.gv_stras.VisibleIndex = 11;
- this.gv_stras.Width = 100;
- //
// lb_land1
//
this.lb_land1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_land1.Appearance.Options.UseFont = true;
- this.lb_land1.Location = new System.Drawing.Point(306, 51);
+ this.lb_land1.Location = new System.Drawing.Point(310, 51);
this.lb_land1.Name = "lb_land1";
this.lb_land1.Size = new System.Drawing.Size(39, 21);
this.lb_land1.TabIndex = 219;
@@ -431,25 +415,11 @@
this.txt_land1.Size = new System.Drawing.Size(150, 28);
this.txt_land1.TabIndex = 219;
//
- // gv_land1
- //
- this.gv_land1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_land1.AppearanceCell.Options.UseFont = true;
- this.gv_land1.Caption = "鍦板尯";
- this.gv_land1.FieldName = "land1";
- this.gv_land1.MinWidth = 100;
- this.gv_land1.Name = "gv_land1";
- this.gv_land1.OptionsColumn.AllowEdit = false;
- this.gv_land1.Tag = "query_a.land1";
- this.gv_land1.Visible = true;
- this.gv_land1.VisibleIndex = 10;
- this.gv_land1.Width = 100;
- //
// lb_suppSname
//
this.lb_suppSname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_suppSname.Appearance.Options.UseFont = true;
- this.lb_suppSname.Location = new System.Drawing.Point(20, 86);
+ this.lb_suppSname.Location = new System.Drawing.Point(23, 86);
this.lb_suppSname.Name = "lb_suppSname";
this.lb_suppSname.Size = new System.Drawing.Size(90, 21);
this.lb_suppSname.TabIndex = 217;
@@ -468,7 +438,7 @@
//
this.lb_suppName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_suppName.Appearance.Options.UseFont = true;
- this.lb_suppName.Location = new System.Drawing.Point(20, 122);
+ this.lb_suppName.Location = new System.Drawing.Point(23, 122);
this.lb_suppName.Name = "lb_suppName";
this.lb_suppName.Size = new System.Drawing.Size(90, 21);
this.lb_suppName.TabIndex = 216;
@@ -492,7 +462,7 @@
//
this.lb_suppNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_suppNo.Appearance.Options.UseFont = true;
- this.lb_suppNo.Location = new System.Drawing.Point(20, 51);
+ this.lb_suppNo.Location = new System.Drawing.Point(23, 51);
this.lb_suppNo.Name = "lb_suppNo";
this.lb_suppNo.Size = new System.Drawing.Size(90, 21);
this.lb_suppNo.TabIndex = 213;
@@ -513,19 +483,19 @@
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 80;
+ this.gv_suppNo.MinWidth = 100;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
this.gv_suppNo.VisibleIndex = 2;
- this.gv_suppNo.Width = 80;
+ this.gv_suppNo.Width = 100;
//
// lb_id
//
this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_id.Appearance.Options.UseFont = true;
- this.lb_id.Location = new System.Drawing.Point(36, 18);
+ this.lb_id.Location = new System.Drawing.Point(39, 18);
this.lb_id.Name = "lb_id";
this.lb_id.Size = new System.Drawing.Size(74, 21);
this.lb_id.TabIndex = 211;
@@ -546,14 +516,14 @@
this.gv_id.AppearanceCell.Options.UseFont = true;
this.gv_id.Caption = "渚涘簲鍟咺D";
this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 60;
+ this.gv_id.MinWidth = 70;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.UnboundDataType = typeof(string);
this.gv_id.Visible = true;
this.gv_id.VisibleIndex = 1;
- this.gv_id.Width = 60;
+ this.gv_id.Width = 70;
//
// toolBarMenu1
//
@@ -596,8 +566,6 @@
this.gv_fstaffid,
this.gv_fforbidstatus,
this.gv_remark,
- this.gv_land1,
- this.gv_stras,
this.gv_createBy,
this.gv_createDate});
this.gridView1.GridControl = this.gcMain;
@@ -823,11 +791,9 @@
private DevExpress.XtraEditors.LabelControl lb_stras;
private DevExpress.XtraEditors.TextEdit txt_stras;
- private DevExpress.XtraGrid.Columns.GridColumn gv_stras;
private DevExpress.XtraEditors.LabelControl lb_land1;
private DevExpress.XtraEditors.TextEdit txt_land1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_land1;
private DevExpress.XtraEditors.LabelControl lb_suppSname;
private DevExpress.XtraEditors.TextEdit txt_suppSname;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index d0bb321..9e43522 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -70,6 +70,7 @@
this.txt_docCode = new DevExpress.XtraEditors.LookUpEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -89,6 +90,7 @@
((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// gv_createdBy
@@ -175,12 +177,12 @@
this.gv_ruleFormat.AppearanceCell.Options.UseFont = true;
this.gv_ruleFormat.Caption = "缂栫爜瑙勫垯";
this.gv_ruleFormat.FieldName = "docFormat";
- this.gv_ruleFormat.MinWidth = 25;
+ this.gv_ruleFormat.MinWidth = 150;
this.gv_ruleFormat.Name = "gv_ruleFormat";
this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
this.gv_ruleFormat.Visible = true;
this.gv_ruleFormat.VisibleIndex = 1;
- this.gv_ruleFormat.Width = 94;
+ this.gv_ruleFormat.Width = 150;
//
// gv_docCode
//
@@ -203,11 +205,11 @@
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(949, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = null;
//
// gcMain
//
@@ -640,11 +642,23 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(766, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 5;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// DocNoRule
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(949, 660);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "DocNoRule";
@@ -669,6 +683,7 @@
((System.ComponentModel.ISupportInitialize)(this.txxtItem2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txxtItem1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_docCode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -714,5 +729,6 @@
private System.Windows.Forms.NumericUpDown txt_noLength;
private DevExpress.XtraEditors.CheckEdit txt_resetZero;
private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 2e36142..aa20b53 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Data;
using System.Windows.Forms;
+using DevExpress.RichEdit.Export;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using Gs.DevApp.Entity;
@@ -24,6 +25,10 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
+ gridView1.FocusedRowChanged += (s, e) =>
+ {
+ UtilityHelper.SetCheckIco(s, picCheckBox, this, "checkStatus", "");
+ };
getPageList(1, UtilityHelper.GetPageSize());
pageBar1.PagerEvent += PageBar1_PagerEvent;
getTree();
@@ -37,6 +42,8 @@
Txt_flagIncludeDocCode_CheckedChanged;
txt_isSpilit.CheckedChanged +=
Txt_flagIncludeDocCode_CheckedChanged;
+
+
}
/// <summary>
@@ -344,12 +351,12 @@
dataTable.Columns.Add("docCode", typeof(string));
dataTable.Rows.Add("DH(鍒拌揣鍗�)");
dataTable.Rows.Add("JY(妫�楠屽崟)");
- dataTable.Rows.Add("TL(閲囪喘閫�鏂欏崟)");
+ dataTable.Rows.Add("TL(閫�鏂欏崟)");
dataTable.Rows.Add("IN(鍏ュ簱鍗�)");
dataTable.Rows.Add("PB(鎵归噺鎺掍骇)");
dataTable.Rows.Add("SC(鐢熶骇宸ュ崟)");
dataTable.Rows.Add("OUT(鍑哄簱鍗�)");
- dataTable.Rows.Add("HB(宸ュ崟鐗╂枡鍚堝苟)");
+ dataTable.Rows.Add("HB(鐗╂枡鍚堝苟)");
txt_docCode.Properties.DataSource = dataTable;
txt_docCode.Properties.DisplayMember = "docCode"; // 鏄剧ず鐨勫垪
txt_docCode.Properties.ValueMember = "docCode"; // 瀹為檯鍊肩殑鍒�
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.resx b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.resx
@@ -1,134 +1,120 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ 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: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: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: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>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index 04e8be1..e7b8c82 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -76,7 +76,7 @@
//
this.lb_pageStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_pageStatus.Appearance.Options.UseFont = true;
- this.lb_pageStatus.Location = new System.Drawing.Point(464, 102);
+ this.lb_pageStatus.Location = new System.Drawing.Point(471, 102);
this.lb_pageStatus.Name = "lb_pageStatus";
this.lb_pageStatus.Size = new System.Drawing.Size(34, 21);
this.lb_pageStatus.TabIndex = 222;
@@ -101,7 +101,7 @@
//
this.lb_pageIdx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_pageIdx.Appearance.Options.UseFont = true;
- this.lb_pageIdx.Location = new System.Drawing.Point(464, 61);
+ this.lb_pageIdx.Location = new System.Drawing.Point(471, 61);
this.lb_pageIdx.Name = "lb_pageIdx";
this.lb_pageIdx.Size = new System.Drawing.Size(34, 21);
this.lb_pageIdx.TabIndex = 219;
@@ -125,7 +125,7 @@
//
this.lb_pageGroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_pageGroup.Appearance.Options.UseFont = true;
- this.lb_pageGroup.Location = new System.Drawing.Point(464, 20);
+ this.lb_pageGroup.Location = new System.Drawing.Point(471, 20);
this.lb_pageGroup.Name = "lb_pageGroup";
this.lb_pageGroup.Size = new System.Drawing.Size(34, 21);
this.lb_pageGroup.TabIndex = 217;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index 4562773..ccec719 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -128,9 +128,9 @@
this.panel1.Controls.Add(this.txt_name);
this.panel1.Controls.Add(this.labelControl2);
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(370, 16);
+ this.panel1.Location = new System.Drawing.Point(415, 16);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(560, 373);
+ this.panel1.Size = new System.Drawing.Size(515, 373);
this.panel1.TabIndex = 3;
//
// labelControl14
@@ -157,7 +157,7 @@
//
this.labelControl13.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.labelControl13.Appearance.Options.UseFont = true;
- this.labelControl13.Location = new System.Drawing.Point(41, 71);
+ this.labelControl13.Location = new System.Drawing.Point(57, 71);
this.labelControl13.Name = "labelControl13";
this.labelControl13.Size = new System.Drawing.Size(69, 21);
this.labelControl13.TabIndex = 139;
@@ -367,7 +367,7 @@
this.tlMenu.Font = new System.Drawing.Font("Tahoma", 10F);
this.tlMenu.Location = new System.Drawing.Point(0, 0);
this.tlMenu.Name = "tlMenu";
- this.tlMenu.Size = new System.Drawing.Size(343, 584);
+ this.tlMenu.Size = new System.Drawing.Size(388, 584);
this.tlMenu.TabIndex = 2;
//
// Organization
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index d403dd6..726a0c6 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -594,6 +594,12 @@
<Compile Include="UserControl\UcLookSupplier.Designer.cs">
<DependentUpon>UcLookSupplier.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookUnit.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookUnit.Designer.cs">
+ <DependentUpon>UcLookUnit.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookWorkline.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -832,6 +838,9 @@
<EmbeddedResource Include="UserControl\UcLookSupplier.resx">
<DependentUpon>UcLookSupplier.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookUnit.resx">
+ <DependentUpon>UcLookUnit.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookWorkline.resx">
<DependentUpon>UcLookWorkline.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 46e8be7..f596b2b 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -531,7 +531,17 @@
txt.Enabled = false;
continue;
}
-
+ //鑷畾鍗曚綅
+ if (colType is UcLookUnit)
+ {
+ var txt = colType as UcLookUnit;
+ txt.SetIdOrCode(strVal);
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
if (colType is SimpleButton)
{
var txt = colType as SimpleButton;
@@ -680,6 +690,14 @@
txt.Enabled = !isEdt;
continue;
}
+ //鑷畾鍗曚綅
+ if (ctrl is UcLookUnit)
+ {
+ var txt = ctrl as UcLookUnit;
+ txt.SetIdOrCode("-1");
+ txt.Enabled = !isEdt;
+ continue;
+ }
if (ctrl is SimpleButton)
{
var txt = ctrl as SimpleButton;
@@ -814,6 +832,16 @@
txt.Enabled = false;
continue;
}
+ //鑷畾涔夊崟浣�
+ if (ctrl is UcLookUnit)
+ {
+ var txt = ctrl as UcLookUnit;
+ if (txt.IsReadly == false)
+ txt.Enabled = !isEdt;
+ else
+ txt.Enabled = false;
+ continue;
+ }
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
index 286e95d..80142b1 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFile.Designer.cs
@@ -28,19 +28,11 @@
/// </summary>
private void InitializeComponent()
{
- this.txtUrl = new DevExpress.XtraEditors.TextEdit();
this.pane1 = new DevExpress.XtraEditors.PanelControl();
- ((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).BeginInit();
+ this.txtUrl = new DevExpress.XtraEditors.TextEdit();
((System.ComponentModel.ISupportInitialize)(this.pane1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).BeginInit();
this.SuspendLayout();
- //
- // txtUrl
- //
- this.txtUrl.Dock = System.Windows.Forms.DockStyle.Top;
- this.txtUrl.Location = new System.Drawing.Point(0, 0);
- this.txtUrl.Name = "txtUrl";
- this.txtUrl.Size = new System.Drawing.Size(905, 24);
- this.txtUrl.TabIndex = 0;
//
// pane1
//
@@ -55,6 +47,15 @@
this.pane1.Size = new System.Drawing.Size(905, 469);
this.pane1.TabIndex = 1;
//
+ // txtUrl
+ //
+ this.txtUrl.Dock = System.Windows.Forms.DockStyle.Top;
+ this.txtUrl.Location = new System.Drawing.Point(0, 0);
+ this.txtUrl.Name = "txtUrl";
+ this.txtUrl.Size = new System.Drawing.Size(905, 24);
+ this.txtUrl.TabIndex = 0;
+ this.txtUrl.Visible = false;
+ //
// ShowFile
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -67,8 +68,8 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "鏂囦欢棰勮";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
- ((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pane1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtUrl.Properties)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/UserControl/ShowFile.cs b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
index df09a25..6313f8a 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowFile.cs
@@ -52,8 +52,8 @@
return "img";
case ".pdf":
return "pdf";
- // 娣诲姞鍏朵粬鏂囦欢绫诲瀷
- // ...
+ case ".mp4":
+ return "mp4";
default:
return "other";
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
index 5d391a7..a0f7055 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
@@ -30,6 +30,7 @@
{
this.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -56,6 +57,7 @@
// searchLookUpEdit1View
//
this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn6,
this.gridColumn1,
this.gridColumn2,
this.gridColumn3,
@@ -66,16 +68,27 @@
this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
//
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "浣跨敤缁勭粐";
+ this.gridColumn6.FieldName = "fSubsidiary";
+ this.gridColumn6.MinWidth = 200;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 0;
+ this.gridColumn6.Width = 200;
+ //
// gridColumn1
//
this.gridColumn1.Caption = "鐗╂枡ID";
this.gridColumn1.FieldName = "id";
this.gridColumn1.MaxWidth = 80;
+ this.gridColumn1.MinWidth = 60;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.UnboundDataType = typeof(string);
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 42;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 60;
//
// gridColumn2
//
@@ -85,25 +98,27 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.UnboundDataType = typeof(string);
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.VisibleIndex = 2;
this.gridColumn2.Width = 110;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
this.gridColumn3.FieldName = "itemName";
+ this.gridColumn3.MinWidth = 100;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.VisibleIndex = 3;
this.gridColumn3.Width = 150;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡瑙勬牸";
this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 100;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 3;
+ this.gridColumn5.VisibleIndex = 4;
this.gridColumn5.Width = 112;
//
// gridColumn4
@@ -135,5 +150,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUnit.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookUnit.Designer.cs
new file mode 100644
index 0000000..b98664a
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUnit.Designer.cs
@@ -0,0 +1,124 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class UcLookUnit
+ {
+ /// <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 Component 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.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
+ this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ 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();
+ ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+ this.SuspendLayout();
+ //
+ // lookSearchSupplier
+ //
+ this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
+ this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
+ this.lookSearchSupplier.Name = "lookSearchSupplier";
+ this.lookSearchSupplier.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
+ this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
+ this.lookSearchSupplier.Size = new System.Drawing.Size(232, 28);
+ this.lookSearchSupplier.TabIndex = 10;
+ //
+ // searchLookUpEdit1View
+ //
+ this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn1,
+ this.gridColumn2,
+ this.gridColumn3,
+ this.gridColumn4});
+ this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+ this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍗曚綅ID";
+ this.gridColumn1.FieldName = "id";
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍗曚綅缂栧彿";
+ this.gridColumn2.FieldName = "fnumber";
+ this.gridColumn2.MinWidth = 80;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.UnboundDataType = typeof(string);
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 80;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍗曚綅鍚嶇О";
+ this.gridColumn3.FieldName = "fname";
+ this.gridColumn3.MinWidth = 100;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 100;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "guid";
+ this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.Name = "gridColumn4";
+ //
+ // UcLookUnit
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.lookSearchSupplier);
+ this.Name = "UcLookUnit";
+ this.Size = new System.Drawing.Size(232, 31);
+ ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier;
+ private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs b/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
new file mode 100644
index 0000000..ee92297
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
@@ -0,0 +1,108 @@
+锘縰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.UserControl
+{
+ public partial class UcLookUnit : DevExpress.XtraEditors.XtraUserControl
+ {
+ public UcLookUnit()
+ {
+ InitializeComponent();
+ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
+ lookSearchSupplier.EditValueChanged +=
+ LookSearchSupplier_EditValueChanged;
+ getSuppler();
+ }
+
+ public bool IsReadly { get; set; }
+
+ /// <summary>
+ /// 鏀瑰彉浜嬩欢
+ /// </summary>
+ public event EventHandler EditChanged;
+
+ private void LookSearchSupplier_EditValueChanged(object sender,
+ EventArgs e)
+ {
+ if (EditChanged != null) EditChanged(this, e);
+ }
+
+ private void getSuppler()
+ {
+ var pgq = new PageQueryModel(1, 999999, "fname", "asc", "", " and 1=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesUnitManager/GetListPage", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ lookSearchSupplier.Properties.DataSource = dt;
+ lookSearchSupplier.Properties.DisplayMember = "fname";
+ lookSearchSupplier.Properties.ValueMember = "id";
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ public string GetId()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["id"].ToString();
+ return id;
+ }
+ return "";
+ }
+ public string GetCode()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["fnumber"].ToString();
+ return id;
+ }
+ return "";
+ }
+ public string GetName()
+ {
+ var name = lookSearchSupplier.Text.Trim();
+ return name;
+ }
+
+ public void SetIdOrCode(string Code)
+ {
+ if (Code == "-1" || string.IsNullOrEmpty(Code) || Code.ToUpper()=="null".ToUpper())
+ {
+ lookSearchSupplier.EditValue = null;
+ return;
+ }
+ lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ }
+
+
+ public string GetGuid()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["guid"].ToString();
+ return id;
+ }
+ return "";
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUnit.resx b/DevApp/Gs.DevApp/UserControl/UcLookUnit.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUnit.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5ae0c3d..262a31e 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -52,7 +52,7 @@
btnBdll.ItemClick += BtnBdll_ItemClick;
btnWg.ItemClick += BtnWg_ItemClick;
btnFtzbl.ItemClick += BtnFtzbl_ItemClick;
-
+ btnHelp.ItemClick += BtnHelp_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -61,7 +61,6 @@
actions = lst;
}
-
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
@@ -573,7 +572,7 @@
private void BtnKg_ItemClick(object sender, ItemClickEventArgs e)
{
-
+
if (btnKgClick != null) btnKgClick(this, e);
}
@@ -581,6 +580,35 @@
{
if (btnTzblClick != null) btnTzblClick(this, e);
}
+ private void BtnHelp_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ var _formNamespace = "";
+ Control parentControl = this;
+ while (parentControl.Parent != null)
+ {
+ if (parentControl.Parent is Form parentForm)
+ {
+ var formType = parentForm.GetType();
+ _formNamespace = formType.FullName;
+ break;
+ }
+ parentControl = parentControl.Parent;
+ }
+ string strReturn = UtilityHelper.HttpPost("",
+ "MenuAction/GetHelpFile",
+ JsonConvert.SerializeObject(_formNamespace));
+ var _rtnJson = UtilityHelper.ReturnToDynamic(strReturn);
+ if (_rtnJson.rtnCode > 0)
+ {
+ var urlPath = _rtnJson.rtnData.ToString();
+ Gs.DevApp.UserControl.ShowFile frm = new ShowFile(urlPath);
+ frm.ShowDialog();
+ return;
+ }
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtnJson.rtnMsg);
+
+ }
+
private void _enabledBtn(List<string> lstBtn)
{
@@ -609,7 +637,6 @@
_formNamespace = formType.FullName;
break;
}
-
parentControl = parentControl.Parent;
}
--
Gitblit v1.9.3