diff --git a/.gitignore b/.gitignore index 6116d731..590b4793 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ SGGL/.svn /SGGL/FineUIPro.Web/FileUpload/ /DataBase/版本日志/SGGLDB_V2023-07-28.sql /SGGL/BLLTests +/SGGL/FineUIPro.Web/ErrLog.txt diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 8a1ade31..1261326e 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_V2023-09-27.sql b/DataBase/版本日志/SGGLDB_V2023-09-27.sql new file mode 100644 index 00000000..deda119e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-27.sql @@ -0,0 +1,7 @@ +alter table dbo.PHTGL_Quantity + add SerialNumber nvarchar(50) +go + +exec sp_addextendedproperty 'MS_Description', N'', 'SCHEMA', 'dbo', 'TABLE', 'PHTGL_Quantity', 'COLUMN', + 'SerialNumber' +go diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index a6ea15ee..cf58f845 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1396,6 +1396,8 @@ namespace BLL client.Timeout = -1; var request = new RestRequest(Method.GET); request.AddHeader("token", Token); + request.AddHeader("ClientId", SysConstSetService.ClientId); + request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1)); IRestResponse response = client.Execute(request); Console.WriteLine(response.Content); return response.Content; @@ -1409,7 +1411,7 @@ namespace BLL var request = new RestRequest(Method.POST); request.AddHeader("token", Token); request.AddHeader("ClientId", SysConstSetService.ClientId); - request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal)+1)); + request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1)); if (!string.IsNullOrEmpty(JsonBody)) { request.AddJsonBody(JsonBody); diff --git a/SGGL/BLL/DigData/HTGLDataDWService.cs b/SGGL/BLL/DigData/HTGLDataDWService.cs index 9d980c22..592f7e2a 100644 --- a/SGGL/BLL/DigData/HTGLDataDWService.cs +++ b/SGGL/BLL/DigData/HTGLDataDWService.cs @@ -36,7 +36,7 @@ namespace BLL /// /// /// - public static IEnumerable getDataDWList( string projectId, DateTime? startTime, DateTime? endTime, Grid Grid1) + public static IEnumerable getDataDWList( string projectId, Grid Grid1) { var getDataList = from x in Funs.DB.Base_Project select x; if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null) @@ -56,10 +56,29 @@ namespace BLL x.ProjectId, x.ProjectName, x.ProjectCode, - Count1=0, + Count1= getTotalProfit(x.ProjectId), }; } #endregion + public static string getTotalProfit(string projectId) + { + decimal contractAmount = 0; + var getContract = Funs.DB.PHTGL_Contract.Where(x => x.ProjectId == projectId); + if (getContract.Count() > 0) + { + contractAmount = getContract.Sum(x => x.ContractAmount ?? 0); + } + + decimal estimatedAmount = 0; + var getContractTrack = Funs.DB.PHTGL_ContractTrack.Where(x => x.ProjectId == projectId); + if (getContractTrack.Count() > 0) + { + estimatedAmount = getContractTrack.Sum(x => x.EstimatedAmount ?? 0); + } + + return estimatedAmount > 0 ? Math.Round(contractAmount / estimatedAmount).ToString() + "%" : "0%"; + + } } } \ No newline at end of file diff --git a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs index 20b0e391..0172d0a1 100644 --- a/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs +++ b/SGGL/BLL/HJGL/PreDesign/PackagingManageService .cs @@ -105,7 +105,10 @@ namespace BLL public static Model.HJGL_PackagingManage GetHJGL_PackagingManageById(string PackagingManageId) { - return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId); + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + return db.HJGL_PackagingManage.FirstOrDefault(x => x.PackagingManageId == PackagingManageId); + } } public static string GetMinPlanStartDate(string PackagingManageId) { diff --git a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs index 1ca3d30d..0e6a5cd1 100644 --- a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs +++ b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs @@ -38,7 +38,8 @@ namespace BLL WorkContent = newtable.WorkContent, Remarks = newtable.Remarks, IsTemplate = newtable.IsTemplate, - ParentId = newtable.ParentId + ParentId = newtable.ParentId, + SerialNumber = newtable.SerialNumber }; Funs.DB.PHTGL_Quantity.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -68,7 +69,8 @@ namespace BLL WorkContent = newtable.WorkContent, Remarks = newtable.Remarks, IsTemplate = false, - ParentId = parentId + ParentId = parentId, + SerialNumber = newtable.SerialNumber }; Funs.DB.PHTGL_Quantity.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -96,6 +98,7 @@ namespace BLL table.Remarks = newtable.Remarks; table.IsTemplate = newtable.IsTemplate; table.ParentId = newtable.ParentId; + table.SerialNumber = newtable.SerialNumber; Funs.DB.SubmitChanges(); } } @@ -278,34 +281,37 @@ namespace BLL public static List GetPHTGL_QuantityByModle(PHTGL_Quantity table) { var q = from x in Funs.DB.PHTGL_Quantity - where - (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && - (string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) && - (string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) && - (string.IsNullOrEmpty(table.SubItemProject) || - x.SubItemProject.Contains(table.SubItemProject)) && - (string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) && - (string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) && - (string.IsNullOrEmpty(table.ProjectDescription) || - x.ProjectDescription.Contains(table.ProjectDescription)) && - (string.IsNullOrEmpty(table.UnitOfMeasurement) || - x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) && - (string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) && - (string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) || - x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) && - (string.IsNullOrEmpty(table.MainMaterialCost) || - x.MainMaterialCost.Contains(table.MainMaterialCost)) && - (string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) && - (string.IsNullOrEmpty(table.CalculationRule) || - x.CalculationRule.Contains(table.CalculationRule)) && - (string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) && - (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) && - x.IsTemplate == table.IsTemplate && - (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId)) - select x - ; + where + (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && + (string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) && + (string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) && + (string.IsNullOrEmpty(table.SubItemProject) || + x.SubItemProject.Contains(table.SubItemProject)) && + (string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) && + (string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) && + (string.IsNullOrEmpty(table.ProjectDescription) || + x.ProjectDescription.Contains(table.ProjectDescription)) && + (string.IsNullOrEmpty(table.UnitOfMeasurement) || + x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) && + (string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) && + (string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) || + x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) && + (string.IsNullOrEmpty(table.MainMaterialCost) || + x.MainMaterialCost.Contains(table.MainMaterialCost)) && + (string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) && + (string.IsNullOrEmpty(table.CalculationRule) || + x.CalculationRule.Contains(table.CalculationRule)) && + (string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) && + (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) && + x.IsTemplate == table.IsTemplate && + (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId)) + + select new { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", "")) + } - return q.ToList(); + ; + var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx => itemx.x).ToList(); + return model; } /// 获取分页列表 @@ -324,6 +330,7 @@ namespace BLL select new { x.Id, + x.SerialNumber, x.Major, x.SubProject, x.SubItemProject, @@ -348,7 +355,7 @@ namespace BLL public class PHTGL_QuantityDtoIn { - [ExcelColumnIndex("A")] public string Major { get; set; } + [ExcelColumnIndex("A")] public string SerialNumber { get; set; } [ExcelColumnIndex("B")] public string SubProject { get; set; } [ExcelColumnIndex("C")] public string SubItemProject { get; set; } diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx index ef607b73..b74cfbd3 100644 --- a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx +++ b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx @@ -20,12 +20,12 @@ OnSelectedIndexChanged="btSearch_Click" Width="500px" EmptyText="请选择项目" EnableEdit="true"> - + --%> @@ -54,7 +54,7 @@ FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderText="项目总体毛利" HeaderTextAlign="Center" TextAlign="Right"> diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs index 75c79984..4120f1f9 100644 --- a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs +++ b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.cs @@ -33,8 +33,7 @@ namespace FineUIPro.Web.DigData /// private void BindGrid() { - var getData = HTGLDataDWService.getDataDWList( this.drpProject.SelectedValue, - Funs.GetNewDateTime(this.txtStartTime.Text), Funs.GetNewDateTime(this.txtEndTime.Text),this.Grid1); + var getData = HTGLDataDWService.getDataDWList( this.drpProject.SelectedValue,this.Grid1); Grid1.RecordCount = HTGLDataDWService.count; Grid1.DataSource = getData; Grid1.DataBind(); diff --git a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs index 83094669..5e45f235 100644 --- a/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DigData/HTGLDataDW.aspx.designer.cs @@ -59,24 +59,6 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.DropDownList drpProject; - /// - /// txtStartTime 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtStartTime; - - /// - /// txtEndTime 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtEndTime; - /// /// ToolbarFill2 控件。 /// diff --git a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx index 24f0e66e..688aac3c 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx +++ b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx @@ -110,17 +110,17 @@ - + - + - - - +<%-- + --%> + - + - + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs index 76ab76ec..762f7fde 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs +++ b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.cs @@ -116,6 +116,26 @@ namespace FineUIPro.Web.DigData if (item == "HTGL") { this.gpHTGL.Hidden = false; + decimal contractAmount = 0; + var getContract = Funs.DB.PHTGL_Contract.Where(x => x.ProjectId == this.ProjectId); + if (getContract.Count() > 0) + { + contractAmount = getContract.Sum(x => x.ContractAmount ?? 0); + } + this.lbContractAmount.Text = contractAmount.ToString(); + + decimal estimatedAmount = 0; + var getContractTrack = Funs.DB.PHTGL_ContractTrack.Where(x => x.ProjectId == this.ProjectId); + if (getContractTrack.Count() > 0) + { + estimatedAmount = getContractTrack.Sum(x => x.EstimatedAmount ?? 0); + + } + this.lbEstimatedAmount.Text= estimatedAmount.ToString(); + + this.lbTotalProfit.Text = estimatedAmount > 0 ? Math.Round(contractAmount / estimatedAmount ).ToString() + "%" : "0%"; + + } if (item == "LW") { diff --git a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs index e6515584..ff9e9930 100644 --- a/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/DigData/ProjectDataDW.aspx.designer.cs @@ -240,40 +240,31 @@ namespace FineUIPro.Web.DigData protected global::FineUIPro.Form Form4; /// - /// Label4 控件。 + /// lbContractAmount 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label4; + protected global::FineUIPro.Label lbContractAmount; /// - /// Label1 控件。 + /// lbEstimatedAmount 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label1; + protected global::FineUIPro.Label lbEstimatedAmount; /// - /// Label11 控件。 + /// lbTotalProfit 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label11; - - /// - /// Label6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label6; + protected global::FineUIPro.Label lbTotalProfit; /// /// Label12 控件。 @@ -347,6 +338,24 @@ namespace FineUIPro.Web.DigData /// protected global::FineUIPro.Label Label19; + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// labNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label labNumber; + /// /// gpLW 控件。 /// diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt deleted file mode 100644 index 91eccac6..00000000 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ /dev/null @@ -1,284 +0,0 @@ - -错误信息开始=====> -错误类型:ArgumentNullException -错误信息:值不能为 null。 -参数名: text -错误堆栈: - 在 System.Data.Linq.SqlClient.SqlHelpers.GetStringContainsPattern(String text, Char escape, Boolean& usedEscapeChar) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.TranslateStringMethod(SqlMethodCall mc) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitMethodCall(SqlMethodCall mc) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitBinaryOperator(SqlBinary bo) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitBinaryOperator(SqlBinary bo) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitAlias(SqlAlias a) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSource(SqlSource source) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitAlias(SqlAlias a) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSource(SqlSource source) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Convert(SqlNode node, SqlFactory sql, ProviderMode providerMode) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(ResultShape resultShape, Type resultType, SqlNode node, ReadOnlyCollection`1 parentParameters, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 BLL.WBSAnalysisService.getWBSExpertArgumentCount(String projectId, String workPackageId) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\DigData\WBSAnalysisService.cs:行号 117 - 在 lambda_method(Closure , WBS_WorkPackage ) - 在 System.Linq.Enumerable.WhereSelectEnumerableIterator`2.MoveNext() - 在 (IEnumerator ) - 在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean ) - 在 (Grid , IEnumerable , Boolean ) - 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) - 在 (Grid , Boolean ) - 在 FineUIPro.Grid.DataBind() - 在 FineUIPro.Web.DigData.ProjectWBSAnalysis.BindGrid() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\ProjectWBSAnalysis.aspx.cs:行号 58 - 在 FineUIPro.Web.DigData.ProjectWBSAnalysis.changeTree(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\ProjectWBSAnalysis.aspx.cs:行号 46 - 在 FineUIPro.Web.Controls.ProjectWBSControl.trWBS_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Controls\ProjectWBSControl.ascx.cs:行号 78 - 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) - 在 (Tree , TreeCommandEventArgs ) - 在 FineUIPro.Tree.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/25/2023 09:52:02 -出错文件:http://localhost:2325/DigData/ProjectWBSAnalysis.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/25/2023 09:52:02 - - -错误信息开始=====> -错误类型:IOException -错误信息:句柄无效。 - -错误堆栈: - 在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) - 在 System.IO.__Error.WinIOError() - 在 System.Threading.EventWaitHandle.Set() - 在 System.Net.TimerThread.Prod() - 在 System.Net.TimerThread.TimerQueue.CreateTimer(Callback callback, Object context) - 在 System.Net.HttpWebRequest.SubmitRequest(ServicePoint servicePoint) - 在 System.Net.HttpWebRequest.GetRequestStream(TransportContext& context) - 在 System.Net.HttpWebRequest.GetRequestStream() - 在 Microsoft.WebTools.BrowserLink.Runtime.Tracing.DataDispatchExecutionListener.Initialize(HttpWebRequest request) - 在 Microsoft.WebTools.BrowserLink.Runtime.Tracing.PageInspectorHttpModule.OnPreRequestHandlerExecute(Object sender, EventArgs e) - 在 System.Web.HttpApplication.SyncEventExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:09/25/2023 09:53:44 -出错文件:http://localhost:2325/indexProject.aspx?projectId=7b691ed0-6bad-468f-9e54-f0f5ba4df21f -IP地址:::1 -操作人员:JT - -出错时间:09/25/2023 09:53:45 - - -错误信息开始=====> -错误类型:ArgumentNullException -错误信息:值不能为 null。 -参数名: text -错误堆栈: - 在 System.Data.Linq.SqlClient.SqlHelpers.GetStringContainsPattern(String text, Char escape, Boolean& usedEscapeChar) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.TranslateStringMethod(SqlMethodCall mc) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitMethodCall(SqlMethodCall mc) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitBinaryOperator(SqlBinary bo) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitBinaryOperator(SqlBinary bo) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitAlias(SqlAlias a) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSource(SqlSource source) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitAlias(SqlAlias a) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSource(SqlSource source) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Convert(SqlNode node, SqlFactory sql, ProviderMode providerMode) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(ResultShape resultShape, Type resultType, SqlNode node, ReadOnlyCollection`1 parentParameters, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 BLL.WBSAnalysisService.getWBSExpertArgumentCount(String projectId, String workPackageId) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\DigData\WBSAnalysisService.cs:行号 114 - 在 lambda_method(Closure , WBS_WorkPackage ) - 在 System.Linq.Enumerable.WhereSelectEnumerableIterator`2.MoveNext() - 在 (IEnumerator ) - 在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean ) - 在 (Grid , IEnumerable , Boolean ) - 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) - 在 (Grid , Boolean ) - 在 FineUIPro.Grid.DataBind() - 在 FineUIPro.Web.DigData.ProjectWBSAnalysis.BindGrid() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\ProjectWBSAnalysis.aspx.cs:行号 58 - 在 FineUIPro.Web.DigData.ProjectWBSAnalysis.changeTree(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\ProjectWBSAnalysis.aspx.cs:行号 46 - 在 FineUIPro.Web.Controls.ProjectWBSControl.trWBS_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Controls\ProjectWBSControl.ascx.cs:行号 78 - 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) - 在 (Tree , TreeCommandEventArgs ) - 在 FineUIPro.Tree.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/25/2023 09:57:30 -出错文件:http://localhost:2325/DigData/ProjectWBSAnalysis.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/25/2023 09:57:30 - - -错误信息开始=====> -错误类型:ArgumentNullException -错误信息:值不能为 null。 -参数名: text -错误堆栈: - 在 System.Data.Linq.SqlClient.SqlHelpers.GetStringContainsPattern(String text, Char escape, Boolean& usedEscapeChar) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.TranslateStringMethod(SqlMethodCall mc) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitMethodCall(SqlMethodCall mc) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitBinaryOperator(SqlBinary bo) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitBinaryOperator(SqlBinary bo) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitExpression(SqlExpression exp) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitAlias(SqlAlias a) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSource(SqlSource source) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitAlias(SqlAlias a) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSource(SqlSource source) - 在 System.Data.Linq.SqlClient.SqlVisitor.VisitSelectCore(SqlSelect select) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Visitor.VisitSelect(SqlSelect select) - 在 System.Data.Linq.SqlClient.SqlVisitor.Visit(SqlNode node) - 在 System.Data.Linq.SqlClient.PostBindDotNetConverter.Convert(SqlNode node, SqlFactory sql, ProviderMode providerMode) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(ResultShape resultShape, Type resultType, SqlNode node, ReadOnlyCollection`1 parentParameters, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.BuildQuery(Expression query, SqlNodeAnnotations annotations) - 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) - 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 BLL.WBSAnalysisService.getWBSExpertArgumentCount(String projectId, String workPackageId) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\BLL\DigData\WBSAnalysisService.cs:行号 114 - 在 lambda_method(Closure , WBS_WorkPackage ) - 在 System.Linq.Enumerable.WhereSelectEnumerableIterator`2.MoveNext() - 在 (IEnumerator ) - 在 FineUIPro.Grid.CRTRkdQFrrBRFQuCddjZPswlTORP(IEnumerable , Boolean ) - 在 (Grid , IEnumerable , Boolean ) - 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) - 在 (Grid , Boolean ) - 在 FineUIPro.Grid.DataBind() - 在 FineUIPro.Web.DigData.ProjectWBSAnalysis.BindGrid() 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\ProjectWBSAnalysis.aspx.cs:行号 58 - 在 FineUIPro.Web.DigData.ProjectWBSAnalysis.changeTree(Object sender, EventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\DigData\ProjectWBSAnalysis.aspx.cs:行号 46 - 在 FineUIPro.Web.Controls.ProjectWBSControl.trWBS_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 E:\SEDIN\SGGL_SeDin_New\SGGL\FineUIPro.Web\Controls\ProjectWBSControl.ascx.cs:行号 78 - 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) - 在 (Tree , TreeCommandEventArgs ) - 在 FineUIPro.Tree.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/25/2023 10:02:17 -出错文件:http://localhost:2325/DigData/ProjectWBSAnalysis.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/25/2023 10:02:17 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 (TreeNode ) - 在 FineUIPro.TreeCommandEventArgs..ctor(TreeNode node, String commandName, String commandArgument) - 在 (TreeNode , String , String ) - 在 FineUIPro.Tree.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/25/2023 10:05:00 -出错文件:http://localhost:2325/DigData/ProjectWBSAnalysis.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/25/2023 10:05:00 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 (TreeNode ) - 在 FineUIPro.TreeCommandEventArgs..ctor(TreeNode node, String commandName, String commandArgument) - 在 (TreeNode , String , String ) - 在 FineUIPro.Tree.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/25/2023 10:05:02 -出错文件:http://localhost:2325/DigData/ProjectWBSAnalysis.aspx -IP地址:::1 -操作人员:JT - -出错时间:09/25/2023 10:05:02 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.indexProject.MenuSwitchMethod(String type) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 595 - 在 FineUIPro.Web.indexProject.btnPHTGL_Click(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 697 - 在 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/26/2023 16:04:25 -出错文件:http://localhost:2325/indexProject.aspx?projectId=7b691ed0-6bad-468f-9e54-f0f5ba4df21f -IP地址:::1 - -出错时间:09/26/2023 16:04:25 - - -错误信息开始=====> -错误类型:InvalidCastException -错误信息:无法将类型为“FineUIPro.RenderField”的对象强制转换为类型“FineUIPro.GroupField”。 -错误堆栈: - 在 FineUIPro.Web.PZHGL.InformationProject.ConstructionLogWorkEfficiency.Page_Load(Object sender, EventArgs e) 位置 E:\工作\赛鼎施工平台\SGGL_SeDin(New)\SGGL_SeDin_New\SGGL\FineUIPro.Web\PZHGL\InformationProject\ConstructionLogWorkEfficiency.aspx.cs:行号 141 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.EventHandler.Invoke(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnLoad(EventArgs e) - 在 System.Web.UI.Control.LoadRecursive() - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:09/28/2023 09:26:08 -出错文件:http://localhost:2325/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx?ConstructionLogId=09043ee7-93ec-4705-93bb-d49b44148d3c&contractNo=03348581-d016-4ee8-b5a7-d61ace761c3c,23a86756-402f-4c77-a452-b36231bb7b4f&professional=0,1&WorkPostId=41EF8B02-2852-495E-A2BE-2EF19BA70A4F,2E71A650-6D40-459A-AAC1-5FB5E00D247C,558124BF-B678-48EB-B7DB-22211951747B&MachineId=0cefba88-c16a-4508-a642-1ffb079dbf58,5d6ccd22-5072-4bbd-847e-e1b7c06adc3b,f29fa0ad-b834-4198-a543-8e3deef0d340 -IP地址:::1 -操作人员:JT - -出错时间:09/28/2023 09:26:08 - diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index 1b52865d..3ac2eeed 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -62,7 +62,7 @@ - + + + @@ -185,6 +189,10 @@ EnableMaximize="true" Target="Top" EnableResize="false" runat="server" IsModal="true" Width="1200px" Height="620px" OnClose="Window1_Close"> + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs index 399944b1..e0c37828 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using FineUIPro.Web.HSSE.Meeting; using System; using System.Collections.Generic; using System.Linq; @@ -22,7 +23,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage ViewState["PipelineId"] = value; } } - + public string WeldJointId + { + get + { + return (string)ViewState["WeldJointId"]; + } + set + { + ViewState["WeldJointId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) { @@ -52,7 +64,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.drpDetectionTypeId.DataTextField = "DetectionTypeCode"; //Funs.FineUIPleaseSelect(this.drpDetectionTypeId); string flag = Request.Params["flag"]; - string weldJointId = Request.Params["WeldJointId"]; + WeldJointId = Request.Params["WeldJointId"]; string isTwoJoint = Request.Params["IsTwoJoint"]; @@ -66,9 +78,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage GroupPanel2.Hidden = true; IsReadOnly(false); } - if (!string.IsNullOrEmpty(weldJointId)) + if (!string.IsNullOrEmpty(WeldJointId)) { - Model.HJGL_WeldJoint joint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId); + Model.HJGL_WeldJoint joint = BLL.WeldJointService.GetWeldJointByWeldJointId(WeldJointId); Model.WPQ_WPQList list = BLL.WPQListServiceService.GetWPQById(joint.WPQId); this.txtWpqId.Text = joint.WPQId; @@ -82,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } if (Request.Params["Type"] == "add") //插入焊口 { - var baseWeldJoints = BLL.WeldJointService.GetBaseWeldJointsByWeldJointId(weldJointId); + var baseWeldJoints = BLL.WeldJointService.GetBaseWeldJointsByWeldJointId(WeldJointId); this.txtWeldJointCode.Text = joint.WeldJointCode + "Z-" + (baseWeldJoints.Count + 1).ToString(); } else @@ -287,7 +299,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage weldJointCode = this.txtWeldJointCode.Text; } - if (BLL.WeldJointService.IsExistWeldJointCode(weldJointCode, this.PipelineId, Request.Params["WeldJointId"])) + if (BLL.WeldJointService.IsExistWeldJointCode(weldJointCode, this.PipelineId, WeldJointId)) { Alert.ShowInTop("该管线焊口已存在！", MessageBoxIcon.Warning); return; @@ -318,7 +330,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage return; } Model.HJGL_WeldJoint joint = new Model.HJGL_WeldJoint(); - string weldJointId = Request.Params["WeldJointId"]; + string weldJointId = WeldJointId; joint.PipelineId = this.PipelineId; joint.PipelineCode = txtPipelineCode.Text.Trim(); joint.ProjectId = this.CurrUser.LoginProjectId; @@ -435,6 +447,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage string newId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldJoint)); joint.WeldJointId = newId; joint.BaseWeldJointId = weldJointId; + WeldJointId = joint.WeldJointId; BLL.WeldJointService.AddWeldJoint(joint); } } @@ -442,6 +455,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { string newId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldJoint)); joint.WeldJointId = newId; + WeldJointId = joint.WeldJointId; if (Request.Params["IsTwoJoint"] == "1") { joint.IsTwoJoint = true; @@ -854,5 +868,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage // } // } //} + + protected void btnAttachUrl_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.WeldJointId)) + { + SaveData(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldJoint&menuId={1}", WeldJointId, BLL.Const.HJGL_WeldJointMenuId))); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs index f09a67cb..fb4c5f4b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs @@ -50,6 +50,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// btnAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl; + /// /// btnSave 控件。 /// @@ -382,5 +391,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; } } diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/Expense.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/Expense.aspx.cs index 41ac41aa..95ea6f0d 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/Expense.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/Expense.aspx.cs @@ -182,6 +182,7 @@ namespace FineUIPro.Web.HSSE.CostGoods orderby y.Year, x.SupSortIndex, x.SortIndex select new { x.ExpenseDetailId, x.ExpenseId, y.Year, x.SupCostTypeId, x.SupCostTypeName, x.SupSortIndex, x.CostType, x.CostTypeName, x.SortIndex, x.CostMoney }; var getType = (from x in getDetail select new { x.SupSortIndex, x.SortIndex, x.CostType }).Distinct(); + int j = 1; foreach (var item in getType) { var getD = getDetail.FirstOrDefault(x => x.CostType == item.CostType); @@ -208,8 +209,30 @@ namespace FineUIPro.Web.HSSE.CostGoods } row[r] = getDetail.Where(x => x.CostType == item.CostType).Sum(x => x.CostMoney ?? 0); table.Rows.Add(row); + j = r + 1; } } + + DataRow rowSum = table.NewRow(); + rowSum[0] = SQLHelper.GetNewID(); + rowSum[1] = ""; + rowSum[2] = "合计"; + int rSum = 3; + for (int i = 0; sDate + i <= eDate; i++) + { + var getV = getDetail.Where(x => x.Year == sDate + i ); + if (getV.Count() > 0) + { + rowSum[rSum] = getV.Sum(x => x.CostMoney ?? 0); + } + else + { + rowSum[rSum] = 0.00; + } + + rSum = rSum + 1; + } + table.Rows.Add(rowSum); } diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx index 3d6a3813..a09ceb99 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx @@ -34,7 +34,7 @@ @@ -66,7 +66,9 @@ - + + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index e4022022..d2e9000f 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -11730,7 +11730,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 @@ -151181,7 +151181,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 @@ -182652,7 +182652,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 @@ -183121,6 +183121,8 @@ namespace Model private string _ParentId; + private string _SerialNumber; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -183159,6 +183161,8 @@ namespace Model partial void OnIsTemplateChanged(); partial void OnParentIdChanging(string value); partial void OnParentIdChanged(); + partial void OnSerialNumberChanging(string value); + partial void OnSerialNumberChanged(); #endregion public PHTGL_Quantity() @@ -183506,6 +183510,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SerialNumber", DbType="NVarChar(50)")] + public string SerialNumber + { + get + { + return this._SerialNumber; + } + set + { + if ((this._SerialNumber != value)) + { + this.OnSerialNumberChanging(value); + this.SendPropertyChanging(); + this._SerialNumber = value; + this.SendPropertyChanged("SerialNumber"); + this.OnSerialNumberChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -292386,7 +292410,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")] public string Name { get