From 1210460a95ba58f219d38e545dcaf9e21383d18f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 十二月 2024 14:12:50 +0800
Subject: [PATCH] 细节
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 3
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs | 204 -----------------
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 3
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.resx | 244 +++++++++----------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 6
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 3
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | 3
/dev/null | 120 ----------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs | 19 +
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 1
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs | 48 ++--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 1
32 files changed, 190 insertions(+), 507 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
index 0d133f5..3abbe4a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.Designer.cs
@@ -645,6 +645,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -744,7 +745,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(1219, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -818,6 +818,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Customer";
+ this.Text = "瀹㈡埛淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_fseller.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
index 061fe82..5ee09c5 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -472,6 +472,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -558,7 +559,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(928, 424);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -622,6 +622,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Department";
+ this.Text = "閮ㄩ棬淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
index c195774..403fa39 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -554,6 +554,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -638,7 +639,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(936, 369);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -706,6 +706,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesItemType";
+ this.Text = "鐗╂枡绫诲埆";
((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pgroup.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iqcTypeName.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
index 5170630..95219ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -15,7 +15,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesItemTypeManager/";
-
public Frm_MesItemType()
{
InitializeComponent();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index cc4aad2..f88c5d4 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -841,6 +841,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -953,7 +954,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(1158, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -1132,6 +1132,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesItems";
+ this.Text = "鐗╂枡淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index 37c3f53..d07bc39 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
index e83943f..ad1d969 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
@@ -64,6 +64,7 @@
this.panel1 = new System.Windows.Forms.Panel();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_disabledDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_disabledBy.Properties)).BeginInit();
@@ -79,6 +80,7 @@
this.xtraTabPage1.SuspendLayout();
this.xtraTabPage2.SuspendLayout();
this.panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// lb_fforbidstatus
@@ -362,6 +364,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -442,7 +445,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(912, 357);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -492,11 +494,23 @@
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(814, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesPosition
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(914, 469);
+ this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesPosition";
@@ -516,6 +530,7 @@
this.xtraTabPage2.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
@@ -563,6 +578,6 @@
private DevExpress.XtraEditors.TextEdit txt_positionId;
private DevExpress.XtraGrid.Columns.GridColumn gv_positionId;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-
+ private System.Windows.Forms.PictureBox picCheckBox;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
index 8000420..255082d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
@@ -21,7 +21,7 @@
InitializeComponent();
toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-
+
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index b9269c8..57d478b 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -508,6 +508,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -694,6 +695,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesUnit";
+ this.Text = "鍗曚綅淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 8582308..0a2332a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -3,13 +3,12 @@
using System.Data;
using System.Threading.Tasks;
using System.Windows.Forms;
-using CefSharp.DevTools.CSS;
using DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
-using static Gs.DevApp.ToolBox.UtilityHelper;
+
namespace Gs.DevApp.DevFrm
{
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
index 3e34e82..92c6c98 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -267,6 +267,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = "SYS_DEPARTMENT,check_date,check_status,check_by";
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -505,7 +506,6 @@
this.xtraTabPage2.Controls.Add(this.tabMx);
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(1281, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -724,6 +724,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesWorkshop";
+ this.Text = "绾夸綋淇℃伅";
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
index 2ed2aa4..2d3a139 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.cs
@@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
-using System.Drawing;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
@@ -30,11 +28,21 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "");
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -44,18 +52,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, false, 999);
- }
/// <summary>
/// 鍒嗛〉浜嬩欢
@@ -101,7 +97,7 @@
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
{
_filterList.Clear();
@@ -158,15 +154,16 @@
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ private void getModel(string strGuid)
{
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
@@ -257,7 +254,10 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- getModel(rowGuid, true, 1);
+ 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);
}
/// <summary>
@@ -347,7 +347,7 @@
_webServiceName + "DeleteModelMx",
JsonConvert.SerializeObject(lst));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+ if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -400,9 +400,9 @@
if (_rtn.rtnCode > 0)
{
if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
+ getModel(lbGuid.Text.Trim());
else
- getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
catch (Exception ex)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 481a6c3..544ba6e 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -819,6 +819,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Staff";
+ this.Text = "鍛樺伐淇℃伅";
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_workMk.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
index 7b00723..d5cbd8d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -1,11 +1,9 @@
锘縰sing System;
using System.Collections.Generic;
using System.Data;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index e470952..b0f5e38 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -717,6 +717,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_Supplier";
+ this.Text = "渚涘簲鍟嗕俊鎭�";
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstaffid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lxr.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index 1aa4132..bac8f13 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -670,6 +670,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "DocNoRule";
+ this.Text = "缂栫爜瑙勫垯";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index 5210144..f92361c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -23,7 +23,7 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, "", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
index 192bdab..c512b0d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.Designer.cs
@@ -416,6 +416,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesSysPageview";
+ this.Text = "PDA椤甸潰缁存姢";
((System.ComponentModel.ISupportInitialize)(this.txt_pageGroup.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_path.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pageView.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
index 32fb326..90431b6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintInfo.Designer.cs
@@ -325,6 +325,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_PrintInfo";
+ this.Text = "鎵撳嵃鏈虹淮鎶�";
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_port.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ip.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
index 8f4c03f..52a4a1b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
@@ -332,6 +332,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_PrintUser";
+ this.Text = "鎵撳嵃鏈虹粦瀹�";
((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index 3eddd70..603eeab 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -71,6 +71,7 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = "SYS_ORGANIZATION,check_date,check_status,check_by";
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -378,7 +379,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Organization";
- this.Text = "Organization";
+ this.Text = "缁勭粐鏈烘瀯";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
index 65c7192..70c2c2a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -17,14 +17,6 @@
{
InitializeComponent();
- //toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
- //toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- //toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- //toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- //toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
- //toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- //toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- //toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
tlMenu.DoubleClick += TlMenu_DoubleClick;
@@ -39,17 +31,6 @@
{
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ョ獥浣撲笉鏀寔鏌ヨ锛岃嫢鎯虫洿鏂伴〉闈紝璇风偣鍑� 鍒锋柊");
}
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getTree();
- }
-
/// <summary>
/// 鍒锋柊浜嬩欢
/// </summary>
@@ -72,188 +53,6 @@
getModel(rowGuid, false, 999);
}
}
-
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, tlMenu);
- toolBarMenu1.guidKey = rowGuid;
- }
-
- /// <summary>
- /// 瀹℃牳浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
- {
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, tlMenu);
- toolBarMenu1.guidKey = rowGuid;
- }
-
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- }
-
- /// <summary>
- /// 鍒犻櫎浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, tlMenu);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鍒犻櫎鐨勮锛�");
- return;
- }
-
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) return;
- var lst = new List<string>();
- lst.Add(rowGuid);
- var _obj = lst;
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "Organization/DeleteModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getTree();
- }
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
-
-
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, tlMenu);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- getModel(rowGuid, true, 1);
- }
-
- /// <summary>
- /// 鏂板浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
- lbGuid.Text = "";
- UtilityHelper.CleanValueByControl(panel1.Controls, true);
- }
-
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_fNumber.Text.Trim()))
- {
- MsgHelper.Warning("缂栧彿涓嶈兘涓虹┖锛�");
- txt_fNumber.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_name.Text.Trim()))
- {
- MsgHelper.Warning("鍚嶇О涓嶈兘涓虹┖锛�");
- txt_name.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_conPeople.Text.Trim()))
- {
- MsgHelper.Warning("鑱旂郴浜轰笉鑳戒负绌猴紒");
- txt_conPeople.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_conTel.Text.Trim()))
- {
- MsgHelper.Warning("鑱旂郴鐢佃瘽涓嶈兘涓虹┖锛�");
- txt_conTel.Focus();
- return;
- }
-
- var _upGuid = txt_upGuid.Text.Trim().Length > 0
- ? txt_upGuid.SelectedValue.ToString()
- : "";
- var _obj = new
- {
- guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- upGuid = _upGuid, //涓婄骇鐨勪富寤�
- name = txt_name.Text.Trim(), //鍚嶇О
- conPeople = txt_conPeople.Text, //鑱旂郴浜�
- conTel = txt_conPeople.Text, //鑱旂郴鐢佃瘽
- isStatus = txt_isStatus.Checked, //鐘舵��
- factory = txt_fNumber.Text //缁勭粐缂栧彿
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- "Organization/EditModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
private void getTree()
{
tlMenu.Nodes.Clear();
@@ -305,7 +104,6 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
private void getModel(string strGuid, bool isEdit, int tabIdx)
{
if (string.IsNullOrEmpty(strGuid))
@@ -340,7 +138,5 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
-
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
index 14e26ca..57e4c74 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -183,6 +183,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "SysLog";
+ this.Text = "绯荤粺鏃ュ織";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 1d6b206..955697a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using System.Data;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
index e27ea95..6708f87 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.Designer.cs
@@ -83,16 +83,17 @@
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
-
+ this.toolBarMenu1.rptParameter = null;
this.toolBarMenu1.Size = new System.Drawing.Size(794, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
-
+ this.toolBarMenu1.xlsOutParameter = null;
//
// xtraTabControl1
//
@@ -201,7 +202,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(792, 475);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -507,7 +507,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "SysMenu";
- this.Text = "SysMenu";
+ this.Text = "鍔熻兘鑿滃崟";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index abdeef7..ce873c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -113,7 +113,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵")) return;
var lst = new List<string>();
lst.Add(rowGuid);
@@ -221,7 +220,6 @@
txt_upGuid.Focus();
return;
}
-
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -287,7 +285,6 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.resx b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.resx
index bfad99e..1af7de1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.resx
@@ -1,134 +1,120 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root"
- xmlns="">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
<xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="name" use="required"
- type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string"
- minOccurs="0" msdata:Ordinal="2"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
- use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string"
- msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string"
- msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string"
- minOccurs="0" msdata:Ordinal="1"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string"
- use="required"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
</xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms,
- Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- </value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms,
- Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- </value>
- </resheader>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
index 00f8b01..bf93532 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.Designer.cs
@@ -367,7 +367,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Role";
- this.Text = "Role";
+ this.Text = "瑙掕壊绠＄悊";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index db8e987..e81cf69 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -373,7 +373,6 @@
//
this.xtraTabPage2.Controls.Add(this.panel1);
this.xtraTabPage2.Name = "xtraTabPage2";
-
this.xtraTabPage2.Size = new System.Drawing.Size(736, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
@@ -635,7 +634,7 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "User";
- this.Text = "User";
+ this.Text = "鐢ㄦ埛绠＄悊";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
deleted file mode 100644
index 4f8c795..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
+++ /dev/null
@@ -1,1273 +0,0 @@
-/* Create By GS EasyCode */
-namespace Gs.DevApp.DevFrm
-{
- partial class Frm_MesDepot
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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();
- this.gvMx1depotSectionNamet = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1kbQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1description = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1completenessFlag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1depotSectionName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
- this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl();
- this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
- this.lb_isFkc = new DevExpress.XtraEditors.LabelControl();
- this.txt_isFkc = new DevExpress.XtraEditors.TextEdit();
- this.gv_isFkc = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_zuid = new DevExpress.XtraEditors.LabelControl();
- this.txt_zuid = new DevExpress.XtraEditors.TextEdit();
- this.gv_zuid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_piType = new DevExpress.XtraEditors.LabelControl();
- this.txt_piType = new DevExpress.XtraEditors.TextEdit();
- this.lb_cwhaddress = new DevExpress.XtraEditors.LabelControl();
- this.txt_cwhaddress = new DevExpress.XtraEditors.TextEdit();
- this.lb_isNg = new DevExpress.XtraEditors.LabelControl();
- this.txt_isNg = new DevExpress.XtraEditors.TextEdit();
- this.gv_isNg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_isWy = new DevExpress.XtraEditors.LabelControl();
- this.txt_isWy = new DevExpress.XtraEditors.TextEdit();
- this.gv_isWy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_iconType = new DevExpress.XtraEditors.LabelControl();
- this.txt_iconType = new DevExpress.XtraEditors.TextEdit();
- this.lb_depottypecode = new DevExpress.XtraEditors.LabelControl();
- this.txt_depottypecode = new DevExpress.XtraEditors.TextEdit();
- this.gv_depottypecode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_type2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_type2 = new DevExpress.XtraEditors.TextEdit();
- this.lb_type1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_type1 = new DevExpress.XtraEditors.TextEdit();
- this.lb_factory = new DevExpress.XtraEditors.LabelControl();
- this.txt_factory = new DevExpress.XtraEditors.TextEdit();
- this.lb_depottype = new DevExpress.XtraEditors.LabelControl();
- this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
- this.gv_depottype = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
- this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_description = new DevExpress.XtraEditors.LabelControl();
- this.txt_description = new DevExpress.XtraEditors.TextEdit();
- this.gv_description = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_depotName = new DevExpress.XtraEditors.LabelControl();
- this.txt_depotName = new DevExpress.XtraEditors.TextEdit();
- this.gv_depotName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_depotCode = new DevExpress.XtraEditors.LabelControl();
- this.txt_depotCode = new DevExpress.XtraEditors.TextEdit();
- this.gv_depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- 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.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.tabMx = new DevExpress.XtraTab.XtraTabControl();
- this.panel1 = new System.Windows.Forms.Panel();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
- this.lbGuid = new System.Windows.Forms.Label();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.tabMxPage1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cwhaddress.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.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();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
- this.xtraTabPage2.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
- this.tabMx.SuspendLayout();
- this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- this.SuspendLayout();
- //
- // gvMx1depotSectionNamet
- //
- this.gvMx1depotSectionNamet.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1depotSectionNamet.AppearanceCell.Options.UseFont = true;
- this.gvMx1depotSectionNamet.Caption = "浠撲綅鍏ㄥ悕";
- this.gvMx1depotSectionNamet.FieldName = "depotSectionNamet";
- this.gvMx1depotSectionNamet.MinWidth = 50;
- this.gvMx1depotSectionNamet.Name = "gvMx1depotSectionNamet";
- this.gvMx1depotSectionNamet.Tag = "query_a.depot_section_namet";
- this.gvMx1depotSectionNamet.Visible = true;
- this.gvMx1depotSectionNamet.VisibleIndex = 5;
- this.gvMx1depotSectionNamet.Width = 94;
- //
- // gvMx1kbQty
- //
- this.gvMx1kbQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1kbQty.AppearanceCell.Options.UseFont = true;
- this.gvMx1kbQty.Caption = "鍗℃澘鏁�";
- this.gvMx1kbQty.FieldName = "kbQty";
- this.gvMx1kbQty.MinWidth = 50;
- this.gvMx1kbQty.Name = "gvMx1kbQty";
- this.gvMx1kbQty.Tag = "query_a.kb_qty";
- this.gvMx1kbQty.UnboundDataType = typeof(decimal);
- this.gvMx1kbQty.Visible = true;
- this.gvMx1kbQty.VisibleIndex = 4;
- this.gvMx1kbQty.Width = 94;
- //
- // gvMx1lastupdateDate
- //
- this.gvMx1lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lastupdateDate.AppearanceCell.Options.UseFont = true;
- this.gvMx1lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂�";
- this.gvMx1lastupdateDate.FieldName = "lastupdateDate";
- this.gvMx1lastupdateDate.MinWidth = 50;
- this.gvMx1lastupdateDate.Name = "gvMx1lastupdateDate";
- this.gvMx1lastupdateDate.OptionsColumn.ReadOnly = true;
- this.gvMx1lastupdateDate.Tag = "query_a.lastupdate_date";
- this.gvMx1lastupdateDate.Visible = true;
- this.gvMx1lastupdateDate.VisibleIndex = 7;
- this.gvMx1lastupdateDate.Width = 94;
- //
- // gvMx1lastupdateBy
- //
- this.gvMx1lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1lastupdateBy.AppearanceCell.Options.UseFont = true;
- this.gvMx1lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
- this.gvMx1lastupdateBy.FieldName = "lastupdateBy";
- this.gvMx1lastupdateBy.MinWidth = 50;
- this.gvMx1lastupdateBy.Name = "gvMx1lastupdateBy";
- this.gvMx1lastupdateBy.OptionsColumn.ReadOnly = true;
- this.gvMx1lastupdateBy.Tag = "query_a.lastupdate_by";
- this.gvMx1lastupdateBy.Visible = true;
- this.gvMx1lastupdateBy.VisibleIndex = 6;
- this.gvMx1lastupdateBy.Width = 94;
- //
- // gvMx1description
- //
- this.gvMx1description.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1description.AppearanceCell.Options.UseFont = true;
- this.gvMx1description.Caption = "澶囨敞";
- this.gvMx1description.FieldName = "description";
- this.gvMx1description.MinWidth = 50;
- this.gvMx1description.Name = "gvMx1description";
- this.gvMx1description.Tag = "query_a.description";
- this.gvMx1description.Visible = true;
- this.gvMx1description.VisibleIndex = 3;
- this.gvMx1description.Width = 94;
- //
- // gvMx1completenessFlag
- //
- this.gvMx1completenessFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1completenessFlag.AppearanceCell.Options.UseFont = true;
- this.gvMx1completenessFlag.Caption = "鍙備笌榻愬鏍￠獙(0:鍚�,1:鏄�)";
- this.gvMx1completenessFlag.FieldName = "completenessFlag";
- this.gvMx1completenessFlag.MinWidth = 50;
- this.gvMx1completenessFlag.Name = "gvMx1completenessFlag";
- this.gvMx1completenessFlag.Tag = "query_a.completeness_flag";
- this.gvMx1completenessFlag.UnboundDataType = typeof(bool);
- this.gvMx1completenessFlag.Visible = true;
- this.gvMx1completenessFlag.VisibleIndex = 2;
- this.gvMx1completenessFlag.Width = 94;
- //
- // gvMx1depotSectionName
- //
- this.gvMx1depotSectionName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1depotSectionName.AppearanceCell.Options.UseFont = true;
- this.gvMx1depotSectionName.Caption = "璐т綅鍚嶇О";
- this.gvMx1depotSectionName.FieldName = "depotSectionName";
- this.gvMx1depotSectionName.MinWidth = 50;
- this.gvMx1depotSectionName.Name = "gvMx1depotSectionName";
- this.gvMx1depotSectionName.Tag = "query_a.depot_section_name";
- this.gvMx1depotSectionName.Visible = true;
- this.gvMx1depotSectionName.VisibleIndex = 1;
- this.gvMx1depotSectionName.Width = 94;
- //
- // gvMx1depotSectionCode
- //
- this.gvMx1depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
- this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜";
- this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
- this.gvMx1depotSectionCode.MinWidth = 50;
- this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
- this.gvMx1depotSectionCode.Tag = "query_a.depot_section_code";
- this.gvMx1depotSectionCode.Visible = true;
- this.gvMx1depotSectionCode.VisibleIndex = 0;
- this.gvMx1depotSectionCode.Width = 94;
- //
- // gvMx1guid
- //
- this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gvMx1guid.AppearanceCell.Options.UseFont = true;
- this.gvMx1guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
- this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 50;
- this.gvMx1guid.Name = "gvMx1guid";
- this.gvMx1guid.OptionsColumn.ReadOnly = true;
- this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 94;
- //
- // tabMxPage1
- //
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
- this.tabMxPage1.Text = "浠撲綅鍒楄〃";
- //
- // gcMx1
- //
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
- this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Name = "gcMx1";
- this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 338);
- this.gcMx1.TabIndex = 0;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
- //
- // gvMx1
- //
- this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx1guid,
- this.gvMx1depotSectionCode,
- this.gvMx1depotSectionName,
- this.gvMx1completenessFlag,
- this.gvMx1description,
- this.gvMx1kbQty,
- this.gvMx1depotSectionNamet,
- this.gvMx1lastupdateBy,
- this.gvMx1lastupdateDate,
- this.gvMxDel});
- this.gvMx1.GridControl = this.gcMx1;
- this.gvMx1.Name = "gvMx1";
- this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
- this.gvMx1.OptionsView.ShowGroupPanel = false;
- //
- // gvMxDel
- //
- this.gvMxDel.Caption = "绉诲嚭";
- this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 25;
- this.gvMxDel.Name = "gvMxDel";
- this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 8;
- this.gvMxDel.Width = 94;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
- //
- // lb_materialProperti
- //
- this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_materialProperti.Appearance.Options.UseFont = true;
- this.lb_materialProperti.Location = new System.Drawing.Point(558, 52);
- this.lb_materialProperti.Name = "lb_materialProperti";
- this.lb_materialProperti.Size = new System.Drawing.Size(73, 21);
- this.lb_materialProperti.TabIndex = 306;
- this.lb_materialProperti.Text = "鐗╂枡灞炴�� ";
- //
- // txt_materialProperti
- //
- this.txt_materialProperti.Enabled = false;
- this.txt_materialProperti.Location = new System.Drawing.Point(638, 48);
- this.txt_materialProperti.Name = "txt_materialProperti";
- this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
- this.txt_materialProperti.Size = new System.Drawing.Size(150, 28);
- this.txt_materialProperti.TabIndex = 306;
- //
- // lb_isFkc
- //
- this.lb_isFkc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isFkc.Appearance.Options.UseFont = true;
- this.lb_isFkc.Location = new System.Drawing.Point(541, 118);
- this.lb_isFkc.Name = "lb_isFkc";
- this.lb_isFkc.Size = new System.Drawing.Size(90, 21);
- this.lb_isFkc.TabIndex = 291;
- this.lb_isFkc.Text = "鍏佽璐熷簱瀛� ";
- //
- // txt_isFkc
- //
- this.txt_isFkc.Enabled = false;
- this.txt_isFkc.Location = new System.Drawing.Point(638, 114);
- this.txt_isFkc.Name = "txt_isFkc";
- this.txt_isFkc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_isFkc.Properties.Appearance.Options.UseFont = true;
- this.txt_isFkc.Size = new System.Drawing.Size(150, 28);
- this.txt_isFkc.TabIndex = 291;
- //
- // gv_isFkc
- //
- this.gv_isFkc.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_isFkc.AppearanceCell.Options.UseFont = true;
- this.gv_isFkc.Caption = "鍏佽鍗虫椂搴撳瓨璐熷簱瀛�";
- this.gv_isFkc.FieldName = "isFkc";
- this.gv_isFkc.MinWidth = 50;
- this.gv_isFkc.Name = "gv_isFkc";
- 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.Width = 94;
- //
- // lb_zuid
- //
- this.lb_zuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_zuid.Appearance.Options.UseFont = true;
- this.lb_zuid.Location = new System.Drawing.Point(592, 149);
- this.lb_zuid.Name = "lb_zuid";
- this.lb_zuid.Size = new System.Drawing.Size(39, 21);
- this.lb_zuid.TabIndex = 285;
- this.lb_zuid.Text = "鍒嗙粍 ";
- //
- // txt_zuid
- //
- this.txt_zuid.Enabled = false;
- this.txt_zuid.Location = new System.Drawing.Point(638, 145);
- this.txt_zuid.Name = "txt_zuid";
- this.txt_zuid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_zuid.Properties.Appearance.Options.UseFont = true;
- this.txt_zuid.Size = new System.Drawing.Size(150, 28);
- this.txt_zuid.TabIndex = 285;
- //
- // gv_zuid
- //
- this.gv_zuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_zuid.AppearanceCell.Options.UseFont = true;
- this.gv_zuid.Caption = "鍒嗙粍";
- this.gv_zuid.FieldName = "zuid";
- this.gv_zuid.MinWidth = 50;
- this.gv_zuid.Name = "gv_zuid";
- 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.Width = 94;
- //
- // lb_piType
- //
- this.lb_piType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_piType.Appearance.Options.UseFont = true;
- this.lb_piType.Location = new System.Drawing.Point(814, 118);
- this.lb_piType.Name = "lb_piType";
- this.lb_piType.Size = new System.Drawing.Size(107, 21);
- this.lb_piType.TabIndex = 280;
- this.lb_piType.Text = "鐪嬫澘鍖哄煙缂栧彿 ";
- //
- // txt_piType
- //
- this.txt_piType.Enabled = false;
- this.txt_piType.Location = new System.Drawing.Point(927, 114);
- this.txt_piType.Name = "txt_piType";
- this.txt_piType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_piType.Properties.Appearance.Options.UseFont = true;
- this.txt_piType.Size = new System.Drawing.Size(150, 28);
- this.txt_piType.TabIndex = 280;
- //
- // lb_cwhaddress
- //
- this.lb_cwhaddress.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_cwhaddress.Appearance.Options.UseFont = true;
- this.lb_cwhaddress.Location = new System.Drawing.Point(305, 119);
- this.lb_cwhaddress.Name = "lb_cwhaddress";
- this.lb_cwhaddress.Size = new System.Drawing.Size(73, 21);
- this.lb_cwhaddress.TabIndex = 273;
- this.lb_cwhaddress.Text = "浠撳簱鍦板潃 ";
- //
- // txt_cwhaddress
- //
- this.txt_cwhaddress.Enabled = false;
- this.txt_cwhaddress.Location = new System.Drawing.Point(382, 115);
- this.txt_cwhaddress.Name = "txt_cwhaddress";
- this.txt_cwhaddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_cwhaddress.Properties.Appearance.Options.UseFont = true;
- this.txt_cwhaddress.Size = new System.Drawing.Size(150, 28);
- this.txt_cwhaddress.TabIndex = 273;
- //
- // lb_isNg
- //
- this.lb_isNg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isNg.Appearance.Options.UseFont = true;
- this.lb_isNg.Location = new System.Drawing.Point(271, 148);
- this.lb_isNg.Name = "lb_isNg";
- this.lb_isNg.Size = new System.Drawing.Size(107, 21);
- this.lb_isNg.TabIndex = 267;
- this.lb_isNg.Text = "鏄惁涓嶈壇鍝佷粨 ";
- //
- // txt_isNg
- //
- this.txt_isNg.Enabled = false;
- this.txt_isNg.Location = new System.Drawing.Point(382, 144);
- this.txt_isNg.Name = "txt_isNg";
- this.txt_isNg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_isNg.Properties.Appearance.Options.UseFont = true;
- this.txt_isNg.Size = new System.Drawing.Size(150, 28);
- this.txt_isNg.TabIndex = 267;
- //
- // gv_isNg
- //
- this.gv_isNg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_isNg.AppearanceCell.Options.UseFont = true;
- this.gv_isNg.Caption = "鏄惁涓嶈壇鍝佷粨";
- this.gv_isNg.FieldName = "isNg";
- this.gv_isNg.MinWidth = 50;
- this.gv_isNg.Name = "gv_isNg";
- this.gv_isNg.OptionsColumn.AllowEdit = false;
- this.gv_isNg.Tag = "query_a.is_ng";
- this.gv_isNg.Visible = true;
- this.gv_isNg.VisibleIndex = 9;
- this.gv_isNg.Width = 94;
- //
- // lb_isWy
- //
- this.lb_isWy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_isWy.Appearance.Options.UseFont = true;
- this.lb_isWy.Location = new System.Drawing.Point(6, 148);
- this.lb_isWy.Name = "lb_isWy";
- this.lb_isWy.Size = new System.Drawing.Size(107, 21);
- this.lb_isWy.TabIndex = 262;
- this.lb_isWy.Text = "鏄惁濮斿浠撳簱 ";
- //
- // txt_isWy
- //
- this.txt_isWy.Enabled = false;
- this.txt_isWy.Location = new System.Drawing.Point(118, 144);
- this.txt_isWy.Name = "txt_isWy";
- this.txt_isWy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_isWy.Properties.Appearance.Options.UseFont = true;
- this.txt_isWy.Size = new System.Drawing.Size(150, 28);
- this.txt_isWy.TabIndex = 262;
- //
- // gv_isWy
- //
- this.gv_isWy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_isWy.AppearanceCell.Options.UseFont = true;
- this.gv_isWy.Caption = "鏄惁濮斿浠撳簱";
- this.gv_isWy.FieldName = "isWy";
- this.gv_isWy.MinWidth = 50;
- this.gv_isWy.Name = "gv_isWy";
- 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.Width = 94;
- //
- // lb_iconType
- //
- this.lb_iconType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_iconType.Appearance.Options.UseFont = true;
- this.lb_iconType.Location = new System.Drawing.Point(848, 149);
- this.lb_iconType.Name = "lb_iconType";
- this.lb_iconType.Size = new System.Drawing.Size(73, 21);
- this.lb_iconType.TabIndex = 258;
- this.lb_iconType.Text = "鐪嬫澘鍥炬爣 ";
- //
- // txt_iconType
- //
- this.txt_iconType.Enabled = false;
- this.txt_iconType.Location = new System.Drawing.Point(927, 145);
- this.txt_iconType.Name = "txt_iconType";
- this.txt_iconType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_iconType.Properties.Appearance.Options.UseFont = true;
- this.txt_iconType.Size = new System.Drawing.Size(150, 28);
- this.txt_iconType.TabIndex = 258;
- //
- // lb_depottypecode
- //
- this.lb_depottypecode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_depottypecode.Appearance.Options.UseFont = true;
- this.lb_depottypecode.Location = new System.Drawing.Point(6, 86);
- this.lb_depottypecode.Name = "lb_depottypecode";
- this.lb_depottypecode.Size = new System.Drawing.Size(107, 21);
- this.lb_depottypecode.TabIndex = 247;
- this.lb_depottypecode.Text = "浠撳簱绫诲瀷缂栫爜 ";
- //
- // txt_depottypecode
- //
- this.txt_depottypecode.Enabled = false;
- this.txt_depottypecode.Location = new System.Drawing.Point(118, 82);
- this.txt_depottypecode.Name = "txt_depottypecode";
- this.txt_depottypecode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depottypecode.Properties.Appearance.Options.UseFont = true;
- this.txt_depottypecode.Size = new System.Drawing.Size(150, 28);
- this.txt_depottypecode.TabIndex = 247;
- //
- // gv_depottypecode
- //
- this.gv_depottypecode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_depottypecode.AppearanceCell.Options.UseFont = true;
- this.gv_depottypecode.Caption = "浠撳簱绫诲瀷缂栫爜";
- this.gv_depottypecode.FieldName = "depottypecode";
- this.gv_depottypecode.MinWidth = 50;
- this.gv_depottypecode.Name = "gv_depottypecode";
- 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.Width = 94;
- //
- // lb_type2
- //
- this.lb_type2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_type2.Appearance.Options.UseFont = true;
- this.lb_type2.Location = new System.Drawing.Point(40, 116);
- this.lb_type2.Name = "lb_type2";
- this.lb_type2.Size = new System.Drawing.Size(73, 21);
- this.lb_type2.TabIndex = 243;
- this.lb_type2.Text = "鎴愬搧浣跨敤 ";
- //
- // txt_type2
- //
- this.txt_type2.Enabled = false;
- this.txt_type2.Location = new System.Drawing.Point(118, 112);
- this.txt_type2.Name = "txt_type2";
- this.txt_type2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_type2.Properties.Appearance.Options.UseFont = true;
- this.txt_type2.Size = new System.Drawing.Size(150, 28);
- this.txt_type2.TabIndex = 243;
- //
- // lb_type1
- //
- this.lb_type1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_type1.Appearance.Options.UseFont = true;
- this.lb_type1.Location = new System.Drawing.Point(305, 86);
- this.lb_type1.Name = "lb_type1";
- this.lb_type1.Size = new System.Drawing.Size(73, 21);
- this.lb_type1.TabIndex = 240;
- this.lb_type1.Text = "鐗╂枡浣跨敤 ";
- //
- // txt_type1
- //
- this.txt_type1.Enabled = false;
- this.txt_type1.Location = new System.Drawing.Point(382, 82);
- this.txt_type1.Name = "txt_type1";
- this.txt_type1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_type1.Properties.Appearance.Options.UseFont = true;
- this.txt_type1.Size = new System.Drawing.Size(150, 28);
- this.txt_type1.TabIndex = 240;
- //
- // 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(558, 86);
- this.lb_factory.Name = "lb_factory";
- this.lb_factory.Size = new System.Drawing.Size(73, 21);
- this.lb_factory.TabIndex = 235;
- this.lb_factory.Text = "鍒嗗巶缂栫爜 ";
- //
- // txt_factory
- //
- this.txt_factory.Enabled = false;
- this.txt_factory.Location = new System.Drawing.Point(638, 82);
- 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;
- //
- // lb_depottype
- //
- this.lb_depottype.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_depottype.Appearance.Options.UseFont = true;
- this.lb_depottype.Location = new System.Drawing.Point(305, 52);
- this.lb_depottype.Name = "lb_depottype";
- this.lb_depottype.Size = new System.Drawing.Size(73, 21);
- this.lb_depottype.TabIndex = 231;
- this.lb_depottype.Text = "浠撳簱绫诲瀷 ";
- //
- // txt_depottype
- //
- this.txt_depottype.Enabled = false;
- this.txt_depottype.Location = new System.Drawing.Point(382, 48);
- this.txt_depottype.Name = "txt_depottype";
- this.txt_depottype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depottype.Properties.Appearance.Options.UseFont = true;
- this.txt_depottype.Size = new System.Drawing.Size(150, 28);
- this.txt_depottype.TabIndex = 231;
- //
- // gv_depottype
- //
- this.gv_depottype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_depottype.AppearanceCell.Options.UseFont = true;
- this.gv_depottype.Caption = "浠撳簱绫诲瀷";
- this.gv_depottype.FieldName = "depottype";
- this.gv_depottype.MinWidth = 50;
- this.gv_depottype.Name = "gv_depottype";
- this.gv_depottype.OptionsColumn.AllowEdit = false;
- this.gv_depottype.Tag = "query_a.depottype";
- this.gv_depottype.Visible = true;
- this.gv_depottype.VisibleIndex = 6;
- this.gv_depottype.Width = 94;
- //
- // 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(814, 86);
- this.lb_lastupdateDate.Name = "lb_lastupdateDate";
- this.lb_lastupdateDate.Size = new System.Drawing.Size(107, 21);
- this.lb_lastupdateDate.TabIndex = 228;
- this.lb_lastupdateDate.Text = "鏈�鍚庢洿鏂版椂闂� ";
- //
- // txt_lastupdateDate
- //
- this.txt_lastupdateDate.Enabled = false;
- this.txt_lastupdateDate.Location = new System.Drawing.Point(927, 82);
- this.txt_lastupdateDate.Name = "txt_lastupdateDate";
- this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
- this.txt_lastupdateDate.TabIndex = 228;
- //
- // lb_lastupdateBy
- //
- 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(831, 52);
- this.lb_lastupdateBy.Name = "lb_lastupdateBy";
- this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21);
- this.lb_lastupdateBy.TabIndex = 226;
- this.lb_lastupdateBy.Text = "鏈�鍚庢洿鏂颁汉 ";
- //
- // txt_lastupdateBy
- //
- this.txt_lastupdateBy.Enabled = false;
- this.txt_lastupdateBy.Location = new System.Drawing.Point(927, 48);
- this.txt_lastupdateBy.Name = "txt_lastupdateBy";
- this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
- this.txt_lastupdateBy.TabIndex = 226;
- //
- // lb_createDate
- //
- this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createDate.Appearance.Options.UseFont = true;
- this.lb_createDate.Location = new System.Drawing.Point(848, 18);
- this.lb_createDate.Name = "lb_createDate";
- this.lb_createDate.Size = new System.Drawing.Size(73, 21);
- this.lb_createDate.TabIndex = 222;
- this.lb_createDate.Text = "鍒涘缓鏃堕棿 ";
- //
- // txt_createDate
- //
- this.txt_createDate.Enabled = false;
- this.txt_createDate.Location = new System.Drawing.Point(927, 14);
- this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(150, 28);
- this.txt_createDate.TabIndex = 222;
- //
- // lb_createBy
- //
- this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(541, 18);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(90, 21);
- this.lb_createBy.TabIndex = 219;
- this.lb_createBy.Text = "浠撳簱璐熻矗浜� ";
- //
- // txt_createBy
- //
- this.txt_createBy.Enabled = false;
- this.txt_createBy.Location = new System.Drawing.Point(638, 14);
- this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(150, 28);
- this.txt_createBy.TabIndex = 219;
- //
- // gv_createBy
- //
- this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createBy.AppearanceCell.Options.UseFont = true;
- this.gv_createBy.Caption = "浠撳簱璐熻矗浜�";
- this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
- this.gv_createBy.Name = "gv_createBy";
- this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "query_a.create_by";
- this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
- this.gv_createBy.Width = 94;
- //
- // lb_description
- //
- 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(74, 52);
- this.lb_description.Name = "lb_description";
- this.lb_description.Size = new System.Drawing.Size(39, 21);
- this.lb_description.TabIndex = 217;
- this.lb_description.Text = "澶囨敞 ";
- //
- // txt_description
- //
- this.txt_description.Enabled = false;
- this.txt_description.Location = new System.Drawing.Point(118, 48);
- 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;
- this.txt_description.Size = new System.Drawing.Size(150, 28);
- this.txt_description.TabIndex = 217;
- //
- // gv_description
- //
- this.gv_description.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_description.AppearanceCell.Options.UseFont = true;
- this.gv_description.Caption = "澶囨敞";
- this.gv_description.FieldName = "description";
- this.gv_description.MinWidth = 50;
- this.gv_description.Name = "gv_description";
- 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.Width = 94;
- //
- // lb_depotName
- //
- this.lb_depotName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_depotName.Appearance.Options.UseFont = true;
- this.lb_depotName.Location = new System.Drawing.Point(305, 18);
- this.lb_depotName.Name = "lb_depotName";
- this.lb_depotName.Size = new System.Drawing.Size(73, 21);
- this.lb_depotName.TabIndex = 216;
- this.lb_depotName.Text = "浠撳簱鍚嶇О ";
- //
- // txt_depotName
- //
- this.txt_depotName.Enabled = false;
- this.txt_depotName.Location = new System.Drawing.Point(382, 14);
- this.txt_depotName.Name = "txt_depotName";
- this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(150, 28);
- this.txt_depotName.TabIndex = 216;
- //
- // gv_depotName
- //
- this.gv_depotName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_depotName.AppearanceCell.Options.UseFont = true;
- this.gv_depotName.Caption = "浠撳簱鍚嶇О";
- this.gv_depotName.FieldName = "depotName";
- this.gv_depotName.MinWidth = 150;
- this.gv_depotName.Name = "gv_depotName";
- 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.Width = 150;
- //
- // lb_depotCode
- //
- this.lb_depotCode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_depotCode.Appearance.Options.UseFont = true;
- this.lb_depotCode.Location = new System.Drawing.Point(40, 18);
- this.lb_depotCode.Name = "lb_depotCode";
- this.lb_depotCode.Size = new System.Drawing.Size(73, 21);
- this.lb_depotCode.TabIndex = 213;
- this.lb_depotCode.Text = "浠撳簱缂栫爜 ";
- //
- // txt_depotCode
- //
- this.txt_depotCode.Enabled = false;
- this.txt_depotCode.Location = new System.Drawing.Point(118, 14);
- this.txt_depotCode.Name = "txt_depotCode";
- this.txt_depotCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_depotCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotCode.Size = new System.Drawing.Size(150, 28);
- this.txt_depotCode.TabIndex = 213;
- //
- // gv_depotCode
- //
- this.gv_depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_depotCode.AppearanceCell.Options.UseFont = true;
- this.gv_depotCode.Caption = "浠撳簱缂栫爜";
- this.gv_depotCode.FieldName = "depotCode";
- this.gv_depotCode.MinWidth = 100;
- this.gv_depotCode.Name = "gv_depotCode";
- this.gv_depotCode.OptionsColumn.AllowEdit = false;
- this.gv_depotCode.Tag = "query_a.depot_code";
- this.gv_depotCode.Visible = true;
- this.gv_depotCode.VisibleIndex = 2;
- this.gv_depotCode.Width = 100;
- //
- // toolBarMenu1
- //
- this.toolBarMenu1.chkParameter = "MES_DEPOTS,check_date,check_status,check_by";
- this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
- this.toolBarMenu1.guidKey = null;
- this.toolBarMenu1.isSetBtn = false;
- this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Name = "toolBarMenu1";
- this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
- this.toolBarMenu1.TabIndex = 0;
- this.toolBarMenu1.xlsInService = "xlsOut_depots{}";
- this.toolBarMenu1.xlsOutParameter = null;
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.ColumnPanelRowHeight = 60;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn1,
- this.gv_id,
- this.gv_depotCode,
- this.gv_depotName,
- this.gv_depottype,
- this.gv_description,
- this.gv_createBy,
- this.gv_depottypecode,
- this.gv_isWy,
- this.gv_isNg,
- this.gv_zuid,
- this.gv_isFkc,
- this.gridColumn4,
- this.gridColumn3,
- this.gridColumn2});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.IndicatorWidth = 50;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "浣跨敤缁勭粐";
- this.gridColumn1.FieldName = "fSubsidiary";
- this.gridColumn1.MinWidth = 250;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.OptionsColumn.AllowEdit = false;
- this.gridColumn1.Tag = "org.FNumber";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 250;
- //
- // gv_id
- //
- this.gv_id.Caption = "浠撳簱ID";
- this.gv_id.FieldName = "depotId";
- this.gv_id.MinWidth = 25;
- this.gv_id.Name = "gv_id";
- 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.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
- //
- this.gridColumn3.Caption = "瀹℃牳浜�";
- this.gridColumn3.FieldName = "checkBy";
- this.gridColumn3.MinWidth = 100;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.OptionsColumn.AllowEdit = false;
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 13;
- this.gridColumn3.Width = 100;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "瀹℃牳鏃堕棿";
- this.gridColumn2.FieldName = "checkDate";
- this.gridColumn2.MinWidth = 180;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.OptionsColumn.AllowEdit = false;
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 14;
- this.gridColumn2.Width = 180;
- //
- // xtraTabControl1
- //
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1,
- this.xtraTabPage2});
- //
- // xtraTabPage1
- //
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
- //
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1126, 39);
- this.pageBar1.TabIndex = 3;
- this.pageBar1.TotalPages = 0;
- //
- // xtraTabPage2
- //
- this.xtraTabPage2.Controls.Add(this.tabMx);
- this.xtraTabPage2.Controls.Add(this.panel1);
- this.xtraTabPage2.Name = "xtraTabPage2";
-
- this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
- //
- // tabMx
- //
- this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
- this.tabMx.Location = new System.Drawing.Point(0, 200);
- this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1126, 370);
- this.tabMx.TabIndex = 2;
- this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
- //
- // panel1
- //
- this.panel1.BackColor = System.Drawing.Color.White;
- this.panel1.Controls.Add(this.labelControl11);
- this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_materialProperti);
- this.panel1.Controls.Add(this.txt_materialProperti);
- this.panel1.Controls.Add(this.lb_isFkc);
- this.panel1.Controls.Add(this.txt_isFkc);
- this.panel1.Controls.Add(this.lb_zuid);
- this.panel1.Controls.Add(this.txt_zuid);
- this.panel1.Controls.Add(this.lb_piType);
- this.panel1.Controls.Add(this.txt_piType);
- this.panel1.Controls.Add(this.lb_cwhaddress);
- this.panel1.Controls.Add(this.txt_cwhaddress);
- this.panel1.Controls.Add(this.lb_isNg);
- this.panel1.Controls.Add(this.txt_isNg);
- this.panel1.Controls.Add(this.lb_isWy);
- this.panel1.Controls.Add(this.txt_isWy);
- this.panel1.Controls.Add(this.lb_iconType);
- this.panel1.Controls.Add(this.txt_iconType);
- this.panel1.Controls.Add(this.lb_depottypecode);
- this.panel1.Controls.Add(this.txt_depottypecode);
- this.panel1.Controls.Add(this.lb_type2);
- this.panel1.Controls.Add(this.txt_type2);
- this.panel1.Controls.Add(this.lb_type1);
- this.panel1.Controls.Add(this.txt_type1);
- this.panel1.Controls.Add(this.lb_factory);
- this.panel1.Controls.Add(this.txt_factory);
- this.panel1.Controls.Add(this.lb_depottype);
- this.panel1.Controls.Add(this.txt_depottype);
- this.panel1.Controls.Add(this.lb_lastupdateDate);
- this.panel1.Controls.Add(this.txt_lastupdateDate);
- this.panel1.Controls.Add(this.lb_lastupdateBy);
- this.panel1.Controls.Add(this.txt_lastupdateBy);
- this.panel1.Controls.Add(this.lb_createDate);
- this.panel1.Controls.Add(this.txt_createDate);
- this.panel1.Controls.Add(this.lb_createBy);
- this.panel1.Controls.Add(this.txt_createBy);
- this.panel1.Controls.Add(this.lb_description);
- this.panel1.Controls.Add(this.txt_description);
- this.panel1.Controls.Add(this.lb_depotName);
- this.panel1.Controls.Add(this.txt_depotName);
- this.panel1.Controls.Add(this.lb_depotCode);
- this.panel1.Controls.Add(this.txt_depotCode);
- this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1126, 200);
- this.panel1.TabIndex = 1;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(918, 177);
- this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(45, 18);
- this.labelControl11.TabIndex = 130;
- this.labelControl11.Text = "涓婚敭锛�";
- this.labelControl11.Visible = false;
- //
- // lbGuid
- //
- this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(969, 177);
- this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(0, 21);
- this.lbGuid.TabIndex = 1;
- this.lbGuid.Visible = false;
- //
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(983, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 5;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
- // Frm_MesDepot
- //
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1128, 682);
- this.Controls.Add(this.picCheckBox);
- this.Controls.Add(this.xtraTabControl1);
- this.Controls.Add(this.toolBarMenu1);
- this.Name = "Frm_MesDepot";
- this.tabMxPage1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cwhaddress.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.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();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
- this.xtraTabPage2.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
- this.tabMx.ResumeLayout(false);
- this.panel1.ResumeLayout(false);
- this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- this.ResumeLayout(false);
-
- }
- #endregion
- private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
- private UserControls.Data.UcPageBar pageBar1;
- private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraEditors.LabelControl labelControl11;
- private DevExpress.XtraTab.XtraTabControl tabMx;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionNamet;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1kbQty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateDate;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1lastupdateBy;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1description;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1completenessFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionName;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-
- private DevExpress.XtraEditors.LabelControl lb_materialProperti;
- private DevExpress.XtraEditors.TextEdit txt_materialProperti;
-
- private DevExpress.XtraEditors.LabelControl lb_isFkc;
- private DevExpress.XtraEditors.TextEdit txt_isFkc;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isFkc;
-
- private DevExpress.XtraEditors.LabelControl lb_zuid;
- private DevExpress.XtraEditors.TextEdit txt_zuid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_zuid;
-
- private DevExpress.XtraEditors.LabelControl lb_piType;
- private DevExpress.XtraEditors.TextEdit txt_piType;
-
- private DevExpress.XtraEditors.LabelControl lb_cwhaddress;
- private DevExpress.XtraEditors.TextEdit txt_cwhaddress;
-
- private DevExpress.XtraEditors.LabelControl lb_isNg;
- private DevExpress.XtraEditors.TextEdit txt_isNg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isNg;
-
- private DevExpress.XtraEditors.LabelControl lb_isWy;
- private DevExpress.XtraEditors.TextEdit txt_isWy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isWy;
-
- private DevExpress.XtraEditors.LabelControl lb_iconType;
- private DevExpress.XtraEditors.TextEdit txt_iconType;
-
- private DevExpress.XtraEditors.LabelControl lb_depottypecode;
- private DevExpress.XtraEditors.TextEdit txt_depottypecode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode;
-
- private DevExpress.XtraEditors.LabelControl lb_type2;
- private DevExpress.XtraEditors.TextEdit txt_type2;
-
- private DevExpress.XtraEditors.LabelControl lb_type1;
- private DevExpress.XtraEditors.TextEdit txt_type1;
-
- private DevExpress.XtraEditors.LabelControl lb_factory;
- private DevExpress.XtraEditors.TextEdit txt_factory;
-
- private DevExpress.XtraEditors.LabelControl lb_depottype;
- private DevExpress.XtraEditors.TextEdit txt_depottype;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depottype;
-
- private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
- private DevExpress.XtraEditors.LabelControl lb_lastupdateBy;
- private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-
- private DevExpress.XtraEditors.LabelControl lb_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createDate;
-
- private DevExpress.XtraEditors.LabelControl lb_createBy;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-
- private DevExpress.XtraEditors.LabelControl lb_description;
- private DevExpress.XtraEditors.TextEdit txt_description;
- private DevExpress.XtraGrid.Columns.GridColumn gv_description;
-
- private DevExpress.XtraEditors.LabelControl lb_depotName;
- private DevExpress.XtraEditors.TextEdit txt_depotName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotName;
-
- private DevExpress.XtraEditors.LabelControl lb_depotCode;
- private DevExpress.XtraEditors.TextEdit txt_depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_depotCode;
- private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private System.Windows.Forms.PictureBox picCheckBox;
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
deleted file mode 100644
index 0a99611..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ /dev/null
@@ -1,397 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Windows.Forms;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Controls;
-using DevExpress.XtraGrid.Views.Grid;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using MES.Service.Modes;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-
-namespace Gs.DevApp.DevFrm
-{
- public partial class Frm_MesDepot : XtraForm
- {
- private List<FilterEntity> _filterList = new List<FilterEntity>();
- private readonly string _webServiceName = "MesDepotsManager/";
-
- public Frm_MesDepot()
- {
- InitializeComponent();
- toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
- toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
- toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
- toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
-
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "");
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- getPageList(1);
- pageBar1.PagerEvent += PageBar1_PagerEvent;
- }
-
- /// <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, false, 999);
- }
-
- /// <summary>
- /// 鍒嗛〉浜嬩欢
- /// </summary>
- /// <param name="curPage"></param>
- /// <param name="pageSize"></param>
- private void PageBar1_PagerEvent(int curPage, int pageSize)
- {
- getPageList(curPage);
- }
-
- /// <summary>
- /// 鏌ヨ浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
- {
- var frm = new ShowFilter(gridView1.Columns, _filterList);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
- }
-
- /// <summary>
- /// 鏌ヨ鍥炶皟
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
- {
- _filterList = e.FilterList;
- getPageList(1);
- }
-
- /// <summary>
- /// 鍙嶅鏍�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- /// <exception cref="NotImplementedException"></exception>
- private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
- {
- _toolCk(0);
- }
-
- /// <summary>
- /// 瀹℃牳浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
- {
- _toolCk(1);
- }
-
- /// <summary>
- /// 鍙栨秷浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
- {
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- }
-
- /// <summary>
- /// 鍒锋柊浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getPageList(1);
- }
-
- /// <summary>
- /// 淇敼浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
- {
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_depotCode, gridView1);
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- getModel(rowGuid, true, 1);
- }
-
-
-
- /// <summary>
- /// 淇濆瓨浜嬩欢
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
- {
- toolBarMenu1.isSetBtn = false;
- if (string.IsNullOrEmpty(txt_depotCode.Text.Trim()))
- {
- MsgHelper.Warning("浠撳簱缂栫爜涓嶈兘涓虹┖锛�");
- txt_depotCode.Focus();
- return;
- }
-
- if (string.IsNullOrEmpty(txt_depotName.Text.Trim()))
- {
- MsgHelper.Warning("浠撳簱鍚嶇О涓嶈兘涓虹┖锛�");
- txt_depotName.Focus();
- return;
- }
- gvMx1.CloseEditor();
- gvMx1.UpdateCurrentRow();
- var lst = new List<MesDepotSections>();
- for (var i = 0; i < gvMx1.DataRowCount; i++)
- {
- var row = gvMx1.GetDataRow(i);
- if (row != null)
- lst.Add(new MesDepotSections
- {
- Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
- DepotSectionCode = row["depotSectionCode"].ToString(),
- DepotSectionName = row["DepotSectionName"].ToString(),
- Description = row["Description"].ToString(),
- KbQty =Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["KbQty"].ToString()),
- DepotSectionNamet = row["depotSectionNamet"].ToString(),
- CompletenessFlag = Gs.DevApp.ToolBox.UtilityHelper.ToInt(row["completenessFlag"].ToString()),
- });
- }
- var _obj = new MesDepots
- {
- Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
- DepotCode = txt_depotCode.Text,
- DepotName = txt_depotName.Text,
- Description = txt_description.Text,
- list = lst
- };
-
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "EditModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- if (_rtn.rtnCode > 0)
- {
- lbGuid.Text = _rtn.rtnData;
- toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(panel1.Controls, false);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- /// <summary>
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
- private void getPageList(int curPage)
- {
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.depot_code", "asc",
- "", _sbSqlWhere.ToString());
- var json = JsonConvert.SerializeObject(pgq);
- try
- {
- var strReturn = UtilityHelper.HttpPost("",
- _webServiceName + "GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
- var dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
- var dddd = dd.rtnData.pages; //鎬婚〉
- pageBar1.TotalPages = dddd;
- pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
- pageBar1.CurrentPage = curPage; //褰撳墠椤�
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- private void getModel(string strGuid, bool isEdit, int tabIdx)
- {
- if (string.IsNullOrEmpty(strGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
-
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
- var _obj = new
- {
- guid = strGuid //涓诲缓
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "GetModel",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- var dy = _rtn.rtnData;
- lbGuid.Text = strGuid;
- var gvList = new List<GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit,
- gvList);
- var _job = JObject.Parse(strJson);
- var array = new JArray();
- foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
- array.ToString());
- if (dt.Rows.Count > 0)
- {
- gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt;
- gcMx1.ForceInitialize();
- }
- else
- {
- UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- }
- }
- else
- {
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
-
- private void repositoryItemButtonEdit1_ButtonClick(object sender,
- ButtonPressedEventArgs e)
- {
- gvMx1.CloseEditor();
- gvMx1.UpdateCurrentRow();
- var rowhandle = gvMx1.FocusedRowHandle;
- if (rowhandle < 0)
- return;
- if (e.Button.Index == 0)
- {
- var dr = gvMx1.GetDataRow(rowhandle);
- var mxGuid = dr["guid"].ToString();
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
- return;
- if (string.IsNullOrEmpty(mxGuid))
- {
- gvMx1.DeleteRow(rowhandle);
- return;
- }
- var strJson = "";
- var lst = new List<string>();
- lst.Add(mxGuid);
- try
- {
- strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelMx",
- JsonConvert.SerializeObject(lst));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
- }
-
-
- /// <summary>
- /// 宸ュ叿鏉′簨浠�
- /// </summary>
- /// <param name="inFieldValue"></param>
- private void _toolCk(int _inFieldValue)
- {
- string strMsg = "";
- switch (_inFieldValue)
- {
- case 1:
- strMsg = "瀹℃牳";
- break;
- case 0:
- strMsg = "鍙嶅鏍�";
- break;
- };
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_depotName, gridView1, "depotName");
- if (string.IsNullOrEmpty(rowGuid))
- {
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- return;
- }
- if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
- return;
-
- var _obj = new
- {
- guid = rowGuid,
- ckValue = _inFieldValue,
- parameter = "MES_DEPOTS,check_date,check_status,check_by"
- };
- try
- {
- var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
- JsonConvert.SerializeObject(_obj));
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
- {
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim(), false, 999);
- else
- getPageList(1);
- }
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
-
- }
-
- }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.resx b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.resx
deleted file mode 100644
index d58980a..0000000
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.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/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index a9e2f14..6ad0317 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -504,10 +504,10 @@
<Compile Include="DevFrm\Warehouse\Frm_ArrivalBarcode.Designer.cs">
<DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\Warehouse\Frm_MesDepot.cs">
+ <Compile Include="DevFrm\BasicData\Frm_MesDepot.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="DevFrm\Warehouse\Frm_MesDepot.Designer.cs">
+ <Compile Include="DevFrm\BasicData\Frm_MesDepot.Designer.cs">
<DependentUpon>Frm_MesDepot.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\Warehouse\Frm_MesInvItemArn.cs">
@@ -939,7 +939,7 @@
<EmbeddedResource Include="DevFrm\Warehouse\Frm_ArrivalBarcode.resx">
<DependentUpon>Frm_ArrivalBarcode.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\Warehouse\Frm_MesDepot.resx">
+ <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDepot.resx">
<DependentUpon>Frm_MesDepot.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\Warehouse\Frm_MesInvItemArn.resx">
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index 89e6191..1f6b694 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -90,6 +90,7 @@
lookSearchSupplier.EditValue = null;
return;
}
+ if(!string.IsNullOrEmpty(Code))
lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
}
--
Gitblit v1.9.3