From 2993e61e9d1fbe09884f1ec42307f41df60192e0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 24 十二月 2024 14:56:50 +0800
Subject: [PATCH] 细节修理
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | 22 ++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 26 +-
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 37 ++--
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | 82 +--------
DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs | 2
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 8
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs | 14
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 40 ++--
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx | 4
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | 63 ++++---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | 14 -
DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs | 50 +++---
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 32 ++-
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | 40 ++--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 14 +
18 files changed, 206 insertions(+), 248 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
index 51f7a5b..c709b16 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -42,20 +42,6 @@
getPageList(1);
}
-
- /// <summary>
- /// 鍙屽嚮浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void GcMain_MouseDoubleClick(object sender, MouseEventArgs e)
- {
- var rowGuid =
- UtilityHelper.GetCurrentDoubleRow(gridView1, e, "guid");
- if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid);
- }
-
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
index f76627b..6e1ae97 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -102,8 +102,8 @@
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -159,7 +159,7 @@
this.gvMx1depotSectionNamet.FieldName = "depotSectionNamet";
this.gvMx1depotSectionNamet.MinWidth = 50;
this.gvMx1depotSectionNamet.Name = "gvMx1depotSectionNamet";
- this.gvMx1depotSectionNamet.Tag = "query_a.depot_section_namet";
+ this.gvMx1depotSectionNamet.Tag = "edit";
this.gvMx1depotSectionNamet.Visible = true;
this.gvMx1depotSectionNamet.VisibleIndex = 5;
this.gvMx1depotSectionNamet.Width = 94;
@@ -172,7 +172,7 @@
this.gvMx1kbQty.FieldName = "kbQty";
this.gvMx1kbQty.MinWidth = 50;
this.gvMx1kbQty.Name = "gvMx1kbQty";
- this.gvMx1kbQty.Tag = "query_a.kb_qty";
+ this.gvMx1kbQty.Tag = "yz_quantity_0_edit";
this.gvMx1kbQty.UnboundDataType = typeof(decimal);
this.gvMx1kbQty.Visible = true;
this.gvMx1kbQty.VisibleIndex = 4;
@@ -214,7 +214,7 @@
this.gvMx1description.FieldName = "description";
this.gvMx1description.MinWidth = 50;
this.gvMx1description.Name = "gvMx1description";
- this.gvMx1description.Tag = "query_a.description";
+ this.gvMx1description.Tag = "edit";
this.gvMx1description.Visible = true;
this.gvMx1description.VisibleIndex = 3;
this.gvMx1description.Width = 94;
@@ -227,7 +227,7 @@
this.gvMx1completenessFlag.FieldName = "completenessFlag";
this.gvMx1completenessFlag.MinWidth = 50;
this.gvMx1completenessFlag.Name = "gvMx1completenessFlag";
- this.gvMx1completenessFlag.Tag = "query_a.completeness_flag";
+ this.gvMx1completenessFlag.Tag = "edit";
this.gvMx1completenessFlag.UnboundDataType = typeof(bool);
this.gvMx1completenessFlag.Visible = true;
this.gvMx1completenessFlag.VisibleIndex = 2;
@@ -241,7 +241,7 @@
this.gvMx1depotSectionName.FieldName = "depotSectionName";
this.gvMx1depotSectionName.MinWidth = 50;
this.gvMx1depotSectionName.Name = "gvMx1depotSectionName";
- this.gvMx1depotSectionName.Tag = "query_a.depot_section_name";
+ this.gvMx1depotSectionName.Tag = "edit";
this.gvMx1depotSectionName.Visible = true;
this.gvMx1depotSectionName.VisibleIndex = 1;
this.gvMx1depotSectionName.Width = 94;
@@ -254,7 +254,7 @@
this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
this.gvMx1depotSectionCode.MinWidth = 50;
this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
- this.gvMx1depotSectionCode.Tag = "query_a.depot_section_code";
+ this.gvMx1depotSectionCode.Tag = "edit";
this.gvMx1depotSectionCode.Visible = true;
this.gvMx1depotSectionCode.VisibleIndex = 0;
this.gvMx1depotSectionCode.Width = 94;
@@ -383,7 +383,7 @@
this.gv_isFkc.OptionsColumn.AllowEdit = false;
this.gv_isFkc.Tag = "query_a.is_fkc";
this.gv_isFkc.Visible = true;
- this.gv_isFkc.VisibleIndex = 11;
+ this.gv_isFkc.VisibleIndex = 12;
this.gv_isFkc.Width = 94;
//
// lb_zuid
@@ -417,7 +417,7 @@
this.gv_zuid.OptionsColumn.AllowEdit = false;
this.gv_zuid.Tag = "query_a.zuid";
this.gv_zuid.Visible = true;
- this.gv_zuid.VisibleIndex = 10;
+ this.gv_zuid.VisibleIndex = 11;
this.gv_zuid.Width = 94;
//
// lb_piType
@@ -491,7 +491,7 @@
this.gv_isNg.OptionsColumn.AllowEdit = false;
this.gv_isNg.Tag = "query_a.is_ng";
this.gv_isNg.Visible = true;
- this.gv_isNg.VisibleIndex = 9;
+ this.gv_isNg.VisibleIndex = 10;
this.gv_isNg.Width = 94;
//
// lb_isWy
@@ -525,7 +525,7 @@
this.gv_isWy.OptionsColumn.AllowEdit = false;
this.gv_isWy.Tag = "query_a.is_wy";
this.gv_isWy.Visible = true;
- this.gv_isWy.VisibleIndex = 8;
+ this.gv_isWy.VisibleIndex = 9;
this.gv_isWy.Width = 94;
//
// lb_iconType
@@ -579,7 +579,7 @@
this.gv_depottypecode.OptionsColumn.AllowEdit = false;
this.gv_depottypecode.Tag = "query_a.depottypecode";
this.gv_depottypecode.Visible = true;
- this.gv_depottypecode.VisibleIndex = 7;
+ this.gv_depottypecode.VisibleIndex = 8;
this.gv_depottypecode.Width = 94;
//
// lb_type2
@@ -673,7 +673,7 @@
this.gv_depottype.OptionsColumn.AllowEdit = false;
this.gv_depottype.Tag = "query_a.depottype";
this.gv_depottype.Visible = true;
- this.gv_depottype.VisibleIndex = 6;
+ this.gv_depottype.VisibleIndex = 7;
this.gv_depottype.Width = 94;
//
// lb_lastupdateDate
@@ -767,7 +767,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
+ this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 94;
//
// lb_description
@@ -801,7 +801,7 @@
this.gv_description.OptionsColumn.AllowEdit = false;
this.gv_description.Tag = "query_a.description";
this.gv_description.Visible = true;
- this.gv_description.VisibleIndex = 4;
+ this.gv_description.VisibleIndex = 5;
this.gv_description.Width = 94;
//
// lb_depotName
@@ -835,7 +835,7 @@
this.gv_depotName.OptionsColumn.AllowEdit = false;
this.gv_depotName.Tag = "query_a.depot_name";
this.gv_depotName.Visible = true;
- this.gv_depotName.VisibleIndex = 3;
+ this.gv_depotName.VisibleIndex = 4;
this.gv_depotName.Width = 150;
//
// lb_depotCode
@@ -869,7 +869,7 @@
this.gv_depotCode.OptionsColumn.AllowEdit = false;
this.gv_depotCode.Tag = "query_a.depot_code";
this.gv_depotCode.Visible = true;
- this.gv_depotCode.VisibleIndex = 2;
+ this.gv_depotCode.VisibleIndex = 3;
this.gv_depotCode.Width = 100;
//
// toolBarMenu1
@@ -908,6 +908,7 @@
this.gridView1.ColumnPanelRowHeight = 60;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
+ this.gridColumn4,
this.gv_id,
this.gv_depotCode,
this.gv_depotName,
@@ -919,7 +920,6 @@
this.gv_isNg,
this.gv_zuid,
this.gv_isFkc,
- this.gridColumn4,
this.gridColumn3,
this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
@@ -941,6 +941,19 @@
this.gridColumn1.VisibleIndex = 0;
this.gridColumn1.Width = 250;
//
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "瀹℃牳鐘舵��";
+ this.gridColumn4.FieldName = "checkStatus";
+ this.gridColumn4.MaxWidth = 50;
+ this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.UnboundDataType = typeof(bool);
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 1;
+ this.gridColumn4.Width = 50;
+ //
// gv_id
//
this.gv_id.Caption = "浠撳簱ID";
@@ -950,20 +963,8 @@
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.depot_Id";
this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 1;
+ this.gv_id.VisibleIndex = 2;
this.gv_id.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "瀹℃牳鐘舵��";
- this.gridColumn4.FieldName = "checkStatus";
- this.gridColumn4.MinWidth = 50;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.OptionsColumn.AllowEdit = false;
- this.gridColumn4.UnboundDataType = typeof(bool);
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 12;
- this.gridColumn4.Width = 94;
//
// gridColumn3
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 795be55..2cbec65 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -147,6 +147,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
+ toolBarMenu1.currentAction = "edit";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_depotCode, gridView1);
@@ -156,9 +157,16 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ }
}
@@ -197,9 +205,9 @@
DepotSectionCode = row["depotSectionCode"].ToString(),
DepotSectionName = row["DepotSectionName"].ToString(),
Description = row["Description"].ToString(),
- KbQty =Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
+ KbQty = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
DepotSectionNamet = row["depotSectionNamet"].ToString(),
- CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["completenessFlag"].ToString()),
+ CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBoole(row["completenessFlag"].ToString()),
});
}
var _obj = new MesDepots
@@ -222,7 +230,9 @@
{
lbGuid.Text = _rtn.rtnData;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
+ var gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews);
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
index 403fa39..047b623 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -41,11 +41,7 @@
this.lb_iqcType = new DevExpress.XtraEditors.LabelControl();
this.txt_iqcType = new DevExpress.XtraEditors.TextEdit();
this.gv_iqcType = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_factory = new DevExpress.XtraEditors.TextEdit();
this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_company = new DevExpress.XtraEditors.LabelControl();
- this.txt_company = new DevExpress.XtraEditors.TextEdit();
this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -84,8 +80,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_pgroup.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iqcTypeName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iqcType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
@@ -107,7 +101,7 @@
//
this.lb_description.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_description.Appearance.Options.UseFont = true;
- this.lb_description.Location = new System.Drawing.Point(554, 116);
+ this.lb_description.Location = new System.Drawing.Point(304, 121);
this.lb_description.Name = "lb_description";
this.lb_description.Size = new System.Drawing.Size(39, 21);
this.lb_description.TabIndex = 252;
@@ -115,7 +109,7 @@
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(599, 116);
+ this.txt_description.Location = new System.Drawing.Point(348, 117);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_description.Properties.Appearance.Options.UseFont = true;
@@ -140,7 +134,7 @@
//
this.lb_pgroup.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_pgroup.Appearance.Options.UseFont = true;
- this.lb_pgroup.Location = new System.Drawing.Point(270, 116);
+ this.lb_pgroup.Location = new System.Drawing.Point(270, 89);
this.lb_pgroup.Name = "lb_pgroup";
this.lb_pgroup.Size = new System.Drawing.Size(73, 21);
this.lb_pgroup.TabIndex = 247;
@@ -148,7 +142,7 @@
//
// txt_pgroup
//
- this.txt_pgroup.Location = new System.Drawing.Point(348, 116);
+ this.txt_pgroup.Location = new System.Drawing.Point(348, 85);
this.txt_pgroup.Name = "txt_pgroup";
this.txt_pgroup.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_pgroup.Properties.Appearance.Options.UseFont = true;
@@ -173,7 +167,7 @@
//
this.lb_iqcTypeName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_iqcTypeName.Appearance.Options.UseFont = true;
- this.lb_iqcTypeName.Location = new System.Drawing.Point(4, 116);
+ this.lb_iqcTypeName.Location = new System.Drawing.Point(4, 121);
this.lb_iqcTypeName.Name = "lb_iqcTypeName";
this.lb_iqcTypeName.Size = new System.Drawing.Size(101, 21);
this.lb_iqcTypeName.TabIndex = 243;
@@ -181,7 +175,7 @@
//
// txt_iqcTypeName
//
- this.txt_iqcTypeName.Location = new System.Drawing.Point(110, 116);
+ this.txt_iqcTypeName.Location = new System.Drawing.Point(110, 117);
this.txt_iqcTypeName.Name = "txt_iqcTypeName";
this.txt_iqcTypeName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_iqcTypeName.Properties.Appearance.Options.UseFont = true;
@@ -206,7 +200,7 @@
//
this.lb_iqcType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_iqcType.Appearance.Options.UseFont = true;
- this.lb_iqcType.Location = new System.Drawing.Point(38, 84);
+ this.lb_iqcType.Location = new System.Drawing.Point(38, 89);
this.lb_iqcType.Name = "lb_iqcType";
this.lb_iqcType.Size = new System.Drawing.Size(67, 21);
this.lb_iqcType.TabIndex = 240;
@@ -214,7 +208,7 @@
//
// txt_iqcType
//
- this.txt_iqcType.Location = new System.Drawing.Point(110, 84);
+ this.txt_iqcType.Location = new System.Drawing.Point(110, 85);
this.txt_iqcType.Name = "txt_iqcType";
this.txt_iqcType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_iqcType.Properties.Appearance.Options.UseFont = true;
@@ -235,25 +229,6 @@
this.gv_iqcType.VisibleIndex = 9;
this.gv_iqcType.Width = 94;
//
- // lb_factory
- //
- this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_factory.Appearance.Options.UseFont = true;
- this.lb_factory.Location = new System.Drawing.Point(537, 84);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(56, 21);
- this.lb_factory.TabIndex = 235;
- this.lb_factory.Text = "factory ";
- //
- // txt_factory
- //
- this.txt_factory.Location = new System.Drawing.Point(599, 84);
- this.txt_factory.Name = "txt_factory";
- this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_factory.Properties.Appearance.Options.UseFont = true;
- this.txt_factory.Size = new System.Drawing.Size(150, 28);
- this.txt_factory.TabIndex = 235;
- //
// gv_factory
//
this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -268,30 +243,11 @@
this.gv_factory.VisibleIndex = 1;
this.gv_factory.Width = 94;
//
- // lb_company
- //
- this.lb_company.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_company.Appearance.Options.UseFont = true;
- this.lb_company.Location = new System.Drawing.Point(272, 84);
- this.lb_company.Name = "lb_company";
- this.lb_company.Size = new System.Drawing.Size(71, 21);
- this.lb_company.TabIndex = 231;
- this.lb_company.Text = "company ";
- //
- // txt_company
- //
- this.txt_company.Location = new System.Drawing.Point(348, 84);
- this.txt_company.Name = "txt_company";
- this.txt_company.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_company.Properties.Appearance.Options.UseFont = true;
- this.txt_company.Size = new System.Drawing.Size(150, 28);
- this.txt_company.TabIndex = 231;
- //
// lb_lastupdateDate
//
this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateDate.Appearance.Options.UseFont = true;
- this.lb_lastupdateDate.Location = new System.Drawing.Point(32, 161);
+ this.lb_lastupdateDate.Location = new System.Drawing.Point(520, 121);
this.lb_lastupdateDate.Name = "lb_lastupdateDate";
this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21);
this.lb_lastupdateDate.TabIndex = 228;
@@ -299,7 +255,7 @@
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(110, 161);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(598, 117);
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;
@@ -324,7 +280,7 @@
//
this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdateBy.Appearance.Options.UseFont = true;
- this.lb_lastupdateBy.Location = new System.Drawing.Point(287, 161);
+ this.lb_lastupdateBy.Location = new System.Drawing.Point(537, 89);
this.lb_lastupdateBy.Name = "lb_lastupdateBy";
this.lb_lastupdateBy.Size = new System.Drawing.Size(56, 21);
this.lb_lastupdateBy.TabIndex = 226;
@@ -332,7 +288,7 @@
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(348, 161);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(598, 85);
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;
@@ -655,10 +611,6 @@
this.panel1.Controls.Add(this.txt_iqcTypeName);
this.panel1.Controls.Add(this.lb_iqcType);
this.panel1.Controls.Add(this.txt_iqcType);
- this.panel1.Controls.Add(this.lb_factory);
- this.panel1.Controls.Add(this.txt_factory);
- this.panel1.Controls.Add(this.lb_company);
- this.panel1.Controls.Add(this.txt_company);
this.panel1.Controls.Add(this.lb_lastupdateDate);
this.panel1.Controls.Add(this.txt_lastupdateDate);
this.panel1.Controls.Add(this.lb_lastupdateBy);
@@ -689,6 +641,7 @@
this.labelControl11.Size = new System.Drawing.Size(45, 18);
this.labelControl11.TabIndex = 130;
this.labelControl11.Text = "涓婚敭锛�";
+ this.labelControl11.Visible = false;
//
// lbGuid
//
@@ -697,6 +650,7 @@
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
+ this.lbGuid.Visible = false;
//
// Frm_MesItemType
//
@@ -711,8 +665,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_pgroup.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iqcTypeName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iqcType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
@@ -759,13 +711,7 @@
private DevExpress.XtraEditors.LabelControl lb_iqcType;
private DevExpress.XtraEditors.TextEdit txt_iqcType;
private DevExpress.XtraGrid.Columns.GridColumn gv_iqcType;
-
-private DevExpress.XtraEditors.LabelControl lb_factory;
-private DevExpress.XtraEditors.TextEdit txt_factory;
private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
-
-private DevExpress.XtraEditors.LabelControl lb_company;
-private DevExpress.XtraEditors.TextEdit txt_company;
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
index a28dfb1..b77b7fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -112,7 +112,7 @@
//
this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
- this.gvMx1createBy.Caption = "寤虹珛鑰� ";
+ this.gvMx1createBy.Caption = "寤虹珛鑰�";
this.gvMx1createBy.FieldName = "createBy";
this.gvMx1createBy.MinWidth = 50;
this.gvMx1createBy.Name = "gvMx1createBy";
@@ -126,25 +126,25 @@
//
this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1createDate.Caption = "寤虹珛鏃堕棿 ";
+ this.gvMx1createDate.Caption = "寤虹珛鏃堕棿";
this.gvMx1createDate.FieldName = "createDate";
- this.gvMx1createDate.MinWidth = 50;
+ this.gvMx1createDate.MinWidth = 180;
this.gvMx1createDate.Name = "gvMx1createDate";
this.gvMx1createDate.OptionsColumn.ReadOnly = true;
this.gvMx1createDate.Tag = "query_a.create_date";
this.gvMx1createDate.Visible = true;
this.gvMx1createDate.VisibleIndex = 5;
- this.gvMx1createDate.Width = 94;
+ this.gvMx1createDate.Width = 180;
//
// gvMx1remark
//
this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1remark.AppearanceCell.Options.UseFont = true;
- this.gvMx1remark.Caption = "澶囨敞 ";
+ this.gvMx1remark.Caption = "澶囨敞";
this.gvMx1remark.FieldName = "remark";
this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
- this.gvMx1remark.Tag = "query_a.remark";
+ this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
this.gvMx1remark.VisibleIndex = 2;
this.gvMx1remark.Width = 94;
@@ -153,11 +153,11 @@
//
this.gvMx1name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1name.AppearanceCell.Options.UseFont = true;
- this.gvMx1name.Caption = "浜х嚎鍚嶇О ";
+ this.gvMx1name.Caption = "浜х嚎鍚嶇О";
this.gvMx1name.FieldName = "name";
this.gvMx1name.MinWidth = 50;
this.gvMx1name.Name = "gvMx1name";
- this.gvMx1name.Tag = "query_a.name";
+ this.gvMx1name.Tag = "edit";
this.gvMx1name.Visible = true;
this.gvMx1name.VisibleIndex = 1;
this.gvMx1name.Width = 94;
@@ -166,11 +166,11 @@
//
this.gvMx1lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gvMx1lineNo.AppearanceCell.Options.UseFont = true;
- this.gvMx1lineNo.Caption = "浜х嚎缂栧彿 ";
+ this.gvMx1lineNo.Caption = "浜х嚎缂栧彿";
this.gvMx1lineNo.FieldName = "lineNo";
this.gvMx1lineNo.MinWidth = 50;
this.gvMx1lineNo.Name = "gvMx1lineNo";
- this.gvMx1lineNo.Tag = "query_a.line_no";
+ this.gvMx1lineNo.Tag = "edit";
this.gvMx1lineNo.Visible = true;
this.gvMx1lineNo.VisibleIndex = 0;
this.gvMx1lineNo.Width = 94;
@@ -234,6 +234,8 @@
this.gvMx1isStatus.FieldName = "isStatus";
this.gvMx1isStatus.MinWidth = 25;
this.gvMx1isStatus.Name = "gvMx1isStatus";
+ this.gvMx1isStatus.Tag = "edit";
+ this.gvMx1isStatus.UnboundDataType = typeof(bool);
this.gvMx1isStatus.Visible = true;
this.gvMx1isStatus.VisibleIndex = 3;
this.gvMx1isStatus.Width = 94;
@@ -313,14 +315,17 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gv_factory,
+ this.gridColumn3,
this.gv_departmentid,
this.gv_departmentcode,
this.gv_departmentname,
- this.gridColumn3,
this.gridColumn2,
this.gridColumn1,
this.gv_depextr4,
@@ -366,7 +371,7 @@
this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentid.Tag = "query_a.departmentid";
this.gv_departmentid.Visible = true;
- this.gv_departmentid.VisibleIndex = 1;
+ this.gv_departmentid.VisibleIndex = 2;
this.gv_departmentid.Width = 94;
//
// gv_departmentcode
@@ -381,7 +386,7 @@
this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentcode.Tag = "query_a.departmentcode";
this.gv_departmentcode.Visible = true;
- this.gv_departmentcode.VisibleIndex = 2;
+ this.gv_departmentcode.VisibleIndex = 3;
this.gv_departmentcode.Width = 94;
//
// gv_departmentname
@@ -396,18 +401,19 @@
this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
this.gv_departmentname.Tag = "query_a.departmentname";
this.gv_departmentname.Visible = true;
- this.gv_departmentname.VisibleIndex = 3;
+ this.gv_departmentname.VisibleIndex = 4;
this.gv_departmentname.Width = 150;
//
// gridColumn3
//
this.gridColumn3.Caption = "瀹℃牳鐘舵��";
this.gridColumn3.FieldName = "checkStatus";
- this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.MaxWidth = 50;
+ this.gridColumn3.MinWidth = 50;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 4;
- this.gridColumn3.Width = 94;
+ this.gridColumn3.VisibleIndex = 1;
+ this.gridColumn3.Width = 50;
//
// gridColumn2
//
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 2d3a139..14b4257 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -42,7 +42,6 @@
});
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
-
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -246,6 +245,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
+ toolBarMenu1.currentAction = "edit";
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_departmentcode, gridView1);
@@ -255,9 +255,15 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+ }
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index b79e22a..8ff7dae 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -1,4 +1,5 @@
using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -77,7 +78,7 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
- gcMx1.MouseClick += GcMx1_MouseClick;
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_Qtrk{}";
@@ -115,9 +116,7 @@
+ "}";
};
}
-
-
-
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
@@ -576,23 +575,21 @@
}
}
-
- private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+
+ private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "guid");
- if (string.IsNullOrEmpty(rowGuid))
- return;
- lbMxGuid.Text = rowGuid;
- ucBtnPrint1.guidKey = rowGuid;
- var info = gvMx1.CalcHitInfo(e.Location);
- var view = info.View;
- var row = view.GetDataRow(info.RowHandle);
- txtWlid.Text = row["itemId"].ToString();
- txtWlgg.Text = row["qd004"].ToString();
- txtWlmc.Text = row["qd003"].ToString();
- txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
- txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ lbMxGuid.Text = row["guid"].ToString();
+ ucBtnPrint1.guidKey = row["guid"].ToString();
+ txtWlid.Text = row["itemId"].ToString();
+ txtWlgg.Text = row["qd004"].ToString();
+ txtWlmc.Text = row["qd003"].ToString();
+ txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
+ txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
+ kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ }
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 3fd3881..c2695fd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -52,6 +52,7 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
+ this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
@@ -132,7 +133,6 @@
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -212,12 +212,16 @@
// gvMx1tld005
//
this.gvMx1tld005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1tld005.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
this.gvMx1tld005.AppearanceCell.Options.UseFont = true;
+ this.gvMx1tld005.AppearanceCell.Options.UseForeColor = true;
+ this.gvMx1tld005.AppearanceHeader.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+ this.gvMx1tld005.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1tld005.Caption = "鐢宠鏁伴噺";
this.gvMx1tld005.FieldName = "tld005";
this.gvMx1tld005.MinWidth = 50;
this.gvMx1tld005.Name = "gvMx1tld005";
- this.gvMx1tld005.Tag = "query_a.tld005";
+ this.gvMx1tld005.Tag = "edit";
this.gvMx1tld005.Visible = true;
this.gvMx1tld005.VisibleIndex = 5;
this.gvMx1tld005.Width = 94;
@@ -405,6 +409,15 @@
this.panelMx1.Name = "panelMx1";
this.panelMx1.Size = new System.Drawing.Size(1124, 98);
this.panelMx1.TabIndex = 1;
+ //
+ // ucBtnPrint1
+ //
+ this.ucBtnPrint1.guidKey = null;
+ this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
+ this.ucBtnPrint1.Name = "ucBtnPrint1";
+ this.ucBtnPrint1.rptParameter = null;
+ this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
+ this.ucBtnPrint1.TabIndex = 231;
//
// lbMxGuid
//
@@ -1342,15 +1355,6 @@
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
- this.ucBtnPrint1.Name = "ucBtnPrint1";
- this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
- this.ucBtnPrint1.TabIndex = 231;
//
// Frm_MesItemTbl
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index c2cf57a..2c84748 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,3 +1,4 @@
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -83,8 +84,7 @@
};
frm.ShowDialog();
};
-
- gcMx1.MouseClick += GcMx1_MouseClick;
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
this.ucBtnPrint1.btnDesignClick += (s, e) =>
{
ucBtnPrint1.rptParameter = "rpt_SCTL{}";
@@ -122,6 +122,7 @@
+ "}";
};
}
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
@@ -601,26 +602,23 @@
}
-
- private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+ private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
{
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "tlid");
- if (string.IsNullOrEmpty(rowGuid))
- return;
- lbMxGuid.Text = rowGuid;
- toolBarMenu1.guidKey = rowGuid;
- var info = gvMx1.CalcHitInfo(e.Location);
- var view = info.View;
- var row = view.GetDataRow(info.RowHandle);
- txtWlid.Text = row["tld002"].ToString();
- txtWlgg.Text = row["tld004"].ToString();
- txtWlmc.Text = row["tld003"].ToString();
- txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
- //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
-
- txtYdy.Text ="";//宸叉墦鍗版�婚噺
- kyPrtQty.Text ="";//鍙墦鍗版�婚噺
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ lbMxGuid.Text = row["tlid"].ToString();
+ toolBarMenu1.guidKey = row["tlid"].ToString();
+ txtWlid.Text = row["tld002"].ToString();
+ txtWlgg.Text = row["tld004"].ToString();
+ txtWlmc.Text = row["tld003"].ToString();
+ txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
+ //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
+ //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ txtYdy.Text = "";//宸叉墦鍗版�婚噺
+ kyPrtQty.Text = "";//鍙墦鍗版�婚噺
+ }
}
+
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index bac8f13..9190246 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -127,7 +127,7 @@
this.gv_flagIncludeDocCode.AppearanceCell.Options.UseFont = true;
this.gv_flagIncludeDocCode.Caption = "鍖呭惈鍗曟嵁绫诲瀷";
this.gv_flagIncludeDocCode.FieldName = "isIncludeDoc";
- this.gv_flagIncludeDocCode.MinWidth = 25;
+ this.gv_flagIncludeDocCode.MinWidth = 50;
this.gv_flagIncludeDocCode.Name = "gv_flagIncludeDocCode";
this.gv_flagIncludeDocCode.OptionsColumn.AllowEdit = false;
this.gv_flagIncludeDocCode.Tag = "query_IS_INCLUDE_DOC";
@@ -141,12 +141,12 @@
this.gv_flagSpilitNo.AppearanceCell.Options.UseFont = true;
this.gv_flagSpilitNo.Caption = "搴忓彿鍓嶅垎闅旂";
this.gv_flagSpilitNo.FieldName = "isSpilit";
- this.gv_flagSpilitNo.MinWidth = 25;
+ this.gv_flagSpilitNo.MinWidth = 50;
this.gv_flagSpilitNo.Name = "gv_flagSpilitNo";
this.gv_flagSpilitNo.OptionsColumn.AllowEdit = false;
this.gv_flagSpilitNo.Tag = "query_IS_SPILIT";
this.gv_flagSpilitNo.Visible = true;
- this.gv_flagSpilitNo.VisibleIndex = 3;
+ this.gv_flagSpilitNo.VisibleIndex = 4;
this.gv_flagSpilitNo.Width = 94;
//
// gv_resetZero
@@ -159,8 +159,6 @@
this.gv_resetZero.Name = "gv_resetZero";
this.gv_resetZero.OptionsColumn.AllowEdit = false;
this.gv_resetZero.Tag = "query_RESET_ZERO";
- this.gv_resetZero.Visible = true;
- this.gv_resetZero.VisibleIndex = 4;
this.gv_resetZero.Width = 94;
//
// gv_noLength
@@ -169,12 +167,12 @@
this.gv_noLength.AppearanceCell.Options.UseFont = true;
this.gv_noLength.Caption = "搴忓彿闀垮害";
this.gv_noLength.FieldName = "noLength";
- this.gv_noLength.MinWidth = 25;
+ this.gv_noLength.MinWidth = 50;
this.gv_noLength.Name = "gv_noLength";
this.gv_noLength.OptionsColumn.AllowEdit = false;
this.gv_noLength.Tag = "query_NO_LENGTH";
this.gv_noLength.Visible = true;
- this.gv_noLength.VisibleIndex = 2;
+ this.gv_noLength.VisibleIndex = 3;
this.gv_noLength.Width = 94;
//
// gv_ruleFormat
@@ -188,7 +186,7 @@
this.gv_ruleFormat.OptionsColumn.AllowEdit = false;
this.gv_ruleFormat.Tag = "query_DOC_FORMAT";
this.gv_ruleFormat.Visible = true;
- this.gv_ruleFormat.VisibleIndex = 1;
+ this.gv_ruleFormat.VisibleIndex = 2;
this.gv_ruleFormat.Width = 300;
//
// gv_docCode
@@ -197,13 +195,13 @@
this.gv_docCode.AppearanceCell.Options.UseFont = true;
this.gv_docCode.Caption = "鍗曟嵁绫诲瀷";
this.gv_docCode.FieldName = "docCode";
- this.gv_docCode.MinWidth = 120;
+ this.gv_docCode.MinWidth = 150;
this.gv_docCode.Name = "gv_docCode";
this.gv_docCode.OptionsColumn.AllowEdit = false;
this.gv_docCode.Tag = "query_DOC_CODE";
this.gv_docCode.Visible = true;
- this.gv_docCode.VisibleIndex = 0;
- this.gv_docCode.Width = 120;
+ this.gv_docCode.VisibleIndex = 1;
+ this.gv_docCode.Width = 150;
//
// toolBarMenu1
//
@@ -234,16 +232,19 @@
//
// gridView1
//
+ this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_checkStatus,
this.gv_docCode,
this.gv_ruleFormat,
this.gv_noLength,
this.gv_flagSpilitNo,
this.gv_resetZero,
this.gv_flagIncludeDocCode,
- this.gv_checkStatus,
this.gv_createDate,
this.gv_createdBy});
this.gridView1.GridControl = this.gcMain;
@@ -256,13 +257,14 @@
//
this.gv_checkStatus.Caption = "瀹℃牳";
this.gv_checkStatus.FieldName = "checkStatus";
- this.gv_checkStatus.MinWidth = 25;
+ this.gv_checkStatus.MaxWidth = 50;
+ this.gv_checkStatus.MinWidth = 50;
this.gv_checkStatus.Name = "gv_checkStatus";
this.gv_checkStatus.OptionsColumn.AllowEdit = false;
this.gv_checkStatus.Tag = "query_check_status";
this.gv_checkStatus.Visible = true;
- this.gv_checkStatus.VisibleIndex = 6;
- this.gv_checkStatus.Width = 94;
+ this.gv_checkStatus.VisibleIndex = 0;
+ this.gv_checkStatus.Width = 50;
//
// xtraTabControl1
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
index 74bb5ed..4839956 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.cs
@@ -7,6 +7,7 @@
using System.Collections.Generic;
using System.Data;
using System.Net;
+using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -206,13 +207,7 @@
txt_port.Focus();
return;
}
- try
- {
- IPAddress.Parse(txt_ip.Text);
- }
- catch
- {
- txt_ip.Text = "";
+ if (!validateIpAddress(txt_ip.Text.Trim())) {
MessageBox.Show("璇疯緭鍏ユ纭殑IP鍦板潃");
txt_ip.Focus();
return;
@@ -324,5 +319,10 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+ private bool validateIpAddress(string ip)
+ {
+ string pattern = @"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$";
+ return Regex.IsMatch(ip, pattern);
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 70c2c2a..5f97101 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -111,8 +111,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs
index a796e5e..394da52 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.Designer.cs
@@ -28,22 +28,22 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SysHelp));
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -240,10 +240,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions4.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions4.Image")));
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "棰勮", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "棰勮", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -262,10 +262,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -284,10 +284,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions6.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions6.Image")));
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions3.Image")));
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓婁紶", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓婁紶", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -308,7 +308,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "SysHelp";
- this.Text = "SysHelp";
+ this.Text = "甯姪鏂囨。";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx
index e0c83ff..af4b5fe 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysHelp.resx
@@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="editorButtonImageOptions4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
bGUAV2ViO1dvcmxkO0V5ZQdEODoAAAONSURBVDhPVZJtTNNXFIcvoHOyLhMTt2Qsm4oMI5luEE3jZlsR
@@ -139,7 +139,7 @@
LXpJwKHNWwR5hFkSGv9P9BplGcXjOcz3LaG4rmWfJP8CiUU9Vuoq7pwAAAAASUVORK5CYII=
</value>
</data>
- <data name="editorButtonImageOptions6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <data name="editorButtonImageOptions3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAgdEVYdFRpdGxlAENsZWFyUnVsZXM7Q29uZGl0aW9u
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index bf93532..4413af9 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -258,7 +258,7 @@
// txt_isStatus
//
this.txt_isStatus.AutoSize = true;
- this.txt_isStatus.Location = new System.Drawing.Point(123, 154);
+ this.txt_isStatus.Location = new System.Drawing.Point(123, 158);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
this.txt_isStatus.TabIndex = 132;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index 66fd692..82edb3b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -15,7 +15,7 @@
{
public partial class Frm_WwGd : DevExpress.XtraEditors.XtraForm
{
- string _webServiceName = "WomdaaManager/";
+ string _webServiceName = "WWGDManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
public Frm_WwGd()
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
index 9f6db39..88941c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Models/MesDepotSections.cs
@@ -41,7 +41,7 @@
/// 鍙備笌榻愬鏍￠獙(0:鍚�,1:鏄�)
/// </summary>
- public int? CompletenessFlag { get; set; }
+ public bool? CompletenessFlag { get; set; }
/// <summary>
/// 澶囨敞
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 2657a09..3f0d55e 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -739,7 +739,6 @@
if (ctrl is CheckBox)
{
var txt = ctrl as CheckBox;
- //txt.Checked = false;
txt.Enabled = !isEdt;
}
if (ctrl is CheckEdit)
@@ -1286,7 +1285,12 @@
return 1;
return 0;
}
-
+ public static bool ToBoole(string str)
+ {
+ if (str.ToUpper() == "true".ToUpper())
+ return true;
+ return false;
+ }
public string GetIsNullOrEmpty(string str)
{
if (string.IsNullOrEmpty(str.Trim()))
--
Gitblit v1.9.3