diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo
index 632494e..4252223 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm
index d9dcd01..4e295ce 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
index b90deb1..37b1822 100644
Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs b/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
index ca377a0..5696255 100644
--- a/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
@@ -10,23 +10,6 @@ namespace FineUIPro.Web.common.ProjectSet
{
public partial class SelectWelder : PageBase
{
- #region 定义项
- ///
- /// 项目id
- ///
- public string ProjectId
- {
- get
- {
- return (string)ViewState["ProjectId"];
- }
- set
- {
- ViewState["ProjectId"] = value;
- }
- }
- #endregion
-
#region 加载
///
/// 加载页面
@@ -37,7 +20,6 @@ namespace FineUIPro.Web.common.ProjectSet
{
if (!IsPostBack)
{
- this.ProjectId = Request.Params["projectId"];
BindGrid();
//InitTreeMenu();//加载树
}
@@ -76,7 +58,7 @@ namespace FineUIPro.Web.common.ProjectSet
WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId)
AND IsOAM=1";
List listStr = new List();
- listStr.Add(new SqlParameter("@ProjectId", ProjectId));
+ listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"]));
if (!string.IsNullOrEmpty(txtWeldCode.Text))
{
@@ -140,7 +122,7 @@ namespace FineUIPro.Web.common.ProjectSet
{
Model.Project_Welder newProjectWelder = new Model.Project_Welder();
newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString();
- newProjectWelder.ProjectId = this.ProjectId;
+ newProjectWelder.ProjectId = Request.Params["projectId"];
newProjectWelder.IsSelected = true;
newProjectWelder.IsApprove = true;
newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder));