lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
李鹏飞 2024-10-30 15:47:15 +08:00
parent ddb85663b2
commit 0b047a056a
14 changed files with 291 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin_New/v17/.wsuo
View File

Binary file not shown.

8
DataBase/版本日志/SGGLDB_V2024-10-29.sql Normal file
View File

@ -0,0 +1,8 @@
update Sys_Menu set MenuName ='确定中标人审批' where MenuId='11503AD6-742D-406D-96F1-17BA3B9E7580'
go
alter table PHTGL_SetSubReview add BidDocumentsReviewId nvarchar(50)
go
update sub set sub.BidDocumentsReviewId=app.BidDocumentsReviewId
from PHTGL_SetSubReview sub
join PHTGL_BidApproveUserReview app on sub.ApproveUserReviewID=app.ApproveUserReviewID

8
SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
View File

@ -141,11 +141,11 @@ namespace BLL
/// </summary>
/// <param name="dropName"></param>
/// <param name="isShowPlease"></param>
public static void InitGetBidCompleteDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
public static void InitGetBidCompleteDropDownList(FineUIPro.DropDownList dropName,string projectid, bool isShowPlease)
{
dropName.DataValueField = "BidDocumentsReviewId";
dropName.DataTextField = "BidDocumentsCode";
dropName.DataSource = GetCompleteBidDocument();
dropName.DataSource = GetCompleteBidDocument(projectid);
dropName.DataBind();
if (isShowPlease)
{
@ -153,10 +153,10 @@ namespace BLL
}
}
public static List<Model.PHTGL_BidDocumentsReview> GetCompleteBidDocument()
public static List<Model.PHTGL_BidDocumentsReview> GetCompleteBidDocument(string projectid)
{
var list = (from x in Funs.DB.PHTGL_BidDocumentsReview
where x.State == Const.ContractReview_Complete
where x.State == Const.ContractReview_Complete && x.ProjectId == projectid
select x).ToList();
return list;
}

17
SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs
View File

@ -67,7 +67,7 @@ namespace BLL
table.Approval_Construction = newtable.Approval_Construction;
table.IsOwenerApprove = newtable.IsOwenerApprove;
table.DepartId = newtable.DepartId;
table.BidDocumentsReviewId = newtable.BidDocumentsReviewId;
Funs.DB.PHTGL_SetSubReview.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
}
@ -93,7 +93,7 @@ namespace BLL
table.Approval_Construction = newtable.Approval_Construction;
table.IsOwenerApprove = newtable.IsOwenerApprove;
table.DepartId = newtable.DepartId;
table.BidDocumentsReviewId = newtable.BidDocumentsReviewId;
Funs.DB.SubmitChanges();
}
@ -165,10 +165,15 @@ namespace BLL
}
public static object GetMySelfCompleteSetSubReview(string userid, string ProjectId)
{
var list = (from x in Funs.DB.PHTGL_SetSubReview
/*var list = (from x in Funs.DB.PHTGL_SetSubReview
join y in Funs.DB.PHTGL_BidApproveUserReview on x.ApproveUserReviewID equals y.ApproveUserReviewID
where x.State == Const.ContractReview_Complete && x.CreateUser == userid
&& y.ProjectId == ProjectId
select x).ToList();*/
var list = (from x in Funs.DB.PHTGL_SetSubReview
join y in Funs.DB.PHTGL_BidDocumentsReview on x.BidDocumentsReviewId equals y.BidDocumentsReviewId
where x.State == Const.ContractReview_Complete && x.CreateUser == userid
&& y.ProjectId == ProjectId
select x).ToList();
return list;
}
@ -182,8 +187,7 @@ namespace BLL
string filePath = string.Empty;
string strSql = "";
var getFireWork = PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(getFireWork.ApproveUserReviewID);
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(getFireWork.BidDocumentsReviewId);
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID);
@ -322,8 +326,7 @@ namespace BLL
string newUrl = string.Empty;
string initTemplatePath = string.Empty;
var getFireWork = PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(Id);
var BidUser = PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(getFireWork.ApproveUserReviewID);
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDoc = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(getFireWork.BidDocumentsReviewId);
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID);
switch (getFireWork.Type)

