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

2022-09-08 合同基本修改，焊接数据分析修改

Browse Source
This commit is contained in:
李鹏飞
2022-09-08 20:14:51 +08:00
parent e0f256688a
commit 6881455e9d
22 changed files with 2744 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei) 修改明细.txt
+6
View File
@@ -0,0 +1,6 @@
--ADD BY lipengfei 2022-09-08
1,合同基本信息字段添加
2,焊接一次合格率查询修改
3,焊接缺陷分析查询修改
4，合同mobile针对人员修改
--END
DataBase/版本日志/SGGLDB_V2022-09-08(lipengfei).sql
BIN
View File
Binary file not shown.
SGGL/BLL/PHTGL/ContractCompile/ContractService.cs
+67 -38
View File
@@ -71,44 +71,60 @@ namespace BLL
/// 增加合同基本信息
/// </summary>
/// <param name="contract"></param>
public static void AddContract(Model.PHTGL_Contract contract)
public static void AddContract(Model.PHTGL_Contract newtable)
{
Model.PHTGL_Contract newContract = new Model.PHTGL_Contract();
newContract.ContractId = contract.ContractId;
newContract.ContractCode = contract.ContractCode;
newContract.ProjectId = contract.ProjectId;
newContract.ContractName = contract.ContractName;
newContract.ContractNum = contract.ContractNum;
newContract.Parties = contract.Parties;
newContract.Currency = contract.Currency;
newContract.ContractAmount = contract.ContractAmount;
newContract.DepartId = contract.DepartId;
newContract.Agent = contract.Agent;
newContract.ContractType = contract.ContractType;
newContract.Remarks = contract.Remarks;
newContract.ApproveState = contract.ApproveState;
newContract.CreatUser = contract.CreatUser;
newContract.IsPassBid = contract.IsPassBid;
newContract.PassBidCode = contract.PassBidCode;
newContract.BuildUnit = contract.BuildUnit;
newContract.EPCCode = contract.EPCCode;
newContract.IsUseStandardtxt = contract.IsUseStandardtxt;
newContract.NoUseStandardtxtRemark = contract.NoUseStandardtxtRemark;
newContract.ProjectShortName = contract.ProjectShortName;
newContract.ContractAttribute = contract.ContractAttribute;
newContract.ContractAttributeRemark = contract.ContractAttributeRemark;
newContract.ConfirmWay = contract.ConfirmWay;
newContract.SetSubReviewCode = contract.SetSubReviewCode;
newContract.ActionPlanCode = contract.ActionPlanCode;
newContract.SituationRemark = contract.SituationRemark;
newContract.OpeningBank_TT = contract.OpeningBank_TT;
newContract.OpeningBank_Electrophore = contract.OpeningBank_Electrophore;
newContract.BankAccount_TT = contract.BankAccount_TT;
newContract.BankAccount_Electrophore = contract.BankAccount_Electrophore;
newContract.LineNumber_Electrophore = contract.LineNumber_Electrophore;
newContract.Retentionmoney = contract.Retentionmoney;
newContract.CreateDate = contract.CreateDate;
Funs.DB.PHTGL_Contract.InsertOnSubmit(newContract);
Model.PHTGL_Contract table = new Model.PHTGL_Contract
{
ContractId = newtable.ContractId,
ProjectId = newtable.ProjectId,
ContractName = newtable.ContractName,
ContractNum = newtable.ContractNum,
Parties = newtable.Parties,
Currency = newtable.Currency,
ContractAmount = newtable.ContractAmount,
DepartId = newtable.DepartId,
Agent = newtable.Agent,
ContractType = newtable.ContractType,
Remarks = newtable.Remarks,
ApproveState = newtable.ApproveState,
CreatUser = newtable.CreatUser,
ContractCode = newtable.ContractCode,
IsPassBid = newtable.IsPassBid,
PassBidCode = newtable.PassBidCode,
BuildUnit = newtable.BuildUnit,
IsUseStandardtxt = newtable.IsUseStandardtxt,
NoUseStandardtxtRemark = newtable.NoUseStandardtxtRemark,
EPCCode = newtable.EPCCode,
ProjectShortName = newtable.ProjectShortName,
ContractAttribute = newtable.ContractAttribute,
ContractAttributeRemark = newtable.ContractAttributeRemark,
ConfirmWay = newtable.ConfirmWay,
SetSubReviewCode = newtable.SetSubReviewCode,
ActionPlanCode = newtable.ActionPlanCode,
SituationRemark = newtable.SituationRemark,
OpeningBank_TT = newtable.OpeningBank_TT,
OpeningBank_Electrophore = newtable.OpeningBank_Electrophore,
BankAccount_TT = newtable.BankAccount_TT,
BankAccount_Electrophore = newtable.BankAccount_Electrophore,
LineNumber_Electrophore = newtable.LineNumber_Electrophore,
Retentionmoney = newtable.Retentionmoney,
CreateDate = newtable.CreateDate,
Status = newtable.Status,
ContactPersonOfPartyA = newtable.ContactPersonOfPartyA,
ContactPersonOfPartyB = newtable.ContactPersonOfPartyB,
ContactPersonPhoneOfPartyB = newtable.ContactPersonPhoneOfPartyB,
ContactPersonEmailOfPartyB = newtable.ContactPersonEmailOfPartyB,
ContractAmountExcludingTax = newtable.ContractAmountExcludingTax,
PriceMethod = newtable.PriceMethod,
SignedOnDate = newtable.SignedOnDate,
ContractStartDate = newtable.ContractStartDate,
ContractEndDate = newtable.ContractEndDate,
PricingBasis = newtable.PricingBasis,
SubcontractingMethod = newtable.SubcontractingMethod,
IsItACentralizedPurchaseSupplier = newtable.IsItACentralizedPurchaseSupplier,
ContactUnitOfPartyA = newtable.ContactUnitOfPartyA,
};
Funs.DB.PHTGL_Contract.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
}
@@ -155,7 +171,20 @@ namespace BLL
newContract.LineNumber_Electrophore = contract.LineNumber_Electrophore;
newContract.Retentionmoney = contract.Retentionmoney;
newContract.CreateDate = contract.CreateDate;
newContract.Status = contract.Status;
newContract.ContactPersonOfPartyA = contract.ContactPersonOfPartyA;
newContract.ContactPersonOfPartyB = contract.ContactPersonOfPartyB;
newContract.ContactPersonPhoneOfPartyB = contract.ContactPersonPhoneOfPartyB;
newContract.ContactPersonEmailOfPartyB = contract.ContactPersonEmailOfPartyB;
newContract.ContractAmountExcludingTax = contract.ContractAmountExcludingTax;
newContract.PriceMethod = contract.PriceMethod;
newContract.SignedOnDate = contract.SignedOnDate;
newContract.ContractStartDate = contract.ContractStartDate;
newContract.ContractEndDate = contract.ContractEndDate;
newContract.PricingBasis = contract.PricingBasis;
newContract.SubcontractingMethod = contract.SubcontractingMethod;
newContract.IsItACentralizedPurchaseSupplier = contract.IsItACentralizedPurchaseSupplier;
newContract.ContactUnitOfPartyA = contract.ContactUnitOfPartyA;
Funs.DB.SubmitChanges();
}
}
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs
+10 -10
View File
@@ -59,16 +59,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["ApproveManModels"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -86,23 +86,23 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
ApproveManModels = PHTGL_ActionPlanReviewService.GetApproveManModels(_ActionPlanFormation.ProjectID, ActionPlanReviewId);
EndApproveType = ApproveManModels.Count;
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, PersonId);
this.txtProjectCode.Text = _ActionPlanFormation.EPCCode;
this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName;
this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_ActionPlanFormation.CreatUser);
if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, UserId))
if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_ActionPlanFormation.CreatUser == UserId)
else if (_ActionPlanFormation.CreatUser == PersonId)
{
BindGrid();
}
@@ -125,7 +125,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -133,7 +133,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", ActionPlanReviewId));
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs
+11 -11
View File
@@ -60,16 +60,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["pHTGL_Approve"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -86,24 +86,24 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
EndApproveType = ApproveManModels.Count;
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, PersonId);
//文本框赋值
txtBidProject.Text = _Bid.BidProject;
txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID).ProjectShortName;
txtBidDocumentsCode.Text = BidDoc.BidDocumentsCode; ;
this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser);
if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, UserId))
if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_Bid.CreateUser == UserId)
else if (_Bid.CreateUser == PersonId)
{
BindGrid();
}
@@ -119,7 +119,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -127,7 +127,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", ApproveUserReviewID));
@@ -148,7 +148,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
,APP.ApproveUserUnit
,APP.Remarks"
+ @" FROM PHTGL_BidApproveUserReview_Sch1 AS APP "
+ @" LEFT JOIN Sys_User AS U ON U.UserId =APP.ApproveUserName "
+ @" LEFT JOIN SitePerson_Person AS U ON U.PersonId =APP.ApproveUserName "
+ @"where 1=1 AND ApproveUserReviewID = @ApproveUserReviewID ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (string.IsNullOrEmpty(ApproveUserReviewID))
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs
+10 -10
View File
@@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["pHTGL_Approve"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -106,22 +106,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
ApproveManModels = PHTGL_BidDocumentsReviewService.GetApproveManModels(_Bid.ProjectId, _Bid.BidDocumentsReviewId);
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, PersonId);
this.txtProjectCode.Text = _ActionPlanFormation.EPCCode;
this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName;
this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser);
if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, UserId))
if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_Bid.CreateUser == UserId)
else if (_Bid.CreateUser == PersonId)
{
BindGrid();
}
@@ -146,7 +146,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -154,7 +154,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", BidDocumentsReviewId));
SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs
+10 -10
View File
@@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Session["pHTGL_Approve"] = value;
}
}
public string UserId
public string PersonId
{
get
{
UserId = Request.Params["UserId"];
return (string)ViewState["UserId"];
PersonId = Request.Params["PersonId"];
return (string)ViewState["PersonId"];
}
set
{
ViewState["UserId"] = value;
ViewState["PersonId"] = value;
}
}
#endregion
@@ -97,22 +97,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
Dic_ApproveMan = PHTGL_SetSubReviewService.Get_DicApproveman(SetSubReviewID);
ApproveManModels = PHTGL_SetSubReviewService.GetApproveManModels(SetSubReviewID);
//获取当前登录人审批信息
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, UserId);
pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, PersonId);
//数据加载
Bind();
var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID);
if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, UserId))
if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, PersonId))
{
BindGrid();
}
else if (UserId == Const.sysglyId || UserId == Const.hfnbdId)
else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId)
{
BindGrid();
}
else if (_SetSubReview.CreateUser == UserId)
else if (_SetSubReview.CreateUser == PersonId)
{
BindGrid();
}
@@ -236,7 +236,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
/// </summary>
private void BindGrid()
{
string strSql = @" select u.UserName as ApproveMan,
string strSql = @" select u.PersonName as ApproveMan,
App.ApproveDate,
(CASE App.IsAgree WHEN '1' THEN '不同意'
WHEN '2' THEN '同意' END) AS IsAgree,
@@ -244,7 +244,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement
App.ApproveId,
App.ApproveType
from PHTGL_Approve as App"
+ @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
+ @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ContractId", SetSubReviewID));
SGGL/FineUIPro.Web/ErrLog.txt
+114
View File
@@ -0,0 +1,114 @@
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:56:26
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:56:26
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:57:31
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:57:31
错误信息开始=====>
错误类型:SqlException
错误信息:列名 'Sex' 无效。
列名 'IsUsed' 无效。
错误堆栈:
在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
在 System.Data.SqlClient.SqlDataReader.get_MetaData()
在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90
在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137
在 FineUIPro.Button.OnClick(EventArgs e)
在 (Button , EventArgs )
在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
出错时间:09/08/2022 19:57:53
出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx
IP地址:::1
操作人员:JT
出错时间:09/08/2022 19:57:53
SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx
+46
View File
@@ -21,6 +21,51 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="单位名称"
LabelAlign="Right" Width="240px" LabelWidth="80px" >
</f:DropDownList>
<f:DropDownList ID="drpUnitWorkId" Label="单位工程" AutoPostBack="true"
runat="server" Required="true" Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtMaterialCode" runat="server" Label="材质类别"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSingleName" runat="server" Label="口径"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtThickness" runat="server" Label="壁厚"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSpecification" runat="server" Label="规格"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtWeldTypeCode" runat="server" Label="焊缝类型"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtPersonName" runat="server" Label="焊工名称"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
runat="server" Required="true" LabelWidth="80px"
Width="240px" LabelAlign="Right">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
@@ -32,6 +77,7 @@
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField HeaderText="单位工程" ColumnID="UnitWorkName" DataField="UnitWorkName"
SortField="UnitWorkName" FieldType="String" HeaderTextAlign="Center" Width="100px">
SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs
+97
View File
@@ -15,13 +15,110 @@ namespace FineUIPro.Web.HJGL.WeldingReport
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpJointAttribute.DataTextField = "Text";
this.drpJointAttribute.DataValueField = "Value";
this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
this.drpJointAttribute.DataBind();
Funs.FineUIPleaseSelect(drpJointAttribute);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
}
}
private void BindGrid()
{
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
listStr.Add(new SqlParameter("@unitcode", this.drpUnitId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@unitcode", null));
}
if (drpUnitWorkId.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@UnitWork", null));
}
if (!string.IsNullOrEmpty(this.txtMaterialCode.Text))
{
listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@MaterialCode", null));
}
if (!string.IsNullOrEmpty(this.txtSingleName.Text))
{
listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@SingleName ", null));
}
if (!string.IsNullOrEmpty(this.txtThickness.Text))
{
listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Thickness", null));
}
if (!string.IsNullOrEmpty(this.txtSpecification.Text))
{
listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Specification", null));
}
if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text))
{
listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@WeldTypeCode", null));
}
if (drpJointAttribute.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@JointAttribute", null));
}
if (!string.IsNullOrEmpty(this.txtPersonName.Text))
{
listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@PersonName", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_CheckDefects", parameter);
SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs
Generated
+103 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class DefectStatistics {
public partial class DefectStatistics
{
/// <summary>
/// form1 控件。
@@ -57,6 +59,105 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpUnitId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpUnitWorkId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtMaterialCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
/// <summary>
/// txtSingleName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSingleName;
/// <summary>
/// txtThickness 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtThickness;
/// <summary>
/// txtSpecification 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecification;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtWeldTypeCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldTypeCode;
/// <summary>
/// txtPersonName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx
+48 -6
View File
@@ -23,19 +23,62 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpUnitId" runat="server" Label="单位名称"
LabelAlign="Right" Width="280px" >
LabelAlign="Right" Width="240px" LabelWidth="80px" >
</f:DropDownList>
<f:DropDownList ID="drpUnitWorkId" Label="单位工程" AutoPostBack="true"
runat="server" Required="true" Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList>
<f:DropDownList ID="drpDetectionType" runat="server" Label="探伤类型"
LabelAlign="Right" Width="280px" >
LabelAlign="Right" Width="240px" LabelWidth="80px">
</f:DropDownList>
<f:DatePicker runat="server" Label="日期" ID="txtStarTime" LabelAlign="Right"
LabelWidth="100px" Width="220px">
Width="180px" LabelWidth="80px">
</f:DatePicker>
<f:Label ID="Label1" runat="server" Text="至">
</f:Label>
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" LabelWidth="80px"
Width="110px">
<f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="180px" LabelWidth="80px">
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtMaterialCode" runat="server" Label="材质类别"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSingleName" runat="server" Label="口径"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtThickness" runat="server" Label="壁厚"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtSpecification" runat="server" Label="规格"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtWeldTypeCode" runat="server" Label="焊缝类型"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:TextBox ID="txtPersonName" runat="server" Label="焊工名称"
EmptyText="输入查询条件" AutoPostBack="true"
Width="240px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" AutoPostBack="true"
runat="server" Required="true" LabelWidth="80px"
Width="240px" LabelAlign="Right">
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
@@ -46,7 +89,6 @@
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs
+85
View File
@@ -15,7 +15,13 @@ namespace FineUIPro.Web.HJGL.WeldingReport
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.drpJointAttribute.DataTextField = "Text";
this.drpJointAttribute.DataValueField = "Value";
this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
this.drpJointAttribute.DataBind();
Funs.FineUIPleaseSelect(drpJointAttribute);
BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true);
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);
BLL.Base_DetectionTypeService.InitDetectionTypeDropDownList(drpDetectionType, true, string.Empty);
@@ -64,6 +70,85 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
listStr.Add(new SqlParameter("@date2", null));
}
if (drpUnitWorkId.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@UnitWork", null));
}
if (!string.IsNullOrEmpty(this.txtMaterialCode.Text))
{
listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@MaterialCode", null));
}
if (!string.IsNullOrEmpty(this.txtSingleName.Text))
{
listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@SingleName ", null));
}
if (!string.IsNullOrEmpty(this.txtThickness.Text))
{
listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Thickness", null));
}
if (!string.IsNullOrEmpty(this.txtSpecification.Text))
{
listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@Specification", null));
}
if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text))
{
listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@WeldTypeCode", null));
}
if (drpJointAttribute.SelectedValue != Const._Null)
{
listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
}
else
{
listStr.Add(new SqlParameter("@JointAttribute", null));
}
if (!string.IsNullOrEmpty(this.txtPersonName.Text))
{
listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%"));
}
else
{
listStr.Add(new SqlParameter("@PersonName", null));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WelderFirstPassRate", parameter);
SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs
Generated
+94 -2
View File
@@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingReport {
namespace FineUIPro.Web.HJGL.WeldingReport
{
public partial class FirstPassRate {
public partial class FirstPassRate
{
/// <summary>
/// form1 控件。
@@ -66,6 +68,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitId;
/// <summary>
/// drpUnitWorkId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnitWorkId;
/// <summary>
/// drpDetectionType 控件。
/// </summary>
@@ -102,6 +113,87 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtMaterialCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMaterialCode;
/// <summary>
/// txtSingleName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSingleName;
/// <summary>
/// txtThickness 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtThickness;
/// <summary>
/// txtSpecification 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecification;
/// <summary>
/// Toolbar3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// txtWeldTypeCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldTypeCode;
/// <summary>
/// txtPersonName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPersonName;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx
+67 -7
View File
@@ -54,6 +54,22 @@
<f:ListItem Text="主合同" Value="0" />
<f:ListItem Text="补充合同" Value="1" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" ID="DropStatus" Label="合同状态" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="已签订" Value="0" />
<f:ListItem Text="已完毕" Value="1" />
</f:DropDownList>
<f:DatePicker runat="server" ID="txtSignedOnDate" Label="签订日期" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" ID="txtContractStartDate" Label="合同起始日期" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:DatePicker>
<f:DatePicker runat="server" ID="txtContractEndDate" Label="合同终止日期" LabelAlign="Right" MaxLength="200" LabelWidth="140px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
@@ -69,7 +85,10 @@
<f:FormRow>
<Items>
<f:DropDownList ID="DropConfirmWay" runat="server" Label="确认方式" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" OnSelectedIndexChanged="DropConfirmWay_SelectedIndexChanged" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
<f:Label runat="server"></f:Label>
<f:DropDownList runat="server" ID="dropSubcontractingMethod" Label="分包模式" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="内部分包" Value="1" />
<f:ListItem Text="外部分包" Value="2" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
@@ -94,6 +113,7 @@
<f:DropDownList ID="DropMainContractCode" runat="server" Label="主合同编号" Hidden="true" AutoPostBack="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="tab1_txtEPCCode" runat="server" Label="总承包合同编号" ShowRedStar="true" Required="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:TextBox>
@@ -106,13 +126,29 @@
<f:TextBox ID="tab1_txtContractNum" runat="server" Label="合同编号" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="30" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 30% 20%">
<f:FormRow>
<Items>
<f:TextBox ID="tab1_txtParties" runat="server" Label="签约方" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:DropDownList ID="drpCurrency" runat="server" Label="（预计）合同金额" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:NumberBox ID="tab1_txtContractAmount" runat="server" LabelAlign="Right" ShowRedStar="true" Required="true" NoNegative="true"></f:NumberBox>
<f:DropDownList ID="drpContractType" runat="server" Label="合同类型" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox ID="tab1_BuildUnit" runat="server" Label="建设单位" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 50%">
<Items>
<f:TextBox ID="txtPriceMethod" runat="server" Label="计价方式" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtPricingBasis" runat="server" Label="计价依据" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 50%">
<Items>
<f:DropDownList ID="drpCurrency" runat="server" Label="（预计）合同金额" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:NumberBox ID="tab1_txtContractAmount" runat="server" LabelAlign="Right" ShowRedStar="true" Required="true" NoNegative="true"></f:NumberBox>
<f:NumberBox ID="txtContractAmountExcludingTax" runat="server" Label="合同不含税金额" LabelWidth="140px" LabelAlign="Right" ShowRedStar="true" Required="true" NoNegative="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpDepartId" runat="server" Label="主办部门" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
@@ -121,8 +157,32 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpContractType" runat="server" Label="合同类型" ShowRedStar="true" Required="true" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<f:TextBox ID="tab1_BuildUnit" runat="server" Label="建设单位" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtContactUnitOfPartyA" runat="server" Label="甲方联系单位" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtContactPersonOfPartyA" runat="server" Label="甲方联系人" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="tab1_txtParties" runat="server" Label="签约方" ShowRedStar="true" Required="true" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:DropDownList runat="server" ID="dropIsItACentralizedPurchaseSupplier" Label="乙方是否为集采供应商" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
<f:ListItem Text="否" Value="0" />
<f:ListItem Text="是" Value="1" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtContactPersonOfPartyB" runat="server" Label="乙方联系人" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtContactPersonPhoneOfPartyB" runat="server" Label="乙方联系人电话" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
<f:TextBox ID="txtContactPersonEmailOfPartyB" runat="server" Label="乙方联系人邮箱" LabelAlign="Right" MaxLength="100" LabelWidth="140px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs
+40
View File
@@ -205,6 +205,31 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
txtBankAccount_Electrophore.Text = contract.BankAccount_Electrophore;
txtLineNumber_Electrophore.Text = contract.LineNumber_Electrophore;
txtRetentionmoney.Text = contract.Retentionmoney;
txtContactUnitOfPartyA.Text = contract.ContactUnitOfPartyA;
txtContactPersonOfPartyA.Text = contract.ContactPersonOfPartyA;
txtContactPersonOfPartyB.Text = contract.ContactPersonOfPartyB;
txtContactPersonPhoneOfPartyB.Text = contract.ContactPersonPhoneOfPartyB;
txtContactPersonEmailOfPartyB.Text = contract.ContactPersonEmailOfPartyB;
txtContractAmountExcludingTax.Text = contract.ContractAmountExcludingTax.ToString();
txtPriceMethod.Text = contract.PriceMethod;
txtSignedOnDate.SelectedDate = contract.SignedOnDate;
txtContractStartDate.SelectedDate = contract.ContractStartDate;
txtContractEndDate.SelectedDate = contract.ContractEndDate;
txtPricingBasis.Text = contract.PricingBasis;
if (contract.Status != null)
{
DropStatus.SelectedValue = contract.Status.ToString();
}
if (!string.IsNullOrEmpty(contract.SubcontractingMethod))
{
dropSubcontractingMethod.SelectedValue = contract.SubcontractingMethod;
}
if (contract.IsItACentralizedPurchaseSupplier != null)
{
dropIsItACentralizedPurchaseSupplier.SelectedValue = contract.IsItACentralizedPurchaseSupplier.ToString();
}
if (!string.IsNullOrEmpty(contract.Currency))
{
this.drpCurrency.SelectedValue = contract.Currency;
@@ -480,6 +505,21 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
newContract.BankAccount_Electrophore = this.txtBankAccount_Electrophore.Text;
newContract.LineNumber_Electrophore = this.txtLineNumber_Electrophore.Text;
newContract.Retentionmoney = this.txtRetentionmoney.Text;
newContract.ContactUnitOfPartyA = txtContactUnitOfPartyA.Text;
newContract.ContactPersonOfPartyA = txtContactPersonOfPartyA.Text;
newContract.ContactPersonOfPartyB = txtContactPersonOfPartyB.Text;
newContract.ContactPersonPhoneOfPartyB = txtContactPersonPhoneOfPartyB.Text;
newContract.ContactPersonEmailOfPartyB = txtContactPersonEmailOfPartyB.Text;
newContract.ContractAmountExcludingTax = Funs.GetNewDecimal(txtContractAmountExcludingTax.Text.Trim());
newContract.PriceMethod = txtPriceMethod.Text;
newContract.SignedOnDate = txtSignedOnDate.SelectedDate;
newContract.ContractStartDate = txtContractStartDate.SelectedDate;
newContract.ContractEndDate = txtContractEndDate.SelectedDate;
newContract.PricingBasis = txtPricingBasis.Text;
newContract.Status = Funs.GetNewInt(DropStatus.SelectedValue);
newContract.SubcontractingMethod = dropSubcontractingMethod.SelectedValue;
newContract.IsItACentralizedPurchaseSupplier = Funs.GetNewInt(dropIsItACentralizedPurchaseSupplier.SelectedValue);
if (this.drpCurrency.SelectedValue != BLL.Const._Null)
{
newContract.Currency = this.drpCurrency.SelectedValue;
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs
Generated
+132 -6
View File
@@ -113,6 +113,42 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.DropDownList DropContractAttribute;
/// <summary>
/// DropStatus 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropStatus;
/// <summary>
/// txtSignedOnDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSignedOnDate;
/// <summary>
/// txtContractStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtContractStartDate;
/// <summary>
/// txtContractEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtContractEndDate;
/// <summary>
/// DropConfirmWay 控件。
/// </summary>
@@ -122,6 +158,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.DropDownList DropConfirmWay;
/// <summary>
/// dropSubcontractingMethod 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dropSubcontractingMethod;
/// <summary>
/// IsUseStandardtxt 控件。
/// </summary>
@@ -195,13 +240,40 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
protected global::FineUIPro.TextBox tab1_txtContractNum;
/// <summary>
/// tab1_txtParties 控件。
/// drpContractType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_txtParties;
protected global::FineUIPro.DropDownList drpContractType;
/// <summary>
/// tab1_BuildUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_BuildUnit;
/// <summary>
/// txtPriceMethod 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPriceMethod;
/// <summary>
/// txtPricingBasis 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPricingBasis;
/// <summary>
/// drpCurrency 控件。
@@ -221,6 +293,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.NumberBox tab1_txtContractAmount;
/// <summary>
/// txtContractAmountExcludingTax 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtContractAmountExcludingTax;
/// <summary>
/// drpDepartId 控件。
/// </summary>
@@ -240,22 +321,67 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
protected global::FineUIPro.DropDownList drpAgent;
/// <summary>
/// drpContractType 控件。
/// txtContactUnitOfPartyA 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpContractType;
protected global::FineUIPro.TextBox txtContactUnitOfPartyA;
/// <summary>
/// tab1_BuildUnit 控件。
/// txtContactPersonOfPartyA 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_BuildUnit;
protected global::FineUIPro.TextBox txtContactPersonOfPartyA;
/// <summary>
/// tab1_txtParties 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox tab1_txtParties;
/// <summary>
/// dropIsItACentralizedPurchaseSupplier 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dropIsItACentralizedPurchaseSupplier;
/// <summary>
/// txtContactPersonOfPartyB 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContactPersonOfPartyB;
/// <summary>
/// txtContactPersonPhoneOfPartyB 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContactPersonPhoneOfPartyB;
/// <summary>
/// txtContactPersonEmailOfPartyB 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtContactPersonEmailOfPartyB;
/// <summary>
/// txtOpeningBank_TT 控件。
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx
+42 -1
View File
@@ -95,7 +95,48 @@
<f:RenderField ColumnID="Account1" DataField="Account1" Width="150px" FieldType="String" HeaderText="开户行账号" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Status" DataField="Status" Width="150px" FieldType="String" HeaderText="合同状态" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactUnitOfPartyA" DataField="ContactUnitOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系单位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyA" DataField="ContactPersonOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyB" DataField="ContactPersonOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonPhoneOfPartyB" DataField="ContactPersonPhoneOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人电话" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonEmailOfPartyB" DataField="ContactPersonEmailOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人邮箱" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractAmountExcludingTax" DataField="ContractAmountExcludingTax" Width="150px" FieldType="String" HeaderText="合同不含税金额" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PriceMethod" DataField="PriceMethod" Width="150px" FieldType="String" HeaderText="计价方式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SignedOnDate" DataField="SignedOnDate" Width="150px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractStartDate" DataField="ContractStartDate" Width="150px" FieldType="String" HeaderText="合同起始日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractEndDate" DataField="ContractEndDate" Width="150px" FieldType="String" HeaderText="合同终止日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PricingBasis" DataField="PricingBasis" Width="150px" FieldType="String" HeaderText="计价依据" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubcontractingMethod" DataField="SubcontractingMethod" Width="150px" FieldType="String" HeaderText="分包模式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsItACentralizedPurchaseSupplier" DataField="IsItACentralizedPurchaseSupplier" Width="150px" FieldType="String" HeaderText="乙方是否为集采供应商/分包商" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<%-- <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs
+17
View File
@@ -72,6 +72,23 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
Con.EPCCode,
con.ProjectShortName,
(convert(varchar(20), Sub.SignedYear) + '年' + convert(varchar(20), Sub.SignedMonth) + '月') as DepartName,
(CASE Con.Status WHEN '0' THEN '已签订'
WHEN '1' THEN '已完毕' END) as Status,
Con.ContactUnitOfPartyA,
Con.ContactPersonOfPartyA,
Con.ContactPersonOfPartyB,
Con.ContactPersonPhoneOfPartyB,
Con.ContactPersonEmailOfPartyB,
Con.ContractAmountExcludingTax,
Con.PriceMethod,
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
Con.PricingBasis,
(CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
WHEN '2' THEN '外部分包' END ) as SubcontractingMethod,
(CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
Sub.Bank1,
Sub.SubcontractPriceForm,
Sub.Account1"
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx
+42
View File
@@ -94,6 +94,48 @@
<f:RenderField ColumnID="LineNumber_Electrophore" DataField="LineNumber_Electrophore" Width="150px" FieldType="String" HeaderText="行号-电承" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="Status" DataField="Status" Width="150px" FieldType="String" HeaderText="合同状态" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactUnitOfPartyA" DataField="ContactUnitOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系单位" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyA" DataField="ContactPersonOfPartyA" Width="150px" FieldType="String" HeaderText="甲方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonOfPartyB" DataField="ContactPersonOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonPhoneOfPartyB" DataField="ContactPersonPhoneOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人电话" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContactPersonEmailOfPartyB" DataField="ContactPersonEmailOfPartyB" Width="150px" FieldType="String" HeaderText="乙方联系人邮箱" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractAmountExcludingTax" DataField="ContractAmountExcludingTax" Width="150px" FieldType="String" HeaderText="合同不含税金额" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PriceMethod" DataField="PriceMethod" Width="150px" FieldType="String" HeaderText="计价方式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SignedOnDate" DataField="SignedOnDate" Width="150px" FieldType="String" HeaderText="签订日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractStartDate" DataField="ContractStartDate" Width="150px" FieldType="String" HeaderText="合同起始日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="ContractEndDate" DataField="ContractEndDate" Width="150px" FieldType="String" HeaderText="合同终止日期" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="PricingBasis" DataField="PricingBasis" Width="150px" FieldType="String" HeaderText="计价依据" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="SubcontractingMethod" DataField="SubcontractingMethod" Width="150px" FieldType="String" HeaderText="分包模式" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField ColumnID="IsItACentralizedPurchaseSupplier" DataField="IsItACentralizedPurchaseSupplier" Width="150px" FieldType="String" HeaderText="乙方是否为集采供应商/分包商" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:LinkButtonField HeaderText="附件" ColumnID="download" Width="60px" Icon="ArrowDown" CommandName="download" />
SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs
+17
View File
@@ -59,6 +59,23 @@ namespace FineUIPro.Web.PHTGL.Filing
Con.[BankAccount-electrophore] as BankAccount_electrophore,
Con.[LineNumber-electrophore] as LineNumber_electrophore,
Con.Retentionmoney,
(CASE Con.Status WHEN '0' THEN '已签订'
WHEN '1' THEN '已完毕' END) as Status,
Con.ContactUnitOfPartyA,
Con.ContactPersonOfPartyA,
Con.ContactPersonOfPartyB,
Con.ContactPersonPhoneOfPartyB,
Con.ContactPersonEmailOfPartyB,
Con.ContractAmountExcludingTax,
Con.PriceMethod,
CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate,
CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate,
CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate,
Con.PricingBasis,
(CASE Con.SubcontractingMethod WHEN '1' then '内部分包'
WHEN '2' THEN '外部分包' END ) as SubcontractingMethod,
(CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否'
WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier,
Pro.ProjectCode,
Pro.ProjectName,
Dep.DepartName,
SGGL/Model/Model.cs
+1593 -63
View File
File diff suppressed because it is too large Load Diff