lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0818-1555

Browse Source
This commit is contained in:
gaofei
2021-08-18 15:55:24 +08:00
parent a3031f2003
commit 6efc9d1c61
7 changed files with 34 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx.cs
+5 -5
View File
@@ -22,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive
if (!IsPostBack)
{
GetButtonPower();
BLL.CNProfessionalService.InitCNProfessionalDownList(this.sdrpCNProfessionalId, true);
BLL.DesignProfessionalService.InitDesignProfessionalDownList(this.sdrpCNProfessionalId, true);
BindGrid();
}
}
@@ -46,10 +46,10 @@ namespace FineUIPro.Web.Comprehensive
C.Remark,
C.RemarkCode,
C.UnitWorkId,
CN.ProfessionalName"
+@" FROM Comprehensive_DesignDrawings C "
+@" LEFT JOIN Base_CNProfessional CN ON C.CNProfessionalId=CN.CNProfessionalId"
+@" WHERE C.ProjectId = @ProjectId";
CN.ProfessionalName"
+ @" FROM Comprehensive_DesignDrawings C "
+ @" LEFT JOIN Base_DesignProfessional CN ON C.CNProfessionalId=CN.DesignProfessionalId"
+ @" WHERE C.ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
if (sdrpCNProfessionalId.SelectedValue != BLL.Const._Null)
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
+4 -4
View File
@@ -168,7 +168,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
where y.ProjectId == this.CurrUser.LoginProjectId
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
var cns = from x in Funs.DB.Base_DesignProfessional select x;
for (int i = 0; i < ir; i++)
{
@@ -402,7 +402,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
where y.ProjectId == this.CurrUser.LoginProjectId
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
var cns = from x in Funs.DB.Base_DesignProfessional select x;
for (int i = 0; i < ir; i++)
{
@@ -416,7 +416,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Model.Comprehensive_DesignDrawings des = new Model.Comprehensive_DesignDrawings();
des.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings));
des.ProjectId = this.CurrUser.LoginProjectId;
des.CNProfessionalId = cn.CNProfessionalId;
des.CNProfessionalId = cn.DesignProfessionalId;
des.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
des.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
des.Edition = pds.Rows[i][3].ToString().Trim();
@@ -443,7 +443,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
else
{
oldViewInfo.CNProfessionalId = cn.CNProfessionalId;
oldViewInfo.CNProfessionalId = cn.DesignProfessionalId;
oldViewInfo.DesignDrawingsCode = pds.Rows[i][1].ToString().Trim();
oldViewInfo.DesignDrawingsContent = pds.Rows[i][2].ToString().Trim();
oldViewInfo.Edition = pds.Rows[i][3].ToString().Trim();
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (!IsPostBack)
{
GetButtonPower();
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
BLL.DesignProfessionalService.InitDesignProfessionalDownList(this.drpCNProfessionalId, true);
BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false);
BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false);
this.DesignDrawingsId = Request.Params["DesignDrawingsId"];