10
SGGL/BLL/PHTGL/OAWebSevice.cs
View File

@ -210,7 +210,7 @@ namespace BLL
break;
case PHTGL_ApproveService.SetSubReview:
var Sub = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(users.ContractId);
var BidApp2 = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(Sub.ApproveUserReviewID);
var BidApp2 = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(Sub.BidDocumentsReviewId);
if (Sub != null)
{
var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(Sub.CreateUser);
@ -387,18 +387,18 @@ namespace BLL
break;
case PHTGL_ApproveService.SetSubReview:
var Sub = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(users[i].ContractId);
var BidApp2 = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(Sub.ApproveUserReviewID);
var Biddoc2 = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(Sub.BidDocumentsReviewId);
if (Sub != null)
{
var geCreatUser = BLL.Person_PersonsService.GetPerson_PersonsById(Sub.CreateUser);
var gereceiver = BLL.Person_PersonsService.GetPerson_PersonsById(users[i].ApproveMan);
webJson.flowid = users[i].ApproveId;
webJson.requestname = "确定分包商审批审批 " + ProjectService.GetProjectNameByProjectId(BidApp2.ProjectId);
webJson.requestname = "确定分包商审批审批 " + ProjectService.GetProjectNameByProjectId(Biddoc2.ProjectId);
webJson.nodename = users[i].ApproveType;
webJson.creator = geCreatUser.JobNum;
webJson.receiver = gereceiver.JobNum;
webJson.pcurl = geturl(BidApp2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
webJson.appurl = getAppurl(BidApp2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
webJson.pcurl = geturl(Biddoc2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
webJson.appurl = getAppurl(Biddoc2.ProjectId, PHTGL_ApproveService.SetSubReview, Sub.SetSubReviewID, users[i].ApproveMan);
}
break;
case PHTGL_ApproveService.ContractReview:

3
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
View File

@ -138,8 +138,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
if (!string.IsNullOrEmpty(SetSubReviewID))
{
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSubReview.ApproveUserReviewID);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_SetSubReview.BidDocumentsReviewId);
if (_SetSubReview != null)
{
txtSetSubReviewCode.Text = _SetSubReview.SetSubReviewCode;

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs
View File

@ -43,7 +43,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
ApproveUserReviewID = Request.Params["ApproveUserReviewID"];
BLL.DepartService.InitDepartDropDownList(DropDepart, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(drpBidDocumentCode, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(drpBidDocumentCode,this.CurrUser.LoginProjectId, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropUser, null, Const.UnitId_SEDIN, null, false);
///绑定施工管理部正副主任

31
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs
View File

@ -73,13 +73,11 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
WHEN @Type_ConEvaluation THEN '综合评估法' END) AS Type
,U.PersonName AS CreateUser
,Pro.ProjectName
,Pro.ProjectCode"
+ @" from PHTGL_SetSubReview as Sub "
+ @" LEFT JOIN PHTGL_BidApproveUserReview as BidUser on BidUser.ApproveUserReviewID = Sub.ApproveUserReviewID "
+ @" LEFT JOIN PHTGL_BidDocumentsReview as BidDoc on BidDoc.BidDocumentsReviewId = BidUser.BidDocumentsReviewId "
+ @" LEFT JOIN PHTGL_ActionPlanFormation AS Acp ON Acp.ActionPlanID =BidDoc.ActionPlanID "
+ @" LEFT JOIN Person_Persons AS U ON U.PersonId = Sub.CreateUser "
+ @" LEFT JOIN Base_Project AS Pro ON Pro.ProjectId = BidUser.ProjectId WHERE 1=1 ";
,Pro.ProjectCode from PHTGL_SetSubReview as Sub
LEFT JOIN PHTGL_BidDocumentsReview as BidDoc on BidDoc.BidDocumentsReviewId = Sub.BidDocumentsReviewId
LEFT JOIN PHTGL_ActionPlanFormation AS Acp ON Acp.ActionPlanID =BidDoc.ActionPlanID
LEFT JOIN Person_Persons AS U ON U.PersonId = BidDoc.CreateUser
LEFT JOIN Base_Project AS Pro ON Pro.ProjectId = BidDoc.ProjectId WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
@ -92,7 +90,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!(this.CurrUser.PersonId == Const.sysglyId))
{
strSql += " and BidUser.ProjectId =@ProjectId";
strSql += " and BidDoc.ProjectId =@ProjectId";
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
}
@ -384,17 +382,22 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (this.judgementDelete(rowID, isShow))
{
var p = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(rowID);
if (p != null)
if (p != null&& p.State==Const.ContractCreating)
{
BLL.LogService.AddSys_Log(this.CurrUser, p.SetSubReviewID, p.ApproveUserReviewID, BLL.Const.SetSubReview, BLL.Const.BtnDelete);
PHTGL_ApproveService.DeletePHTGL_ApproveBycontractId(rowID);
BLL.AttachFileService.DeleteAttachFile(Funs.RootPath, rowID, BLL.Const.SetSubReview);
PHTGL_SetSubReviewService.DeletePHTGL_SetSubReviewById(rowID);
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
else
{
ShowNotify("审批表已提交，无法删除!", MessageBoxIcon.Question);
}
}
}
BindGrid();
ShowNotify("删除数据成功!", MessageBoxIcon.Success);
}
}
@ -447,10 +450,10 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
//btnMenuEdit.Hidden = false;
}
//if (buttonList.Contains(Const.BtnDelete))
//{
// btnMenuDelete.Hidden = false;
//}
if (buttonList.Contains(Const.BtnDelete))
{
btnMenuDelete.Hidden = false;
}
}
}
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)

