From 4a8df7e654aa502694bcff271b216c46e26c788b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期日, 06 四月 2025 10:46:27 +0800
Subject: [PATCH] 汽泡提示
---
DevApp/Gs.DevApp/UserControl/UcLookUser.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookSales.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs | 3
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 481 ++++++++++++--------------
DevApp/Gs.DevApp/UserControl/UcLookUnit.cs | 2
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 30 +
DevApp/Gs.DevApp/UserControl/UcLookDaa.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookGx.cs | 5
DevApp/Gs.DevApp/Gs.DevApp.csproj | 18 -
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs | 2
DevApp/Gs.DevApp/UserControl/UcDictionary.cs | 21
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 2
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 299 +++++-----------
/dev/null | 120 ------
DevApp/Gs.DevApp/UserControl/UcLookStaff.cs | 2
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookCk.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookPrint.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs | 2
DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs | 12
26 files changed, 369 insertions(+), 656 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 2d4703e..09d6be2 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/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 2caa88f..40cacfe 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -68,18 +68,18 @@
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fsubmit = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_lifnr = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -87,13 +87,11 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fngHandle = new DevExpress.XtraGrid.Columns.GridColumn();
- this.bandedGridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -114,7 +112,7 @@
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
@@ -126,16 +124,12 @@
this.txt_lotNo2 = new DevExpress.XtraEditors.TextEdit();
this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
this.txt_epTag = new DevExpress.XtraEditors.ComboBoxEdit();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -152,8 +146,6 @@
this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -161,6 +153,11 @@
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -264,7 +261,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
@@ -276,16 +273,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
@@ -302,8 +295,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
@@ -311,6 +302,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
@@ -445,18 +441,18 @@
this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn13,
this.gv_fsubmit,
- this.gv_lotNo,
- this.gv_lifnr,
this.gv_releaseNo,
+ this.gv_lotNo,
+ this.gridColumn23,
+ this.gv_lifnr,
this.gv_itemId,
this.gv_itemNo,
this.gv_boardStyle,
this.gridColumn14,
+ this.gv_fcovertQty,
this.gv_fbatchQty,
this.gv_fcheckResu,
- this.gv_fcovertQty,
this.gv_remarks,
this.gv_fcheckBy,
this.gv_fcheckDate,
@@ -464,32 +460,17 @@
this.gridColumn15,
this.gv_lastupdateBy,
this.gv_lastupdateDate,
- this.gv_fngHandle,
- this.bandedGridColumn1,
this.gridColumn18,
this.gridColumn19,
- this.gridColumn17,
- this.gridColumn23,
- this.gridColumn30});
+ this.gridColumn30,
+ this.gridColumn13,
+ this.gridColumn17});
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;
- //
- // gridColumn13
- //
- this.gridColumn13.Caption = "鎬ユ枡鏍囪瘑";
- this.gridColumn13.FieldName = "urgentLagTxt";
- this.gridColumn13.MinWidth = 30;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.OptionsColumn.ReadOnly = true;
- this.gridColumn13.Tag = "query_a.fsubmit";
- this.gridColumn13.UnboundDataType = typeof(bool);
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 50;
//
// gv_fsubmit
//
@@ -503,36 +484,8 @@
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
- this.gv_fsubmit.VisibleIndex = 1;
+ this.gv_fsubmit.VisibleIndex = 0;
this.gv_fsubmit.Width = 50;
- //
- // gv_lotNo
- //
- this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lotNo.AppearanceCell.Options.UseFont = true;
- this.gv_lotNo.Caption = "閫佹鎵规";
- this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 30;
- this.gv_lotNo.Name = "gv_lotNo";
- this.gv_lotNo.OptionsColumn.AllowEdit = false;
- this.gv_lotNo.Tag = "query_a.lot_no";
- this.gv_lotNo.Visible = true;
- this.gv_lotNo.VisibleIndex = 2;
- this.gv_lotNo.Width = 120;
- //
- // gv_lifnr
- //
- this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_lifnr.AppearanceCell.Options.UseFont = true;
- this.gv_lifnr.Caption = "渚涘簲鍟嗗悕绉�";
- this.gv_lifnr.FieldName = "suppName";
- this.gv_lifnr.MinWidth = 30;
- this.gv_lifnr.Name = "gv_lifnr";
- this.gv_lifnr.OptionsColumn.AllowEdit = false;
- this.gv_lifnr.Tag = "query_a.lifnr";
- this.gv_lifnr.Visible = true;
- this.gv_lifnr.VisibleIndex = 3;
- this.gv_lifnr.Width = 200;
//
// gv_releaseNo
//
@@ -545,8 +498,46 @@
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
- this.gv_releaseNo.VisibleIndex = 4;
+ this.gv_releaseNo.VisibleIndex = 1;
this.gv_releaseNo.Width = 100;
+ //
+ // gv_lotNo
+ //
+ this.gv_lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lotNo.AppearanceCell.Options.UseFont = true;
+ this.gv_lotNo.Caption = "宸ュ崟鍗曞彿";
+ this.gv_lotNo.FieldName = "lotNo";
+ this.gv_lotNo.MinWidth = 30;
+ this.gv_lotNo.Name = "gv_lotNo";
+ this.gv_lotNo.OptionsColumn.AllowEdit = false;
+ this.gv_lotNo.Tag = "query_a.lot_no";
+ this.gv_lotNo.Visible = true;
+ this.gv_lotNo.VisibleIndex = 2;
+ this.gv_lotNo.Width = 120;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "浜х嚎鍚嶇О";
+ this.gridColumn23.FieldName = "lineName";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 3;
+ this.gridColumn23.Width = 94;
+ //
+ // gv_lifnr
+ //
+ this.gv_lifnr.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_lifnr.AppearanceCell.Options.UseFont = true;
+ this.gv_lifnr.Caption = "瀹㈡埛鍚嶇О";
+ this.gv_lifnr.FieldName = "cusName";
+ this.gv_lifnr.MinWidth = 30;
+ this.gv_lifnr.Name = "gv_lifnr";
+ this.gv_lifnr.OptionsColumn.AllowEdit = false;
+ this.gv_lifnr.Tag = "query_a.lifnr";
+ this.gv_lifnr.Visible = true;
+ this.gv_lifnr.VisibleIndex = 4;
+ this.gv_lifnr.Width = 200;
//
// gv_itemId
//
@@ -567,7 +558,7 @@
this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
- this.gv_itemNo.FieldName = "itemNo";
+ this.gv_itemNo.FieldName = "itemNo2";
this.gv_itemNo.MinWidth = 30;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
@@ -601,18 +592,33 @@
this.gridColumn14.VisibleIndex = 8;
this.gridColumn14.Width = 200;
//
+ // gv_fcovertQty
+ //
+ this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
+ this.gv_fcovertQty.Caption = "宸ュ崟鏁伴噺";
+ this.gv_fcovertQty.FieldName = "daaQty";
+ this.gv_fcovertQty.MinWidth = 30;
+ this.gv_fcovertQty.Name = "gv_fcovertQty";
+ this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
+ this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
+ this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
+ this.gv_fcovertQty.Visible = true;
+ this.gv_fcovertQty.VisibleIndex = 9;
+ this.gv_fcovertQty.Width = 60;
+ //
// gv_fbatchQty
//
this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "鏀惰揣鏁伴噺";
+ this.gv_fbatchQty.Caption = "鎶芥鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
this.gv_fbatchQty.MinWidth = 30;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
- this.gv_fbatchQty.VisibleIndex = 9;
+ this.gv_fbatchQty.VisibleIndex = 10;
this.gv_fbatchQty.Width = 80;
//
// gv_fcheckResu
@@ -626,23 +632,8 @@
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 10;
+ this.gv_fcheckResu.VisibleIndex = 11;
this.gv_fcheckResu.Width = 50;
- //
- // gv_fcovertQty
- //
- this.gv_fcovertQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcovertQty.AppearanceCell.Options.UseFont = true;
- this.gv_fcovertQty.Caption = "杞崲鏁伴噺";
- this.gv_fcovertQty.FieldName = "fcovertQty";
- this.gv_fcovertQty.MinWidth = 30;
- this.gv_fcovertQty.Name = "gv_fcovertQty";
- this.gv_fcovertQty.OptionsColumn.AllowEdit = false;
- this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
- this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
- this.gv_fcovertQty.Visible = true;
- this.gv_fcovertQty.VisibleIndex = 11;
- this.gv_fcovertQty.Width = 60;
//
// gv_remarks
//
@@ -683,7 +674,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 15;
+ this.gv_fcheckDate.VisibleIndex = 14;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -697,7 +688,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 14;
+ this.gv_createBy.VisibleIndex = 15;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -738,31 +729,6 @@
this.gv_lastupdateDate.VisibleIndex = 18;
this.gv_lastupdateDate.Width = 120;
//
- // gv_fngHandle
- //
- this.gv_fngHandle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
- this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
- this.gv_fngHandle.FieldName = "fngHandle";
- this.gv_fngHandle.MinWidth = 30;
- this.gv_fngHandle.Name = "gv_fngHandle";
- this.gv_fngHandle.OptionsColumn.AllowEdit = false;
- this.gv_fngHandle.Tag = "query_a.fng_handle";
- this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 19;
- this.gv_fngHandle.Width = 100;
- //
- // bandedGridColumn1
- //
- this.bandedGridColumn1.Caption = "鏀舵枡缁勭粐";
- this.bandedGridColumn1.FieldName = "receivingOrg";
- this.bandedGridColumn1.MinWidth = 50;
- this.bandedGridColumn1.Name = "bandedGridColumn1";
- this.bandedGridColumn1.Tag = "org.fnamber";
- this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 20;
- this.bandedGridColumn1.Width = 250;
- //
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
@@ -770,7 +736,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 21;
+ this.gridColumn18.VisibleIndex = 19;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -780,26 +746,8 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 22;
+ this.gridColumn19.VisibleIndex = 20;
this.gridColumn19.Width = 94;
- //
- // gridColumn17
- //
- this.gridColumn17.Caption = "涓婚敭Guid";
- this.gridColumn17.FieldName = "guid";
- this.gridColumn17.MinWidth = 25;
- this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 94;
- //
- // gridColumn23
- //
- this.gridColumn23.Caption = "閲囪喘鍗曞彿";
- this.gridColumn23.FieldName = "cgdNo";
- this.gridColumn23.MinWidth = 25;
- this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 23;
- this.gridColumn23.Width = 94;
//
// gridColumn30
//
@@ -808,6 +756,24 @@
this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Width = 94;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "浜х嚎ID";
+ this.gridColumn13.FieldName = "lineId";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 21;
+ this.gridColumn13.Width = 94;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "涓婚敭Guid";
+ this.gridColumn17.FieldName = "guid";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Width = 94;
//
// pageBar1
//
@@ -866,7 +832,7 @@
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_fcheckBy);
- this.layoutMx1.Controls.Add(this.txt_checkQty);
+ this.layoutMx1.Controls.Add(this.txt_fbatchQty);
this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
this.layoutMx1.Controls.Add(this.txt_fsubmit);
@@ -878,17 +844,16 @@
this.layoutMx1.Controls.Add(this.txt_lotNo2);
this.layoutMx1.Controls.Add(this.textEdit5);
this.layoutMx1.Controls.Add(this.txt_epTag);
- this.layoutMx1.Controls.Add(this.textEdit1);
- this.layoutMx1.Controls.Add(this.textEdit2);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_createDate);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
- this.layoutControlItem7,
this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(813, 589, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(267, 359, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
this.layoutMx1.TabIndex = 0;
@@ -1049,20 +1014,20 @@
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
- // txt_checkQty
+ // txt_fbatchQty
//
- this.txt_checkQty.Location = new System.Drawing.Point(414, 12);
- this.txt_checkQty.Name = "txt_checkQty";
- this.txt_checkQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_checkQty.Properties.Appearance.Options.UseFont = true;
- this.txt_checkQty.Size = new System.Drawing.Size(254, 28);
- this.txt_checkQty.StyleController = this.layoutMx1;
- this.txt_checkQty.TabIndex = 222;
- this.txt_checkQty.Tag = "";
+ this.txt_fbatchQty.Location = new System.Drawing.Point(414, 12);
+ this.txt_fbatchQty.Name = "txt_fbatchQty";
+ this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
+ this.txt_fbatchQty.Size = new System.Drawing.Size(254, 28);
+ this.txt_fbatchQty.StyleController = this.layoutMx1;
+ this.txt_fbatchQty.TabIndex = 222;
+ this.txt_fbatchQty.Tag = "";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 44);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 109);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
@@ -1080,7 +1045,7 @@
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
+ this.txt_fsubmit.Location = new System.Drawing.Point(1002, 142);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
@@ -1165,23 +1130,23 @@
this.txt_epTag.StyleController = this.layoutMx1;
this.txt_epTag.TabIndex = 820;
//
- // textEdit1
+ // txt_createBy
//
- this.textEdit1.Location = new System.Drawing.Point(1074, 109);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Size = new System.Drawing.Size(256, 24);
- this.textEdit1.StyleController = this.layoutMx1;
- this.textEdit1.TabIndex = 822;
- this.textEdit1.Tag = "readonly";
+ this.txt_createBy.Location = new System.Drawing.Point(1074, 12);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 822;
+ this.txt_createBy.Tag = "readonly";
//
- // textEdit2
+ // txt_createDate
//
- this.textEdit2.Location = new System.Drawing.Point(1074, 142);
- this.textEdit2.Name = "textEdit2";
- this.textEdit2.Size = new System.Drawing.Size(256, 24);
- this.textEdit2.StyleController = this.layoutMx1;
- this.textEdit2.TabIndex = 823;
- this.textEdit2.Tag = "readonly";
+ this.txt_createDate.Location = new System.Drawing.Point(1074, 44);
+ this.txt_createDate.Name = "txt_createDate";
+ this.txt_createDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_createDate.StyleController = this.layoutMx1;
+ this.txt_createDate.TabIndex = 823;
+ this.txt_createDate.Tag = "readonly";
//
// txt_itemName
//
@@ -1204,13 +1169,6 @@
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
//
- // layoutControlItem7
- //
- this.layoutControlItem7.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.Size = new System.Drawing.Size(0, 0);
- this.layoutControlItem7.TextSize = new System.Drawing.Size(50, 20);
- //
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_guid;
@@ -1227,9 +1185,6 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem15,
- this.layoutControlItem16,
- this.layoutControlItem14,
this.layoutControlItem1,
this.layoutControlItem23,
this.layoutControlItem8,
@@ -1246,8 +1201,6 @@
this.layoutControlItem32,
this.layoutControlItem12,
this.layoutControlItem26,
- this.layoutControlItem31,
- this.layoutControlItem33,
this.layoutControlItem18,
this.layoutControlItem29,
this.layoutControlItem5,
@@ -1255,6 +1208,11 @@
this.layoutControlItem4,
this.layoutControlItem6,
this.layoutControlItem34,
+ this.layoutControlItem31,
+ this.layoutControlItem33,
+ this.layoutControlItem16,
+ this.layoutControlItem15,
+ this.layoutControlItem14,
this.layoutControlItem28});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
@@ -1299,39 +1257,6 @@
this.Root.Size = new System.Drawing.Size(1342, 282);
this.Root.TextVisible = false;
//
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(990, 32);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 32);
- this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem16.Text = "瀹℃牳浜�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 32);
- this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
- //
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_releaseNo;
@@ -1375,7 +1300,7 @@
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_checkQty;
+ this.layoutControlItem9.Control = this.txt_fbatchQty;
this.layoutControlItem9.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -1505,28 +1430,6 @@
this.layoutControlItem26.Text = "杩斿伐宸ュ簭";
this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.textEdit1;
- this.layoutControlItem31.Location = new System.Drawing.Point(990, 97);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem31.Text = "鍒涘缓浜�";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.textEdit2;
- this.layoutControlItem33.Location = new System.Drawing.Point(990, 130);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem33.Size = new System.Drawing.Size(332, 33);
- this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
- //
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fmanageNo;
@@ -1600,6 +1503,61 @@
this.layoutControlItem34.Size = new System.Drawing.Size(330, 33);
this.layoutControlItem34.Text = "浜у搧鍚嶇О";
this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_createBy;
+ this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem31.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem31.Text = "鍒涘缓浜�";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txt_createDate;
+ this.layoutControlItem33.Location = new System.Drawing.Point(990, 32);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem33.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_fsubmitDate;
+ this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem16.Text = "瀹℃牳浜�";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_fsubmitBy;
+ this.layoutControlItem15.Location = new System.Drawing.Point(990, 97);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fsubmit;
+ this.layoutControlItem14.Location = new System.Drawing.Point(990, 130);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem14.Size = new System.Drawing.Size(332, 33);
+ this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
//
// layoutControlItem28
//
@@ -2509,7 +2467,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
@@ -2521,16 +2479,12 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lotNo2.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_epTag.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
@@ -2547,8 +2501,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
@@ -2556,6 +2508,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
@@ -2614,7 +2571,6 @@
private DevExpress.XtraGrid.GridControl gcMain1;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gv_fsubmit;
private DevExpress.XtraGrid.Columns.GridColumn gv_lotNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_lifnr;
@@ -2632,8 +2588,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
- private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
@@ -2645,21 +2599,16 @@
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_lotNo1;
- private DevExpress.XtraEditors.TextEdit txt_checkQty;
+ private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
-
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
private DevExpress.XtraEditors.TextEdit txt_fsubmitDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2764,12 +2713,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private UserControl.UcLookWorkline txt_lineId;
- private DevExpress.XtraEditors.TextEdit textEdit1;
- private DevExpress.XtraEditors.TextEdit textEdit2;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
+ private DevExpress.XtraEditors.TextEdit txt_createDate;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
@@ -2779,6 +2726,12 @@
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 0e98dff..87d1ea3 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -1,4 +1,8 @@
-锘縰sing Gs.DevApp.Entity;
+锘縰sing DevExpress.Utils;
+using DevExpress.XtraGrid.Views.Base;
+using DevExpress.XtraGrid.Views.Grid;
+using DevExpress.XtraGrid.Views.Grid.ViewInfo;
+using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
@@ -7,9 +11,11 @@
using System.Collections.Generic;
using System.Configuration;
using System.Data;
+using System.Drawing;
using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
+
namespace Gs.DevApp.DevFrm.FQC
{
@@ -62,7 +68,7 @@
{
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛閫夋嫨浜х嚎锛�");
return;
- }
+ }
var frm = new SelectFqcItem(_lineId);
frm.UpdateParent += (ss, ee) =>
{
@@ -84,7 +90,7 @@
frm.ShowDialog();
};
}
-
+
/// <summary>
/// 鎵归噺褰曞叆
/// </summary>
@@ -136,7 +142,7 @@
};
try
{
- string strJson = UtilityHelper.HttpPost("", _webServiceName + "ReloadModel5", JsonConvert.SerializeObject(_obj));
+ string strJson = UtilityHelper.HttpPost("", "MesQaItemsDetect01Manager/ReloadModel5", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
@@ -196,7 +202,7 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EdtModel12",
+ "MesQaItemsDetect01Manager/EdtModel12",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
@@ -448,30 +454,30 @@
{
toolBarMenu1.isSetBtn = false;
string _txt_djType = txt_djType.Text.Trim();
- string _txt_checkQty = txt_checkQty.Text.Trim();
+ string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
string _txt_lifnr = txt_lifnr.Text.Trim();
string _txt_suppId = txt_suppId.GetId();
string _txt_lineId = txt_lineId.GetId();
string _txt_itemId = txt_itemId.Text.Trim();
string _txt_remarks = txt_remarks.Text.Trim();
- string _txt_workNo = txt_workNo.Text.Trim();
+ string _txt_workNo = txt_workNo.GetCode();
string _txt_epTag = txt_epTag.Text.Trim();
string _txt_fzrId = txt_fzrId.GetId();
- string _txt_msg = txt_msg.Text.Trim();
+ string _txt_msg = txt_msg.TextTxt;
string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
string _txt_lotNo2 = txt_lotNo2.Text.Trim();
string _txt_lotNo1 = txt_lotNo1.Text.Trim();
string _txt_lotNo = txt_lotNo.Text.Trim();
- if (txt_djType.SelectedIndex<=0)
+ if (txt_djType.SelectedIndex <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.Warning("鍗曟嵁绫诲瀷涓嶈兘涓虹┖锛�");
txt_djType.Focus();
return;
}
- if (string.IsNullOrEmpty(_txt_checkQty.Trim()))
+ if (string.IsNullOrEmpty(_txt_fbatchQty.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥鏁伴噺涓嶈兘涓虹┖锛�");
- txt_checkQty.Focus();
+ txt_fbatchQty.Focus();
return;
}
if (string.IsNullOrEmpty(_txt_lineId.Trim()))
@@ -502,7 +508,7 @@
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
djType = _txt_djType,
- checkQty = _txt_checkQty,
+ fbatchQty = _txt_fbatchQty,
lifnr = _txt_lifnr,
suppId = _txt_suppId,
lineId = _txt_lineId,
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index f690b68..ab8013b 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -991,12 +991,6 @@
<Compile Include="UserControl\UcBtnPrint.Designer.cs">
<DependentUpon>UcBtnPrint.cs</DependentUpon>
</Compile>
- <Compile Include="UserControl\UcComBox.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="UserControl\UcComBox.Designer.cs">
- <DependentUpon>UcComBox.cs</DependentUpon>
- </Compile>
<Compile Include="UserControl\UcDictionary.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1020,12 +1014,6 @@
</Compile>
<Compile Include="UserControl\UcLookDaa.Designer.cs">
<DependentUpon>UcLookDaa.cs</DependentUpon>
- </Compile>
- <Compile Include="UserControl\UcLookDefectType.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Include="UserControl\UcLookDefectType.Designer.cs">
- <DependentUpon>UcLookDefectType.cs</DependentUpon>
</Compile>
<Compile Include="UserControl\UcLookDepartment.cs">
<SubType>UserControl</SubType>
@@ -1536,9 +1524,6 @@
<EmbeddedResource Include="UserControl\UcBtnPrint.resx">
<DependentUpon>UcBtnPrint.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="UserControl\UcComBox.resx">
- <DependentUpon>UcComBox.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookCk.resx">
<DependentUpon>UcLookCk.cs</DependentUpon>
</EmbeddedResource>
@@ -1547,9 +1532,6 @@
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookDaa.resx">
<DependentUpon>UcLookDaa.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="UserControl\UcLookDefectType.resx">
- <DependentUpon>UcLookDefectType.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookDepartment.resx">
<DependentUpon>UcLookDepartment.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 3be17dd..b68706e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -14,6 +14,7 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
+using DevExpress.DataAccess.Native.EntityFramework;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid;
@@ -71,7 +72,7 @@
{
Size _size; string _caption; Color _color; Padding _pad;
(_size, _caption, _color, _pad) = getLoading();
- DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:"+meth, _caption, _size);
+ DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鍔犺浇杩涘害:" + meth, _caption, _size);
wdf.BackColor = _color;
wdf.Padding = _pad;
wdf.SetCaption("鍔犺浇杩涘害:" + meth);
@@ -254,6 +255,8 @@
return rto;
}
+
+ #region 鎵归噺澶勭悊瀵瑰儚锛屾枃鏈�硷紝鍖呭惈娓呯┖锛岀鐢紝鍚敤涓夌
/// <summary>
/// 鏍规嵁瀵硅薄鎵归噺璁剧疆鏂囨湰妗嗙殑鍊�
/// </summary>
@@ -272,7 +275,6 @@
foreach (GridColumn colmn in gv.Columns)
{
colmn.OptionsColumn.AllowEdit = true;
-
if (colmn.Name.ToString().Contains("gvBtnAlawys"))
{
colmn.Visible = true;
@@ -362,14 +364,6 @@
txt.ReadOnly = isEdt;
continue;
}
- //鑷畾涔変笅鎷�
- if (colType is UcComBox)
- {
- var txt = colType as UcComBox;
- txt.Val = strVal;
- txt.Enabled = !isEdt;
- continue;
- }
//鏂囨湰
if (colType is TextEdit)
{
@@ -384,6 +378,7 @@
txt.ReadOnly = isEdt;
continue;
}
+ //鏂囨湰鍩�
if (colType is MemoEdit)
{
var txt = colType as MemoEdit;
@@ -460,7 +455,6 @@
txt.Enabled = !isEdt;
continue;
}
-
//鏃堕棿
if (colType is DateTimePicker)
{
@@ -490,10 +484,7 @@
{
var txt = colType as UcLookCk;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔変緵搴斿晢
@@ -501,10 +492,7 @@
{
var txt = colType as UcLookSupplier;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔夌墿鏂�
@@ -512,10 +500,7 @@
{
var txt = colType as UcLookItems;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾杞﹂棿
@@ -523,10 +508,7 @@
{
var txt = colType as UcLookWorkshop;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾浜х嚎
@@ -534,10 +516,7 @@
{
var txt = colType as UcLookWorkline;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鍗曚綅
@@ -545,10 +524,7 @@
{
var txt = colType as UcLookUnit;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾瀹㈡埛
@@ -556,10 +532,7 @@
{
var txt = colType as UcLookCustomer;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鍛樺伐
@@ -567,10 +540,7 @@
{
var txt = colType as UcLookStaff;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾缁勭粐
@@ -578,10 +548,7 @@
{
var txt = colType as UcLookOrg;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鐢ㄦ埛
@@ -589,10 +556,7 @@
{
var txt = colType as UcLookUser;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鎵撳嵃鏈�
@@ -600,21 +564,7 @@
{
var txt = colType as UcLookPrint;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
- continue;
- }
- //鑷畾缂洪櫡绫诲埆
- if (colType is UcLookDefectType)
- {
- var txt = colType as UcLookDefectType;
- txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾閮ㄩ棬
@@ -622,10 +572,7 @@
{
var txt = colType as UcLookDepartment;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾daa
@@ -633,10 +580,7 @@
{
var txt = colType as UcLookDaa;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾濮斿
@@ -644,10 +588,7 @@
{
var txt = colType as UcLookWwgd;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾閿�鍞�
@@ -655,10 +596,7 @@
{
var txt = colType as UcLookSales;
txt.SetIdOrCode(strVal);
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
if (colType is SimpleButton)
@@ -667,16 +605,20 @@
txt.Enabled = !isEdt;
continue;
}
-
+ //鑷畾宸ュ簭
+ if (colType is UcLookGx)
+ {
+ var txt = colType as UcLookGx;
+ txt.SetIdOrCode(strVal);
+ txt.IsReadly = isEdt;
+ continue;
+ }
//鑷畾涓嶈壇
if (colType is UcDictionary)
{
var txt = colType as UcDictionary;
txt.TextTxt = (strVal);
- //if (txt.IsReadly == false)
- // txt.Enabled = !isEdt;
- //else
- // txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
}
@@ -768,14 +710,6 @@
txt.ReadOnly = isEdt;
continue;
}
- //鑷畾涔夌殑涓嬫媺
- if (ctrl is UcComBox)
- {
- var txt = ctrl as UcComBox;
- txt.Val = "0";
- txt.Enabled = !isEdt;
- continue;
- }
//鏂囨湰
if (ctrl is TextEdit)
{
@@ -824,7 +758,7 @@
{
var txt = ctrl as UcLookCk;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔変緵搴斿晢
@@ -832,7 +766,7 @@
{
var txt = ctrl as UcLookSupplier;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔夌墿鏂�
@@ -840,7 +774,7 @@
{
var txt = ctrl as UcLookItems;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾杞﹂棿
@@ -848,7 +782,7 @@
{
var txt = ctrl as UcLookWorkshop;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾浜х嚎
@@ -856,7 +790,7 @@
{
var txt = ctrl as UcLookWorkline;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鍗曚綅
@@ -864,7 +798,7 @@
{
var txt = ctrl as UcLookUnit;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾瀹㈡埛
@@ -872,15 +806,15 @@
{
var txt = ctrl as UcLookCustomer;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
- //鑷畾瀹㈡埛
+ //鑷畾鍛樺伐
if (ctrl is UcLookStaff)
{
var txt = ctrl as UcLookStaff;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾缁勭粐
@@ -888,7 +822,7 @@
{
var txt = ctrl as UcLookOrg;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鐢ㄦ埛
@@ -896,7 +830,7 @@
{
var txt = ctrl as UcLookUser;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鎵撳嵃鏈�
@@ -904,23 +838,16 @@
{
var txt = ctrl as UcLookPrint;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
- //鑷畾缂洪櫡绫诲埆
- if (ctrl is UcLookDefectType)
- {
- var txt = ctrl as UcLookDefectType;
- txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
- continue;
- }
+
//鑷畾閮ㄩ棬
if (ctrl is UcLookDepartment)
{
var txt = ctrl as UcLookDepartment;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾daa
@@ -928,7 +855,7 @@
{
var txt = ctrl as UcLookDaa;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾濮斿
@@ -936,7 +863,7 @@
{
var txt = ctrl as UcLookWwgd;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾閿�鍞�
@@ -944,7 +871,23 @@
{
var txt = ctrl as UcLookSales;
txt.SetIdOrCode("-1");
- txt.Enabled = !isEdt;
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾宸ュ簭
+ if (ctrl is UcLookGx)
+ {
+ var txt = ctrl as UcLookGx;
+ txt.SetIdOrCode("-1");
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾涓嶈壇
+ if (ctrl is UcDictionary)
+ {
+ var txt = ctrl as UcDictionary;
+ txt.TextTxt = "";
+ txt.IsReadly = isEdt;
continue;
}
if (ctrl is SimpleButton)
@@ -1019,14 +962,6 @@
txt.ReadOnly = isEdt;
continue;
}
- //涓嬫媺
- if (ctrl is UcComBox)
- {
- var txt = ctrl as UcComBox;
- txt.Val = "0";
- txt.Enabled = !isEdt;
- continue;
- }
//鏃ユ湡
if (ctrl is DateTimePicker)
@@ -1052,160 +987,120 @@
if (ctrl is UcLookCk)
{
var txt = ctrl as UcLookCk;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔変緵搴斿晢
if (ctrl is UcLookSupplier)
{
var txt = ctrl as UcLookSupplier;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔夌墿鏂�
if (ctrl is UcLookItems)
{
var txt = ctrl as UcLookItems;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔夎溅闂�
if (ctrl is UcLookWorkshop)
{
var txt = ctrl as UcLookWorkshop;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔変骇绾�
if (ctrl is UcLookWorkline)
{
var txt = ctrl as UcLookWorkline;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔夊崟浣�
if (ctrl is UcLookUnit)
{
var txt = ctrl as UcLookUnit;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔夊鎴�
if (ctrl is UcLookCustomer)
{
var txt = ctrl as UcLookCustomer;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾涔夊憳宸�
if (ctrl is UcLookStaff)
{
var txt = ctrl as UcLookStaff;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾缁勭粐
if (ctrl is UcLookOrg)
{
var txt = ctrl as UcLookOrg;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鐢ㄦ埛
if (ctrl is UcLookUser)
{
var txt = ctrl as UcLookUser;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾鎵撳嵃
if (ctrl is UcLookPrint)
{
var txt = ctrl as UcLookPrint;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
- //鑷畾缂洪櫡绫诲埆
- if (ctrl is UcLookDefectType)
- {
- var txt = ctrl as UcLookDefectType;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
- continue;
- }
+
//鑷畾閮ㄩ棬
if (ctrl is UcLookDepartment)
{
var txt = ctrl as UcLookDepartment;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾daa
if (ctrl is UcLookDaa)
{
var txt = ctrl as UcLookDaa;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾濮斿
if (ctrl is UcLookWwgd)
{
var txt = ctrl as UcLookWwgd;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
continue;
}
//鑷畾閿�鍞�
if (ctrl is UcLookSales)
{
var txt = ctrl as UcLookSales;
- if (txt.IsReadly == false)
- txt.Enabled = !isEdt;
- else
- txt.Enabled = false;
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾宸ュ簭
+ if (ctrl is UcLookGx)
+ {
+ var txt = ctrl as UcLookGx;
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾涓嶈壇
+ if (ctrl is UcDictionary)
+ {
+ var txt = ctrl as UcDictionary;
+ txt.IsReadly = isEdt;
continue;
}
if (ctrl is SimpleButton)
@@ -1216,6 +1111,8 @@
}
}
}
+ #endregion
+
private static bool _isRead(object obj, bool isEdt = false)
{
@@ -1892,6 +1789,8 @@
//}
}
};
+
+
}
private static void ActiveEditor_MouseUp(object sender, MouseEventArgs e)
{
@@ -1917,7 +1816,7 @@
/// <param name="pageBar1"></param>
/// <param name="action"></param>
/// <param name="page"></param>
- public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null,Label lbGuid=null)
+ public static void SetTabParameter(GridView gridView1, DevExpress.XtraTab.XtraTabControl xtraTabControl1, UcPageBar pageBar1, DelegateGetModel action = null, DelegateGetList page = null, Label lbGuid = null)
{
xtraTabControl1.SelectedPageChanged += (s, e) =>
{
@@ -1955,7 +1854,7 @@
rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], lbGuid.Text);
if (rowHandle < 0)
rowHandle = 0;
- gridView1.FocusedRowHandle = rowHandle ;
+ gridView1.FocusedRowHandle = rowHandle;
}
};
}
@@ -2046,7 +1945,7 @@
Regex regex = new Regex("^[0-9]+$");
return regex.IsMatch(str);
}
-
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
index 01c25d3..11187d2 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.cs
@@ -1,18 +1,8 @@
-锘縰sing DevExpress.Utils.VisualEffects;
-using DevExpress.XtraBars;
-using DevExpress.XtraEditors;
-using Gs.DevApp.DevFrm.Rpt;
+锘縰sing Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
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
diff --git a/DevApp/Gs.DevApp/UserControl/UcComBox.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcComBox.Designer.cs
deleted file mode 100644
index 5b4699d..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcComBox.Designer.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-锘縩amespace Gs.DevApp.UserControl
-{
- partial class UcComBox
- {
- /// <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.txt_isStatus = new DevExpress.XtraEditors.ComboBoxEdit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).BeginInit();
- this.SuspendLayout();
- //
- // txt_isStatus
- //
- this.txt_isStatus.Dock = System.Windows.Forms.DockStyle.Fill;
- this.txt_isStatus.Location = new System.Drawing.Point(0, 0);
- this.txt_isStatus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.txt_isStatus.Name = "txt_isStatus";
-
- this.txt_isStatus.Properties.Appearance.Options.UseFont = true;
- this.txt_isStatus.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_isStatus.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_isStatus.Size = new System.Drawing.Size(178, 28);
- this.txt_isStatus.TabIndex = 115;
- //
- // UcComBox
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.txt_isStatus);
- this.Name = "UcComBox";
- this.Size = new System.Drawing.Size(178, 30);
- ((System.ComponentModel.ISupportInitialize)(this.txt_isStatus.Properties)).EndInit();
- this.ResumeLayout(false);
-
- }
-
- #endregion
-
- private DevExpress.XtraEditors.ComboBoxEdit txt_isStatus;
- }
-}
diff --git a/DevApp/Gs.DevApp/UserControl/UcComBox.cs b/DevApp/Gs.DevApp/UserControl/UcComBox.cs
deleted file mode 100644
index f428461..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcComBox.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.ToolBox;
-
-namespace Gs.DevApp.UserControl
-{
- public partial class UcComBox : XtraUserControl
- {
- private string _Text = "-璇烽�夋嫨-";
-
- private string _Value = "0";
-
- public UcComBox()
- {
- InitializeComponent();
- txt_isStatus.Properties.Items.Add(new CboItemEntity("", "-璇烽�夋嫨-"));
- txt_isStatus.Properties.Items.Add(new CboItemEntity("1", "姝ｅ父"));
- txt_isStatus.Properties.Items.Add(new CboItemEntity("-1", "涓嶆甯�"));
- }
-
- /// <summary>
- /// 鏄剧ず鍊�
- /// </summary>
- public string Txt
- {
- get => txt_isStatus.Text;
- set => _Text = value;
- }
-
- /// <summary>
- /// 瀵硅薄鍊�
- /// </summary>
- public string Val
- {
- get
- {
- switch (txt_isStatus.SelectedIndex)
- {
- case 0:
- return "0";
- case 1:
- return "1";
- case 2:
- return "-1";
- default:
- return "0";
- }
- }
- set
- {
- _Value = value;
- if (!string.IsNullOrEmpty(value))
- switch (int.Parse(value))
- {
- case 0:
- txt_isStatus.SelectedIndex = 0;
- break;
- case 1:
- txt_isStatus.SelectedIndex = 1;
- break;
- case -1:
- txt_isStatus.SelectedIndex = 2;
- break;
- default:
- txt_isStatus.SelectedIndex = 0;
- break;
- }
- }
- }
-
- //public override string ToString()
- //{
- // return this.Text.ToString();
- //}
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcComBox.resx b/DevApp/Gs.DevApp/UserControl/UcComBox.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcComBox.resx
+++ /dev/null
@@ -1,120 +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>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcDictionary.cs b/DevApp/Gs.DevApp/UserControl/UcDictionary.cs
index 425fe1e..d2c5e04 100644
--- a/DevApp/Gs.DevApp/UserControl/UcDictionary.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcDictionary.cs
@@ -1,14 +1,6 @@
-锘縰sing DevExpress.XtraEditors;
-using Gs.DevApp.DevFrm.Work;
+锘縰sing Gs.DevApp.DevFrm.Work;
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
{
@@ -51,6 +43,15 @@
get;
set;
}
+ public bool IsReadly
+ {
+ set
+ {
+ this.memoEdit1.ReadOnly = value;
+ this.simpleButton1.Enabled = !value;
+ }
+ }
+
private void simpleButton1_Click(object sender, EventArgs e)
{
UcDictionarySelect frm = new UcDictionarySelect(this.BtnTxt, this.WhereTxt);
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
index 1b0b3e9..b69b033 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCk.cs
@@ -17,7 +17,7 @@
LookSearchSupplier_EditValueChanged;
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs b/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
index 3ad9c1a..81ff194 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookCustomer.cs
@@ -24,7 +24,7 @@
LookSearchSupplier_EditValueChanged;
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
index a097fd9..50f984f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDaa.cs
@@ -25,7 +25,7 @@
// getSuppler();
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.Designer.cs
deleted file mode 100644
index 4d8b98b..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.Designer.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-锘縩amespace Gs.DevApp.UserControl
-{
- partial class UcLookDefectType
- {
- /// <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.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn5 = 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.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(226, 28);
- this.lookSearchSupplier.TabIndex = 11;
- //
- // searchLookUpEdit1View
- //
- this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn2,
- this.gridColumn5,
- 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;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "缂洪櫡绫诲埆缂栫爜";
- this.gridColumn2.FieldName = "typeNo";
- this.gridColumn2.MinWidth = 80;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.UnboundDataType = typeof(string);
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 80;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "缂洪櫡绫诲埆鎻忚堪";
- this.gridColumn5.FieldName = "typeMemo";
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 1;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "guid";
- this.gridColumn4.FieldName = "guid";
- this.gridColumn4.Name = "gridColumn4";
- //
- // UcLookDefectType
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.lookSearchSupplier);
- this.Name = "UcLookDefectType";
- this.Size = new System.Drawing.Size(226, 28);
- ((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 gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- }
-}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.cs b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.cs
deleted file mode 100644
index 1202843..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Newtonsoft.Json;
-using System;
-using System.Data;
-
-
-namespace Gs.DevApp.UserControl
-{
- public partial class UcLookDefectType : DevExpress.XtraEditors.XtraUserControl
- {
- public UcLookDefectType()
- {
- 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, "a.type_no", "asc", "", " and 1=1");
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("", "MesDefectTypeManager/GetListPage", json);
- var rtn = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = rtn.rtnData.list;
- lookSearchSupplier.Properties.DataSource = dt;
- lookSearchSupplier.Properties.DisplayMember = "typeNo";
- lookSearchSupplier.Properties.ValueMember = "guid";
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- public string GetCode()
- {
- var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
- if (row != null)
- {
- string id = row["typeNo"].ToString();
- return id;
- }
- return "";
- }
- public string GetName()
- {
- var name = lookSearchSupplier.Text.Trim();
- return name;
- }
- public string GetMemo()
- {
- var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
- if (row != null)
- {
- string id = row["typeMemo"].ToString();
- return id;
- }
- return "";
- }
- public void SetIdOrCode(string Code)
- {
- if (Code == "-1" || string.IsNullOrEmpty(Code))
- {
- lookSearchSupplier.EditValue = null;
- return;
- }
- //lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
- lookSearchSupplier.EditValue = (((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/UcLookDefectType.resx b/DevApp/Gs.DevApp/UserControl/UcLookDefectType.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/UserControl/UcLookDefectType.resx
+++ /dev/null
@@ -1,120 +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>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index bd963ec..df564e1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -19,7 +19,7 @@
LookSearchSupplier_EditValueChanged;
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
index 50f0506..1dddcd1 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookGx.cs
@@ -24,7 +24,10 @@
LookSearchSupplier_EditValueChanged;
getSuppler("");
}
- public bool IsReadly { get; set; }
+
+
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
index a3a35eb..3e4aa9a 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.cs
@@ -23,7 +23,7 @@
get;
set;
}
- public bool IsReadly { get; set; }
+ public bool IsReadly { set; get; }
public UcLookHuoZhu()
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 94f9463..892c309 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -25,7 +25,7 @@
// getSuppler("");
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
index 019308e..bcc6805 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -22,7 +22,7 @@
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs b/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
index afe9eb4..da850fd 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookPrint.cs
@@ -26,7 +26,7 @@
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
index a37e3ba..79c61d5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSales.cs
@@ -25,7 +25,7 @@
// getSuppler();
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs b/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs
index 5bb017c..c64d0ea 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookStaff.cs
@@ -26,7 +26,7 @@
getSuppler();
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
index ada187e..2643608 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -20,7 +20,7 @@
lookSearchSupplier.EditValueChanged +=
LookSearchSupplier_EditValueChanged;
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs b/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
index ee92297..42966ad 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUnit.cs
@@ -25,7 +25,7 @@
getSuppler();
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookUser.cs b/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
index d4c968c..2bae741 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookUser.cs
@@ -19,7 +19,7 @@
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
index bc05709..dac73c5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkline.cs
@@ -24,7 +24,8 @@
lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
lookSearchSupplier.EditValueChanged += LookSearchSupplier_EditValueChanged;
}
- public bool IsReadly { get; set; }
+
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
index c654b40..163a52f 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWorkshop.cs
@@ -25,7 +25,7 @@
// getSuppler();
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs b/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
index cdaf3a1..9aaf561 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookWwgd.cs
@@ -25,7 +25,7 @@
getSuppler();
}
- public bool IsReadly { get; set; }
+ private bool _rdy; public bool IsReadly { set{ _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
/// <summary>
/// 鏀瑰彉浜嬩欢
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 5f655d9..a14a8a2 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -9,11 +9,9 @@
using System.Windows.Forms;
using DevExpress.XtraBars;
using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.TextEditController;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
-using DevExpress.XtraRichEdit.Export.Rtf;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
using Gs.DevApp.Entity;
--
Gitblit v1.9.3