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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2024-10-30 17:15:38 +08:00
parent 254c7ac7c0 0b047a056a
commit 1158a88cea
37 changed files with 415 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/SGGL_SeDin_New/v17/.wsuo
BIN
View File
Binary file not shown.
.vs/SGGL_SeDin_New/v17/DocumentLayout.json
-4
View File
@@ -51,10 +51,6 @@
"$type": "Bookmark",
"Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
},
{
"$type": "Bookmark",
"Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
},
{
"$type": "Bookmark",
"Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
DataBase/版本日志/SGGLDB_V2024-10-29.sql
+8
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
SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
+4
View File
@@ -116,6 +116,10 @@ namespace BLL
{
string PlanStartDate = "";
DataTable tb = BLL.HJGL_PackagingmanageService.GetPackagingDetailById(PackagingManageId);
if (tb == null || tb.Rows.Count == 0)
{
return PlanStartDate;
}
var dtTable = tb.AsEnumerable().OrderBy(o => o["PlanStartDate"]).CopyToDataTable();
if (dtTable.Rows != null && dtTable.Rows.Count > 0)
{
SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
+4 -4
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;
}
SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs
+10 -7
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)
SGGL/BLL/PHTGL/OAWebSevice.cs
+5 -5
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:
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+2 -2
View File
@@ -254,14 +254,14 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
}
else
{
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
/* Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID);
_SetSubReview.ApproveUserReviewID = ApproveUserReviewID;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID;
_SetSubReview.State = Const.ContractCreating;
_SetSubReview.Type = 0;
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);*/
ChangeState(Const.ContractReview_Complete);
}
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+2 -2
View File
@@ -397,14 +397,14 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
}
else
{
var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId);
/* var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId);
Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview();
newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview));
newtable.BidDocumentsReviewId = BidDocumentsReviewId;
newtable.ProjectId = Bid.ProjectId;
newtable.ActionPlanID = Bid.ActionPlanID;
newtable.State = Const.ContractCreating;
PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable);
PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable);*/
ChangeState(Const.ContractReview_Complete);
}
}
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
+1 -2
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;
SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
+3 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/09/2024 16:33:27" ReportInfo.CreatorVersion="2017.1.16.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/12/2024 15:13:53" ReportInfo.CreatorVersion="2017.1.16.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
</ScriptText>
<Dictionary>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGKbA2Bx03EOue9PYrCFwa+"/>
<MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF3hHwWOeKvKBRVSwNsZpqq"/>
<TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
<Column Name="pipelineCode" DataType="System.String" PropName="PipelineComponentId"/>
<Column Name="Mat" DataType="System.String" PropName="PipelineComponentCode"/>
@@ -156,7 +156,7 @@ namespace FastReport
<BarcodeObject Name="Barcode1" Left="3.78" Width="141.75" Height="141.75" AutoSize="false" Text="https://sggl.sedin.com.cn/StaticPage/HJGL/index.html?id=[Table1.WeldJointId]&amp;weldjoint=1" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
</TableCell>
<TableCell Name="Cell36" VertAlign="Center" Font="宋体, 11pt">
<TextObject Name="Text1" Left="9.45" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 72pt, style=Bold"/>
<TextObject Name="Text1" Left="9.45" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 48pt, style=Bold"/>
</TableCell>
</TableRow>
</TableObject>
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+3 -3
View File
File diff suppressed because one or more lines are too long
SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）.docx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）LW.docx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）.docx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）LW.docx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+2
View File
@@ -520,6 +520,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
硬度检测结果 = x.HardResult,
委托单编号 = x.TrustBatchCode,
检测单编号 = x.NDECode,
探伤类型=x.DetectionTypeCode,
探伤比例=x.DetectionRateCode
}).ToList();
MiniExcel.SaveAs(path, q);
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
+2 -2
View File
@@ -78,11 +78,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
protected void btnSave_Click(object sender, EventArgs e)
{
if (dropPipelineComponentCode.Values.Length==0)
/*if (dropPipelineComponentCode.Values.Length==0)
{
ShowNotify("请选择预制组件", MessageBoxIcon.Warning);
return;
}
}*/
if (string.IsNullOrEmpty(PackagingManageId))
{
Model.HJGL_PackagingManage table = new Model.HJGL_PackagingManage() ;
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+4
View File
@@ -61,6 +61,10 @@
<f:DropDownList ID="drpWeldingDailyCode" Label="日报编号" runat="server" AutoSelectFirstItem="true"
ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
runat="server" LabelWidth="80px"
Width="180px" LabelAlign="Left">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+13 -1
View File
@@ -27,7 +27,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
HJGL_PipelineComponentService.InitMainItemDownList(drpState,true);
HJGL_PipelineComponentService.InitMainItemDownProductionStateList(drpProductionState,true);
var pipeline = (from x in Funs.DB.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
select x.FlowingSection).Distinct().ToList();
this.drpFlowingSection.DataTextField = "Value";
this.drpFlowingSection.DataValueField = "Value";
this.drpFlowingSection.DataSource = pipeline;
this.drpFlowingSection.DataBind();
Funs.FineUIPleaseSelect(drpFlowingSection);
}
}
@@ -285,6 +292,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
listStr.Add(new SqlParameter("@ProductionState", drpProductionState.SelectedValue.ToString()));
}
if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
{
strSql += " AND pipe.FlowingSection =@FlowingSection";
listStr.Add(new SqlParameter("@FlowingSection", drpFlowingSection.SelectedValue.ToString()));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
GridDataTable = tb;
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
Generated
+9
View File
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingDailyCode;
/// <summary>
/// drpFlowingSection 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpFlowingSection;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+1 -1
View File
@@ -1311,7 +1311,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
WeldJointId = x.WeldJointId,
Spec = x.Specification,
SortIndex = x.WeldJointCode.Replace(x.PipelineCode + "/", ""),
}).ToList();
}).OrderBy(x=> x.pipelineCode).ThenBy(x=> x.SortIndex).ToList();
var tb = LINQToDataTable(result);
if (tb != null && tb.Rows.Count > 0)
{
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs
+1 -1
View File
@@ -350,7 +350,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
if (buttonList.Contains(Const.BtnAdd))
{
// btnNew.Hidden = false;
btnNew.Hidden = false;
}
if (buttonList.Contains(Const.BtnModify))
{
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+2 -2
View File
@@ -242,14 +242,14 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
}
else
{
Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
/* Model.PHTGL_SetSubReview _SetSubReview = new Model.PHTGL_SetSubReview();
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
var BidUser = BLL.PHTGL_BidApproveUserReviewService.GetPHTGL_BidApproveUserReviewById(ApproveUserReviewID);
_SetSubReview.ApproveUserReviewID = ApproveUserReviewID;
_SetSubReview.ActionPlanID = BidUser.ActionPlanID;
_SetSubReview.State = Const.ContractCreating;
_SetSubReview.Type = 0;
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);*/
ChangeState(Const.ContractReview_Complete);
}
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx
+1 -1
View File
@@ -25,7 +25,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpBidDocumentCode" runat="server" Label="招标文件编号" LabelAlign="Right" Readonly="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="140px"></f:DropDownList>
<f:DropDownList ID="drpBidDocumentCode" runat="server" Label="招标文件编号" LabelAlign="Right" AutoPostBack="true" EnableEdit="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="140px"></f:DropDownList>
<f:TextBox ID="txtBidProject" runat="server" Label="招标项目" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs
+7 -1
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);
///绑定施工管理部正副主任
@@ -151,6 +151,12 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e)
{
var bid=PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(drpBidDocumentCode.SelectedValue);
if (bid!= null)
{
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(bid.ActionPlanID).ProjectShortName;
txtBidProject.Text = bid.BidDocumentsName ;
}
}
private bool Save(int state)
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+8 -8
View File
@@ -384,14 +384,14 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
}
else
{
var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId);
Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview();
newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview));
newtable.BidDocumentsReviewId = BidDocumentsReviewId;
newtable.ProjectId = Bid.ProjectId;
newtable.ActionPlanID = Bid.ActionPlanID;
newtable.State = Const.ContractCreating;
PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable);
//var Bid = PHTGL_BidDocumentsReviewService.GetPHTGL_BidDocumentsReviewById(BidDocumentsReviewId);
//Model.PHTGL_BidApproveUserReview newtable = new Model.PHTGL_BidApproveUserReview();
//newtable.ApproveUserReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_BidApproveUserReview));
//newtable.BidDocumentsReviewId = BidDocumentsReviewId;
//newtable.ProjectId = Bid.ProjectId;
//newtable.ActionPlanID = Bid.ActionPlanID;
//newtable.State = Const.ContractCreating;
//PHTGL_BidApproveUserReviewService.AddPHTGL_BidApproveUserReview(newtable);
ChangeState(Const.ContractReview_Complete);
}
}
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx
+6
View File
@@ -34,6 +34,12 @@
<f:Button ID="btnRset" OnClick="btnRset_Click" ToolTip="重置" Text="重置" Icon="ArrowUndo" EnablePostBack="true" runat="server">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnAdd1" ToolTip="新增" Icon="Add" Text="新增(综合评估法)" EnablePostBack="true" runat="server"
Hidden="true">
</f:Button>
<f:Button ID="btnAdd2" ToolTip="新增" Icon="Add" Text="新增(经评审的最低投标报价法)" EnablePostBack="true" runat="server"
Hidden="true">
</f:Button>
<f:Button ID="btnMenuDelete" EnablePostBack="true" runat="server" Hidden="true" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDelete_Click">
</f:Button>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs
+21 -17
View File
@@ -40,7 +40,8 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
DropType.DataBind();
Funs.FineUIPleaseSelect(DropType);
btnAdd1.OnClientClick = Window1.GetShowReference("SetSubReviewEdit.aspx", "基本信息") + "return false;";
btnAdd2.OnClientClick = Window1.GetShowReference("SetSubReviewEdit2.aspx", "基本信息") + "return false;";
GetButtonPower();
BindGrid();
@@ -72,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>();
@@ -91,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));
}
@@ -383,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);
}
}
@@ -439,16 +443,17 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
btnNew.Hidden = false;
btnNew2.Hidden = false;
btnAdd1.Hidden = false;
btnAdd2.Hidden = false;
}
if (buttonList.Contains(Const.BtnModify))
{
//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)
@@ -648,6 +653,5 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
#endregion
}
}
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs
Generated
+22 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.PHTGL.BiddingManagement {
namespace FineUIPro.Web.PHTGL.BiddingManagement
{
public partial class SetSubReview {
public partial class SetSubReview
{
/// <summary>
/// form1 控件。
@@ -102,6 +104,24 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// </remarks>
protected global::FineUIPro.Button btnRset;
/// <summary>
/// btnAdd1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAdd1;
/// <summary>
/// btnAdd2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAdd2;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
+1 -2
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;
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
+2 -2
View File
@@ -25,7 +25,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtSetSubReviewCode" runat="server" Label="审批表编号" ShowRedStar="true" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="120px"></f:DropDownList>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" LabelWidth="120px" EnableEdit="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@@ -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>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs
+21 -10
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
}
}
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
+2 -2
View File
@@ -25,7 +25,7 @@
<f:FormRow>
<Items>
<f:TextBox ID="txtSetSubReviewCode" runat="server" Label="审批表编号" ShowRedStar="true" LabelAlign="Right" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" AutoPostBack="true" LabelWidth="120px"></f:DropDownList>
<f:DropDownList ID="DropBidCode" runat="server" Label="招标文件编号" LabelAlign="Right" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged" AutoPostBack="true" LabelWidth="120px" EnableEdit="true"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@@ -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>
SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs
+22 -12
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
}
SGGL/Model/Model.cs
+157 -133
View File
@@ -12037,7 +12037,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
@@ -154382,7 +154382,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
@@ -185341,7 +185341,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
@@ -185461,7 +185461,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
@@ -185521,7 +185521,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
@@ -185905,7 +185905,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
@@ -186210,16 +186210,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;
@@ -186248,6 +186238,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);
@@ -186256,16 +186256,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);
@@ -186294,6 +186284,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()
@@ -186341,106 +186341,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
{
@@ -186721,6 +186621,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;
@@ -187656,6 +187656,8 @@ namespace Model
private string _DepartId;
private string _BidDocumentsReviewId;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -187686,6 +187688,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()
@@ -187953,6 +187957,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;
@@ -301759,7 +301783,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
@@ -302336,7 +302360,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
@@ -302527,7 +302551,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
@@ -307838,7 +307862,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
@@ -309310,7 +309334,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
@@ -318861,7 +318885,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
@@ -318881,7 +318905,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