3
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
View File

@ -127,8 +127,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!string.IsNullOrEmpty(SetSubReviewID))
{
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSubReview.ApproveUserReviewID);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_SetSubReview.BidDocumentsReviewId);
if (_SetSubReview != null)
{
txtSetSubReviewCode.Text = _SetSubReview.SetSubReviewCode;

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
View File

@ -67,7 +67,7 @@
<Items>
<f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
EnableColumnLines="true" DataIDField="ID" Height="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
<Toolbars>
<f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
<Items>

31
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs
View File

@ -44,7 +44,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
SetSubReviewID = Request.Params["SetSubReviewID"];
BLL.DepartService.InitDepartDropDownList(DropDepart, true);
PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(DropBidCode, this.CurrUser.LoginProjectId, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true);
@ -111,8 +111,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!string.IsNullOrEmpty(SetSubReviewID))
{
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSubReview.ApproveUserReviewID);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_SetSubReview.BidDocumentsReviewId);
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID);
if (_SetSubReview != null)
{
@ -121,7 +120,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
txtSetSubReviewCode.Text = Act.ProjectCode + ".000.C01.93-";
}
DropBidCode.SelectedValue = _SetSubReview.ApproveUserReviewID;
DropBidCode.SelectedValue = _SetSubReview.BidDocumentsReviewId;
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID).ProjectShortName;
txtBidContent.Text = BidDocument.BidContent;
StartTime.SelectedDate = BidDocument.Bidding_StartTime;
@ -174,10 +173,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
if (DropBidCode.SelectedValue != Const._Null)
{
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidUser.ProjectId);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidDocument.ProjectId);
if (string.IsNullOrEmpty(SetSubReviewID))
{
this.txtSetSubReviewCode.Text = projectcode + ".000.C01.93-";
@ -254,9 +252,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
_SetSubReview.ApproveUserReviewID = DropBidCode.SelectedValue;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID;
var BidDoc = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
_SetSubReview.ActionPlanID = BidDoc.ActionPlanID;
_SetSubReview.BidDocumentsReviewId = DropBidCode.SelectedValue;
_SetSubReview.SetSubReviewCode = txtSetSubReviewCode.Text.Trim().ToString();
_SetSubReview.CreateUser = this.CurrUser.PersonId;
_SetSubReview.State = state;
@ -271,6 +269,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
SetSubReviewID = _SetSubReview.SetSubReviewID;
if (state== Const.ContractCreat_Complete)
{
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
@ -286,12 +287,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
return false;
}
}
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
}
else
{
_SetSubReview.SetSubReviewID = SetSubReviewID;
if (state == Const.ContractCreat_Complete)
{
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
@ -307,6 +311,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
return false;
}
}
PHTGL_SetSubReviewService.UpdatePHTGL_SetSubReview(_SetSubReview);
}
@ -384,13 +389,19 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttachUrl_Click(object sender, EventArgs e)
{
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
}
}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
}
}
#endregion
}
}

