diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index 181fa974..e47c8d62 100644
Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ
diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
index 38269f8f..2bf4a7d0 100644
--- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
+++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json
@@ -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}"
diff --git a/DataBase/版本日志/SGGLDB_V2024-10-29.sql b/DataBase/版本日志/SGGLDB_V2024-10-29.sql
new file mode 100644
index 00000000..85c19cf9
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2024-10-29.sql
@@ -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
\ No newline at end of file
diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
index 540f3022..a15714f9 100644
--- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
+++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs
@@ -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)
{
diff --git a/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs b/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
index d54bc8a0..1dfb1ece 100644
--- a/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
+++ b/SGGL/BLL/PHTGL/BiddingManagement/BidDocumentsReviewService.cs
@@ -141,11 +141,11 @@ namespace BLL
///
///
///
- 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 GetCompleteBidDocument()
+ public static List 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;
}
diff --git a/SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs b/SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs
index eb6e6882..160f9e6c 100644
--- a/SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs
+++ b/SGGL/BLL/PHTGL/BiddingManagement/SetSubReviewService.cs
@@ -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)
diff --git a/SGGL/BLL/PHTGL/OAWebSevice.cs b/SGGL/BLL/PHTGL/OAWebSevice.cs
index 83ccfbc1..cf30dac1 100644
--- a/SGGL/BLL/PHTGL/OAWebSevice.cs
+++ b/SGGL/BLL/PHTGL/OAWebSevice.cs
@@ -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:
diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
index 6325554e..3d458ea2 100644
--- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
@@ -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);
}
diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
index bc3be275..c9115e33 100644
--- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
@@ -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);
}
}
diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
index 56bd6434..45510012 100644
--- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
+++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
index 272a4e17..f03b0c43 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
-
+
@@ -156,7 +156,7 @@ namespace FastReport
-
+
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
index 53ffaae9..9873fb20 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
}
-
+
@@ -163,7 +163,7 @@ namespace FastReport
-
+
diff --git a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）.docx b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）.docx
index ede0fd0c..da61ceec 100644
Binary files a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）.docx and b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）.docx differ
diff --git a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）LW.docx b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）LW.docx
index e1242809..711addfa 100644
Binary files a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）LW.docx and b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于经评审的最低投标报价法）LW.docx differ
diff --git a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）.docx b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）.docx
index dc9a91e6..3e9e5c2c 100644
Binary files a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）.docx and b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）.docx differ
diff --git a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）LW.docx b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）LW.docx
index 72289afb..9f74fd56 100644
Binary files a/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）LW.docx and b/SGGL/FineUIPro.Web/File/Word/PHTGL/确定分包商审批表（用于综合评估法）LW.docx differ
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
index 9e0a48bd..6c1e79d4 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
@@ -520,6 +520,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
硬度检测结果 = x.HardResult,
委托单编号 = x.TrustBatchCode,
检测单编号 = x.NDECode,
+ 探伤类型=x.DetectionTypeCode,
+ 探伤比例=x.DetectionRateCode
}).ToList();
MiniExcel.SaveAs(path, q);
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
index 15770274..1bae74d9 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
@@ -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() ;
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
index ae328f8d..80327dc5 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
@@ -61,6 +61,10 @@
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
index 08607442..425b1837 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
index 45711354..7c5e2a59 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
///
protected global::FineUIPro.DropDownList drpWeldingDailyCode;
+ ///
+ /// drpFlowingSection 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpFlowingSection;
+
///
/// ToolbarFill1 控件。
///
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index 63da02e0..3b06ecb5 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -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)
{
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
index cbcd8911..b506dbfc 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
@@ -12,7 +12,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class WeldingPlan : PageBase
{
-
+
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs
index fc9bc1ca..b369be43 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReview.aspx.cs
@@ -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))
{
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
index 8d3f8fd5..44f1eeb7 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
@@ -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);
}
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx
index c59c5ffa..6c8c0889 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx
@@ -25,7 +25,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs
index 45f54a4c..f94eb823 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/ApproveUserReviewEdit.aspx.cs
@@ -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)
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
index 4df03d02..2a9b63ef 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
@@ -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);
}
}
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx
index 95628894..1383b61b 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx
@@ -34,6 +34,12 @@
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs
index ff167745..feaed5a3 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.cs
@@ -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();
@@ -55,7 +56,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
///
private void BindGrid()
{
- string strSql = @" select Sub.SetSubReviewID
+ string strSql = @" select Sub.SetSubReviewID
,Sub.SetSubReviewCode
,Acp.ProjectShortName
,BidDoc.BidDocumentsCode
@@ -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 listStr = new List();
@@ -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)
@@ -647,7 +652,6 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
}
#endregion
-
-
+
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs
index 990dcede..5a9265a3 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReview.aspx.designer.cs
@@ -7,11 +7,13 @@
//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.PHTGL.BiddingManagement {
-
-
- public partial class SetSubReview {
-
+namespace FineUIPro.Web.PHTGL.BiddingManagement
+{
+
+
+ public partial class SetSubReview
+ {
+
///
/// form1 控件。
///
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// Panel1 控件。
///
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Panel Panel1;
-
+
///
/// Grid1 控件。
///
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Grid Grid1;
-
+
///
/// Toolbar2 控件。
///
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar2;
-
+
///
/// txtSetSubReviewCode 控件。
///
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtSetSubReviewCode;
-
+
///
/// DropType 控件。
///
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList DropType;
-
+
///
/// DropState 控件。
///
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList DropState;
-
+
///
/// btnSearch 控件。
///
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnSearch;
-
+
///
/// btnRset 控件。
///
@@ -101,7 +103,25 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnRset;
-
+
+ ///
+ /// btnAdd1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnAdd1;
+
+ ///
+ /// btnAdd2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnAdd2;
+
///
/// btnMenuDelete 控件。
///
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnMenuDelete;
-
+
///
/// Toolbar1 控件。
///
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
/// MenuButton1 控件。
///
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button MenuButton1;
-
+
///
/// btnPrinter 控件。
///
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnPrinter;
-
+
///
/// btnNew 控件。
///
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnNew;
-
+
///
/// btnNew2 控件。
///
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnNew2;
-
+
///
/// btnQueryApprove 控件。
///
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnQueryApprove;
-
+
///
/// lblPageIndex 控件。
///
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.WebControls.Label lblPageIndex;
-
+
///
/// ToolbarSeparator1 控件。
///
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-
+
///
/// ToolbarText1 控件。
///
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.ToolbarText ToolbarText1;
-
+
///
/// ddlPageSize 控件。
///
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList ddlPageSize;
-
+
///
/// Window1 控件。
///
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Window Window1;
-
+
///
/// Menu1 控件。
///
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
index 1bd7ac6a..6cb3db4d 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
index 997efb25..4449871f 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx
@@ -25,7 +25,7 @@
-
+
@@ -67,7 +67,7 @@
+ EnableColumnLines="true" DataIDField="ID" Height="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs
index 6bcdae70..4558339d 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit.aspx.cs
@@ -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,42 +269,49 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
SetSubReviewID = _SetSubReview.SetSubReviewID;
- if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
+
+ if (state== Const.ContractCreat_Complete)
{
- if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
- ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+
+ return false;
+ }
+ }
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
return false;
}
- }
- if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
- {
- ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
-
- return false;
- }
+ }
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
}
else
{
_SetSubReview.SetSubReviewID = SetSubReviewID;
- if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
+ if (state == Const.ContractCreat_Complete)
{
- if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
- ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+
+ return false;
+ }
+ }
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
return false;
}
}
- if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
- {
- ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
-
- return false;
- }
PHTGL_SetSubReviewService.UpdatePHTGL_SetSubReview(_SetSubReview);
}
@@ -385,11 +390,17 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
///
protected void btnAttachUrl_Click(object sender, EventArgs e)
{
- PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
+ 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)
{
- PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
+ 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
}
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
index 8fd81e98..e18260f7 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx
@@ -25,7 +25,7 @@
-
+
@@ -74,7 +74,7 @@
+ EnableColumnLines="true" DataIDField="ID" Height="300px" SortField="SortIndex" AllowPaging="true" PageSize="300" EnableBigDataRowTip="false" EnableBigData="true" IsDatabasePaging="false">
diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs
index 3b1a6698..6cf33002 100644
--- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs
+++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/SetSubReviewEdit2.aspx.cs
@@ -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,45 +262,51 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
{
_SetSubReview.SetSubReviewID = SQLHelper.GetNewID(typeof(Model.PHTGL_SetSubReview));
SetSubReviewID = _SetSubReview.SetSubReviewID;
- if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
+
+ if (state == Const.ContractCreat_Complete)
{
- if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
- ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+
+ return false;
+ }
+ }
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
return false;
}
}
- if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
- {
- ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
-
- return false;
- }
PHTGL_SetSubReviewService.AddPHTGL_SetSubReview(_SetSubReview);
}
else
{
_SetSubReview.SetSubReviewID = SetSubReviewID;
- if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
+ if (state == Const.ContractCreat_Complete)
{
- if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ if (CBIsOwenerApprove.SelectedValueArray[0] == "1")
{
- ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID, BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上传业主审批结果，无法保存！", MessageBoxIcon.Warning);
+
+ return false;
+ }
+ }
+ if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
+ {
+ ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
return false;
}
}
- if (!BLL.AttachFileService.Getfile(SetSubReviewID + "report", BLL.Const.SetSubReview))
- {
- ShowNotify("未上评标报告，无法保存！", MessageBoxIcon.Warning);
-
- return false;
- }
PHTGL_SetSubReviewService.UpdatePHTGL_SetSubReview(_SetSubReview);
}
-
BLL.PHTGL_SetSubReview_Sch1Service.DeletePHTGL_SetSubReview_Sch1BySetSubReviewID(SetSubReviewID);
JArray EditorArr = Grid1.GetMergedData();
if (EditorArr.Count > 0)
@@ -374,12 +379,17 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement
///
protected void btnAttachUrl_Click(object sender, EventArgs e)
{
- PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID, BLL.Const.SetSubReview)));
+ 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)
{
- PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/SetSubReviewAttachUrl&menuId={1}", this.SetSubReviewID + "report", BLL.Const.SetSubReview)));
+ 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
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index a92acacc..2bf0796a 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -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 WorkPackageEstimate
{
get
@@ -186210,16 +186210,6 @@ namespace Model
private string _ProjectId;
- private string _ContractId;
-
- private string _OrderCode;
-
- private System.Nullable _OrderInDate;
-
- private System.Nullable _OrderOutDate;
-
- private string _MaterialRequisitionUnit;
-
private System.Nullable _State;
private string _InvoiceCode;
@@ -186248,6 +186238,16 @@ namespace Model
private string _CreateUser;
+ private string _ContractId;
+
+ private System.Nullable _OrderInDate;
+
+ private string _OrderCode;
+
+ private System.Nullable _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 value);
- partial void OnOrderInDateChanged();
- partial void OnOrderOutDateChanging(System.Nullable value);
- partial void OnOrderOutDateChanged();
- partial void OnMaterialRequisitionUnitChanging(string value);
- partial void OnMaterialRequisitionUnitChanged();
partial void OnStateChanging(System.Nullable 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 value);
+ partial void OnOrderInDateChanged();
+ partial void OnOrderCodeChanging(string value);
+ partial void OnOrderCodeChanged();
+ partial void OnOrderOutDateChanging(System.Nullable 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 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 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 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 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 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