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

2023-10-24

Browse Source
This commit is contained in:
李鹏飞
2023-10-24 17:25:06 +08:00
parent e0162f248b
commit 4157358c68
12 changed files with 162 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
+34 -16
View File
@@ -62,10 +62,11 @@ namespace BLL
x.SettledQuantity.Contains(table.SettledQuantity)) &&
(string.IsNullOrEmpty(table.ContractId) ||
x.ContractId.Contains(table.ContractId))
select x
;
return q.ToList();
var model = q.ToList().OrderBy(x => x.SerialNumber, new CustomComparer()).ToList();
return model;
}
/// <summary>
@@ -156,6 +157,7 @@ namespace BLL
SettledAmount = newtable.SettledAmount,
ContractId = newtable.ContractId,
ProjectId = newtable.ProjectId,
SerialNumber = newtable.SerialNumber
};
Funs.DB.PHTGL_ContractTrack.InsertOnSubmit(table);
Funs.DB.SubmitChanges();
@@ -198,20 +200,23 @@ namespace BLL
table.SettledAmount = newtable.SettledAmount;
table.ContractId = newtable.ContractId;
table.ProjectId = newtable.ProjectId;
table.SerialNumber=newtable.SerialNumber;
Funs.DB.SubmitChanges();
}
}
public static void DeletePHTGL_ContractTrackById(string id)
{
PhtglContracttrackprogressService.DeleteModleByContractTrackId(id);
PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id);
ConstructionLogWorkEfficiencyService.DeleteConstructionLogWorkEfficiencysByContractTrackId(id);
var table = Funs.DB.PHTGL_ContractTrack.FirstOrDefault(x => x.Id == id);
if (table != null)
{
Funs.DB.PHTGL_ContractTrack.DeleteOnSubmit(table);
Funs.DB.SubmitChanges();
}
PhtglContracttrackprogressService.DeleteModleByContractTrackId(id);
PhtglContracttrackmatchwbsService.DeleteModelByContractTrackId(id);
}
/// <summary>
@@ -293,13 +298,14 @@ namespace BLL
{
item.ContractId = contractid;
item.ProjectId = projectid;
if (string.IsNullOrEmpty(item.ProjectCode)) continue;
var phtglContractTrack = new PHTGL_ContractTrack
{
MainItemCode=item.MainItemCode,
ProjectCode = item.ProjectCode,
ContractId = contractid,
ProjectId = projectid,
};
if (string.IsNullOrEmpty(item.ProjectCode)) continue;
var resultModel = GetPHTGL_ContractTrackByModle(phtglContractTrack);
item.ContractNum = ContractService.GetContractById(contractid)?.ContractNum;
if (!string .IsNullOrEmpty(item.ProjectCode)&& !item.ProjectCode.Contains("-"))
@@ -969,6 +975,10 @@ namespace BLL
}
public class PHTGL_ContractTrackDtoIn
{
/// <summary>
/// 序号
/// </summary>
[ExcelColumnIndex("A")] public string SerialNumber { get; set; }
/// <summary>
/// 主项号
/// </summary>
@@ -986,48 +996,56 @@ namespace BLL
/// </summary>
[ExcelColumnIndex("E")] public string MajorName { get; set; }
/// <summary>
/// 分部工程
/// </summary>
[ExcelColumnIndex("F")] public string SubProject { get; set; }
/// <summary>
/// 分项工程
/// </summary>
[ExcelColumnIndex("G")] public string SubItemProject { get; set; }
/// <summary>
/// 项目编码
/// </summary>
[ExcelColumnIndex("F")] public string ProjectCode { get; set; }
[ExcelColumnIndex("H")] public string ProjectCode { get; set; }
/// <summary>
/// 项目名称
/// </summary>
[ExcelColumnIndex("G")] public string ProjectName { get; set; }
[ExcelColumnIndex("I")] public string ProjectName { get; set; }
/// <summary>
/// 项目特征描述
/// </summary>
[ExcelColumnIndex("H")] public string ProjectDescription { get; set; }
[ExcelColumnIndex("J")] public string ProjectDescription { get; set; }
/// <summary>
/// 计量单位
/// </summary>
[ExcelColumnIndex("I")] public string UnitOfMeasurement { get; set; }
[ExcelColumnIndex("K")] public string UnitOfMeasurement { get; set; }
/// <summary>
/// 工程量
/// </summary>
[ExcelColumnIndex("J")] public string Quantity { get; set; }
[ExcelColumnIndex("L")] public string Quantity { get; set; }
/// <summary>
/// 全费用固定综合单价
/// </summary>
[ExcelColumnIndex("K")] public string TotalCostFixedComprehensiveUnitPrice { get; set; }
[ExcelColumnIndex("M")] public string TotalCostFixedComprehensiveUnitPrice { get; set; }
/// <summary>
/// 其中：主材费
/// </summary>
[ExcelColumnIndex("L")] public string MainMaterialCost { get; set; }
[ExcelColumnIndex("N")] public string MainMaterialCost { get; set; }
/// <summary>
/// 合价/元
/// </summary>
[ExcelColumnIndex("M")] public string TotalPrice { get; set; }
[ExcelColumnIndex("O")] public string TotalPrice { get; set; }
/// <summary>
/// 计算规则
/// </summary>
[ExcelColumnIndex("N")] public string CalculationRule { get; set; }
[ExcelColumnIndex("P")] public string CalculationRule { get; set; }
/// <summary>
/// 工作内容
/// </summary>
[ExcelColumnIndex("O")] public string WorkContent { get; set; }
[ExcelColumnIndex("Q")] public string WorkContent { get; set; }
/// <summary>
/// 备注
/// </summary>
[ExcelColumnIndex("P")] public string Remarks { get; set; }
[ExcelColumnIndex("R")] public string Remarks { get; set; }
}
}
SGGL/BLL/PZHGL/InformationProject/ConstructionLogWorkEfficiencyService.cs
+14 -1
View File
@@ -55,7 +55,20 @@ namespace BLL
db.SubmitChanges();
}
}
/// <summary>
/// 根据合同价格清单id删除所有施工日志功效明细
/// </summary>
/// <param name="ContractTrackId"></param>
public static void DeleteConstructionLogWorkEfficiencysByContractTrackId(string ContractTrackId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in db.ZHGL_ConstructionLogWorkEfficiency where x.ContractTrackId == ContractTrackId select x).ToList();
if (q.Count() > 0)
{
db.ZHGL_ConstructionLogWorkEfficiency.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
}
/// <summary>
/// 根据月报id获取对应的所有施工日志工效明细
/// </summary>
SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx
+6 -15
View File
@@ -19,8 +19,8 @@
<Items>
<f:DropDownList ID="DropContractCode" runat="server" Label="施工分包合同编号" ShowRedStar="True" Required="True" AutoSelectFirstItem="false" LabelAlign="Right" LabelWidth="140px"></f:DropDownList>
<%-- <f:TextBox ID="txtContractNum" runat="server" Label="施工分包合同编号" MaxLength="200">
</f:TextBox>--%>
<f:TextBox ID="txtSerialNumber" runat="server" Label="序号" MaxLength="200">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
@@ -46,21 +46,12 @@
</f:FormRow>
<f:FormRow>
<Items>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" Hidden="True">
<f:TextBox ID="txtSubProject" runat="server" Label="分部工程" MaxLength="200" >
</f:TextBox>
<f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" >
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtSubItemProject" runat="server" Label="分项工程" MaxLength="200" Hidden="True">
</f:TextBox>
</Items>
</f:FormRow>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectCode" runat="server" Label="项目编码" MaxLength="200">
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.cs
+2
View File
@@ -46,6 +46,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
DropContractCode.SelectedValue = ContractService.GetContractById(model.ContractId).ContractNum;
txtSerialNumber.Text = model.SerialNumber;
txtMainItemCode.Text = model.MainItemCode;
txtMainItemName.Text = model.MainItemName;
txtMajorName.Text = model.MajorName;
@@ -154,6 +155,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
return;
}
table.ContractId =ContractService.GetContractByContractNum(DropContractCode.SelectedValue).ContractId;
table.SerialNumber = txtSerialNumber.Text;
table.MainItemCode = txtMainItemCode.Text;
table.MainItemName = txtMainItemName.Text;
table.MajorName = txtMajorName.Text;
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackEdit.aspx.designer.cs
Generated
+9
View File
@@ -50,6 +50,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.DropDownList DropContractCode;
/// <summary>
/// txtSerialNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSerialNumber;
/// <summary>
/// txtMainItemCode 控件。
/// </summary>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
+7 -8
View File
@@ -74,12 +74,11 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center"
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="SerialNumber" DataField="SerialNumber" SortField="SerialNumber"
FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode"
FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
@@ -105,13 +104,13 @@
<f:TextBox ID="TextBox5" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject" EnableColumnEdit="False"
<f:RenderField Width="150px" ColumnID="SubProject" DataField="SubProject" SortField="SubProject"
FieldType="String" HeaderText="分部工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox6" runat="server" Required="true"></f:TextBox>
</Editor>
</f:RenderField>
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
<f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"
FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
<Editor>
<f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
+5 -1
View File
@@ -48,7 +48,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
table.ContractId = this.ContractId;
table.ProjectCode = this.txtProjectCode.Text.Trim();
table.ProjectName = this.txtProjectName.Text.Trim();
var tb = BLL.PhtglContractTrackService.GetListData(table, Grid1);
var tb = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackByModle(table);
Grid1.RecordCount = PhtglContractTrackService.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
@@ -433,6 +433,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
var MainItemName = objects["values"]["MainItemName"].ToString();
var MajorName = objects["values"]["MajorName"].ToString();
var MajorCode = objects["values"]["MajorCode"].ToString();
var SubProject = objects["values"]["SubProject"].ToString();
var SubItemProject = objects["values"]["SubItemProject"].ToString();
//var ProjectCode = objects["values"]["ProjectCode"].ToString();
var ProjectName = objects["values"]["ProjectName"].ToString();
var ProjectDescription = objects["values"]["ProjectDescription"].ToString();
@@ -458,6 +460,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
model.MainItemName = MainItemName;
model.MajorName = MajorName;
model.MajorCode = MajorCode;
model.SubProject= SubProject;
model.SubItemProject= SubItemProject;
// model.ProjectCode = ProjectCode;
model.ProjectName = ProjectName;
model.ProjectDescription = ProjectDescription;
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs
Generated
-9
View File
@@ -158,15 +158,6 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// lblNumber 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumber;
/// <summary>
/// TextBox2 控件。
/// </summary>
SGGL/Model/Model.cs
+28 -4
View File
@@ -11763,7 +11763,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
@@ -151270,7 +151270,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
@@ -181950,6 +181950,8 @@ namespace Model
private string _ProjectId;
private string _SerialNumber;
private EntitySet<ZHGL_ConstructionLogWorkEfficiency> _ZHGL_ConstructionLogWorkEfficiency;
private EntitySet<ZHGL_ConstructionLogWorkEfficiencyMonth> _ZHGL_ConstructionLogWorkEfficiencyMonth;
@@ -182016,6 +182018,8 @@ namespace Model
partial void OnContractIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnSerialNumberChanging(string value);
partial void OnSerialNumberChanged();
#endregion
public PHTGL_ContractTrack()
@@ -182605,6 +182609,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();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_ZHGL_ConstructionLogWorkEfficiency_PHTGL_ContractTrack", Storage="_ZHGL_ConstructionLogWorkEfficiency", ThisKey="Id", OtherKey="ContractTrackId", DeleteRule="NO ACTION")]
public EntitySet<ZHGL_ConstructionLogWorkEfficiency> ZHGL_ConstructionLogWorkEfficiency
{
@@ -182769,7 +182793,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WorkPackageEstimate
{
get
@@ -292545,7 +292569,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