2
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
View File

@ -74,7 +74,7 @@
<Items>
<f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
runat="server" DataKeyNames="ID" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
EnableColumnLines="true" DataIDField="ID" MaxHeight="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
EnableColumnLines="true" DataIDField="ID" Height="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
<Toolbars>
<f:Toolbar ID="Toolbar2" runat="server" Position="Top" ToolbarAlign="Left">
<Items>

34
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs
View File

@ -43,7 +43,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
SetSubReviewID = Request.Params["SetSubReviewID"];
BLL.DepartService.InitDepartDropDownList(DropDepart, true);
PHTGL_BidApproveUserReviewService.InitGetBidCompleteDropDownList(DropBidCode, true);
BLL.PHTGL_BidDocumentsReviewService.InitGetBidCompleteDropDownList(DropBidCode, this.CurrUser.LoginProjectId, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropConstructionManager, null, Const.UnitId_SEDIN, null, true);
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.DropProjectManager, null, Const.UnitId_SEDIN, null, true);
BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(DropApproval_Construction, null, CurrUser.UnitId, Const.ConstructionMinister + "," + Const.ConstructionViceMinister, false);
@ -105,8 +105,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
if (!string.IsNullOrEmpty(SetSubReviewID))
{
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(_SetSubReview.ApproveUserReviewID);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(_SetSubReview.BidDocumentsReviewId);
var Act = BLL.PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID);
if (_SetSubReview != null)
@ -116,7 +115,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
txtSetSubReviewCode.Text = Act.ProjectCode + ".000.C01.93-";
}
DropBidCode.SelectedValue = _SetSubReview.ApproveUserReviewID;
DropBidCode.SelectedValue = _SetSubReview.BidDocumentsReviewId;
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDocument.ActionPlanID).ProjectShortName;
txtBidContent.Text = BidDocument.BidContent;
StartTime.SelectedDate = BidDocument.Bidding_StartTime;
@ -166,9 +165,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
if (DropBidCode.SelectedValue != Const._Null)
{
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidUser.BidDocumentsReviewId);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidUser.ProjectId);
var BidDocument = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
string projectcode = BLL.ProjectService.GetProjectCodeByProjectId(BidDocument.ProjectId);
if (string.IsNullOrEmpty(SetSubReviewID))
{
this.txtSetSubReviewCode.Text = projectcode + ".000.C01.93-";
@ -246,9 +245,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
}
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(DropBidCode.SelectedValue);
_SetSubReview.ApproveUserReviewID = DropBidCode.SelectedValue;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID;
var BidDoc = BLL.PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(DropBidCode.SelectedValue);
_SetSubReview.ActionPlanID = BidDoc.ActionPlanID;
_SetSubReview.BidDocumentsReviewId = DropBidCode.SelectedValue;
_SetSubReview.SetSubReviewCode = txtSetSubReviewCode.Text.Trim().ToString();
_SetSubReview.CreateUser = this.CurrUser.PersonId;
_SetSubReview.State = state;
@ -263,6 +262,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
SetSubReviewID = _SetSubReview.SetSubReviewID;
if (state == Const.ContractCreat_Complete)
{
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
@ -278,12 +280,15 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
return false;
}
}
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
}
else
{
_SetSubReview.SetSubReviewID = SetSubReviewID;
if (state == Const.ContractCreat_Complete)
{
if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
@ -299,9 +304,9 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
return false;
}
}
PHTGL_SetSubReviewService.UpdatePHTGL_SetSubReview(_SetSubReview);
}
BLL.PHTGL_SetSubReview_Sch1Service.DeletePHTGL_SetSubReview_Sch1BySetSubReviewID(SetSubReviewID);
JArray EditorArr = Grid1.GetMergedData();
if (EditorArr.Count > 0)
@ -373,14 +378,19 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttachUrl_Click(object sender, EventArgs e)
{
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
}
}
protected void btnAttachUrl2_Click(object sender, EventArgs e)
{
if (Save(Const.ContractCreating))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
}
}
#endregion
}

