From bf856b7ab7d188620191caaf72f57db3b83c3913 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 27 Oct 2023 09:00:21 +0800 Subject: [PATCH] 2023-10-27 --- .../HJGL/WeldingManage/WeldJointService.cs | 12 ++++ .../PhtglContracttrackService .cs | 33 ++++++++- .../Excel/DataIn/合同执行跟踪导入模板.xlsx | Bin 11498 -> 11796 bytes .../HJGL/PreDesign/PipelingDivide.aspx | 2 +- SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx | 4 ++ SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs | 7 ++ .../HJGL/WPQ/WPQList.aspx.designer.cs | 63 ++++++++++-------- .../WeldingManage/SelectTaskWeldJoint.aspx | 5 ++ .../SelectTaskWeldJoint.aspx.designer.cs | 9 +++ .../ContractTrackComparison.aspx | 2 +- .../ContractTrackProgressDetectionGrid.aspx | 6 +- ...ContractTrackProgressDetectionGrid.aspx.cs | 42 ++++++++++++ 12 files changed, 155 insertions(+), 30 deletions(-) diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 10038a26..cfd95d31 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -506,5 +506,17 @@ namespace BLL } return Convert.ToDouble(size) * n; } + + public static string GetWPQCodeByWeldJointId(object WeldJointId) + { + string result = ""; + if (WeldJointId != null) + { + var model = GetViewWeldJointById(WeldJointId.ToString()); + result = model?.WPQCode; + } + + return result; + } } } diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs index f377bf23..6e94061e 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; using EmitMapper; +using EmitMapper.MappingConfiguration; using FineUIPro; using MiniExcelLibs; using MiniExcelLibs.Attributes; @@ -322,6 +323,7 @@ namespace BLL var mapper = ObjectMapperManager.DefaultInstance.GetMapper, List>(); var modeList = mapper.Map(rows); + if (modeList.Count == 0) { responeData.code = 0; @@ -1265,7 +1267,7 @@ namespace BLL } public class PHTGL_ContractTrackDtoIn - { + { /// /// 序号 /// @@ -1338,5 +1340,34 @@ namespace BLL /// 备注 /// [ExcelColumnIndex("R")] public string Remarks { get; set; } + /// + /// 施工分包商 + /// + [ExcelColumnIndex("S")] public string ConstructionSubcontractor { get; set; } + /// + /// 主材供应方 + /// + [ExcelColumnIndex("T")] public string MaterialSupplier { get; set; } + /// + /// 是否总包合同范围内 + /// + [ExcelColumnIndex("U")] + public string IsWithinGeneralContractScope { get; set; } + /// + /// 概算工程量 + /// + [ExcelColumnIndex("V")] public string EstimatedQuantity { get; set; } + /// + /// 概算金额 + /// + [ExcelColumnIndex("W")] public decimal EstimatedAmount { get; set; } + /// + /// 预算工程量 + /// + [ExcelColumnIndex("X")] public string SettledQuantity { get; set; } + /// + /// 预算金额 + /// + [ExcelColumnIndex("Y")] public decimal SettledAmount { get; set; } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx index 43003440105ba9dc908ba515558ce1deae206eac..22236e62a34d48d04bff8480e96133b64e8db83d 100644 GIT binary patch delta 4477 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 delta 4199 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 F{sXIG#~1(r diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx index eb2631ee..5292f6b1 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx @@ -60,7 +60,7 @@ - + diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx index d8098147..662e10a2 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx @@ -24,6 +24,10 @@ + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs index 421a7e01..e12eded6 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.cs @@ -21,6 +21,7 @@ namespace FineUIPro.Web.HJGL.WPQ if (!IsPostBack) { ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true); // 绑定表格 BindGrid(); } @@ -39,6 +40,12 @@ namespace FineUIPro.Web.HJGL.WPQ strSql += " AND WPQCode LIKE @WPQCode"; listStr.Add(new SqlParameter("@WPQCode", "%" + this.txtWeldingProcedureCode.Text.Trim() + "%")); } + + if (drpUnit.SelectedValue!=Const._Null) + { + strSql += " AND UnitId =@UnitId"; + listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs index 80df370b..d71ea2fb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WPQ { - - - public partial class WPQList { - +namespace FineUIPro.Web.HJGL.WPQ +{ + + + public partial class WPQList + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtWeldingProcedureCode 控件。 /// @@ -65,7 +67,16 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldingProcedureCode; - + + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + /// /// ToolbarFill1 控件。 /// @@ -74,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnNew 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnImport 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + /// /// btnExport 控件。 /// @@ -101,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnExport; - + /// /// lblNumber 控件。 /// @@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lblNumber; - + /// /// Label1 控件。 /// @@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + /// /// Label41 控件。 /// @@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label41; - + /// /// ToolbarSeparator1 控件。 /// @@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// Menu1 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnMenuView 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WPQ { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuView; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index d15d72fb..e357bfc3 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -132,6 +132,11 @@ + + + + +