290
SGGL/Model/Model.cs
View File

@ -12026,7 +12026,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea
{
get
@ -154120,7 +154120,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson
{
get
@ -185079,7 +185079,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
public string ProjectDescription
{
get
@ -185199,7 +185199,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
public string CalculationRule
{
get
@ -185259,7 +185259,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
public string ConstructionSubcontractor
{
get
@ -185643,7 +185643,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WorkPackageEstimate
{
get
@ -185948,16 +185948,6 @@ namespace Model
private string _ProjectId;
private string _ContractId;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderInDate;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
private System.Nullable<int> _State;
private string _InvoiceCode;
@ -185986,6 +185976,16 @@ namespace Model
private string _CreateUser;
private string _ContractId;
private System.Nullable<System.DateTime> _OrderInDate;
private string _OrderCode;
private System.Nullable<System.DateTime> _OrderOutDate;
private string _MaterialRequisitionUnit;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -185994,16 +185994,6 @@ namespace Model
partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable<int> value);
partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value);
@ -186032,6 +186022,16 @@ namespace Model
partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged();
partial void OnContractIdChanging(string value);
partial void OnContractIdChanged();
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderInDateChanged();
partial void OnOrderCodeChanging(string value);
partial void OnOrderCodeChanged();
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
partial void OnOrderOutDateChanged();
partial void OnMaterialRequisitionUnitChanging(string value);
partial void OnMaterialRequisitionUnitChanged();
#endregion
public PHTGL_Invoice()
@ -186079,106 +186079,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable<int> State
{
@ -186459,6 +186359,106 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderInDate
{
get
{
return this._OrderInDate;
}
set
{
if ((this._OrderInDate != value))
{
this.OnOrderInDateChanging(value);
this.SendPropertyChanging();
this._OrderInDate = value;
this.SendPropertyChanged("OrderInDate");
this.OnOrderInDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
public System.Nullable<System.DateTime> OrderOutDate
{
get
{
return this._OrderOutDate;
}
set
{
if ((this._OrderOutDate != value))
{
this.OnOrderOutDateChanging(value);
this.SendPropertyChanging();
this._OrderOutDate = value;
this.SendPropertyChanged("OrderOutDate");
this.OnOrderOutDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
public string MaterialRequisitionUnit
{
get
{
return this._MaterialRequisitionUnit;
}
set
{
if ((this._MaterialRequisitionUnit != value))
{
this.OnMaterialRequisitionUnitChanging(value);
this.SendPropertyChanging();
this._MaterialRequisitionUnit = value;
this.SendPropertyChanged("MaterialRequisitionUnit");
this.OnMaterialRequisitionUnitChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -187394,6 +187394,8 @@ namespace Model
private string _DepartId;
private string _BidDocumentsReviewId;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -187424,6 +187426,8 @@ namespace Model
partial void OnIsOwenerApproveChanged();
partial void OnDepartIdChanging(string value);
partial void OnDepartIdChanged();
partial void OnBidDocumentsReviewIdChanging(string value);
partial void OnBidDocumentsReviewIdChanged();
#endregion
public PHTGL_SetSubReview()
@ -187691,6 +187695,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidDocumentsReviewId", DbType="NVarChar(50)")]
public string BidDocumentsReviewId
{
get
{
return this._BidDocumentsReviewId;
}
set
{
if ((this._BidDocumentsReviewId != value))
{
this.OnBidDocumentsReviewIdChanging(value);
this.SendPropertyChanging();
this._BidDocumentsReviewId = value;
this.SendPropertyChanged("BidDocumentsReviewId");
this.OnBidDocumentsReviewIdChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -301497,7 +301521,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name
{
get
@ -302074,7 +302098,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@ -302265,7 +302289,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@ -307576,7 +307600,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@ -309048,7 +309072,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent
{
get
@ -318599,7 +318623,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
public string ContractNo
{
get
@ -318619,7 +318643,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
public string UnitWorks
{
get