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

2023-10-27

This commit is contained in:
李鹏飞 2023-10-27 17:46:32 +08:00
parent e46a7ad179
commit 65a5fdae3e
16 changed files with 268 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
DataBase/版本日志/SGGLDB_V2023-10-27.sql Normal file
View File

@ -0,0 +1,57 @@
Alter VIEW [dbo].[View_HJGL_Batch_PointBatchItem]
AS
/*************点口明细表*************/
SELECT PointBatchItem.PointBatchItemId,
PointBatchItem.PointBatchId,
PointBatch.ProjectId,
PointBatch.UnitId,
PointBatch.DetectionTypeId,
PointBatch.PointBatchCode,
Pipeline.UnitWorkId,
PointBatchItem.WeldJointId,
(CASE PointBatchItem.PointState WHEN '1' THEN '点口' WHEN '2' THEN '扩透' END) AS PointState,
(CASE PointBatchItem.IsBuildTrust WHEN 1 THEN '是' ELSE '' END) AS IsBuildTrust,
(CASE WHEN PointBatchItem.IsAudit=1 THEN '是'
WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NOT NULL THEN '否'
WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NULL THEN '' END) AS PointIsAudit,
PointBatchItem.PointDate,--点口日期
(CASE PointBatchItem.IsWelderFirst WHEN 1 THEN '是' ELSE '' END) AS IsWelderFirst,
PointBatchItem.RepairDate,--返修日期
PointBatchItem.RepairRecordId,
PointBatchItem.CutDate,--切除日期
PointBatchItem.PBackingWelderId,--返修打底焊工
PointBatchItem.PCoverWelderId,--返修盖面焊工
UnitWork.UnitWorkCode,--工区号
WeldJoint.WeldJointCode,--焊口号
WeldJoint.BackingWelderId AS WelderId, --焊工ID
BackingWelder.WelderCode AS BackingWelderCode,
CoverWelder.WelderCode AS CoverWelderCode,
WeldType.WeldTypeCode,
WeldJoint.JointAttribute,
WeldJoint.JointArea,--焊接区域
WeldJoint.Size,--实际寸径
WeldingDaily.WeldingDate,--焊接日期
WeldJoint.PipelineId, --管线ID
WeldJoint.Material1Id AS Mat, --材质
WeldJoint.Specification, --规格
Pipeline.PipelineCode, --管线号
PipingClass.PipingClassName , --管道等级
WeldJoint.BackingWelderId,
WeldJoint.CoverWelderId
FROM dbo.HJGL_Batch_PointBatchItem AS PointBatchItem
LEFT JOIN dbo.HJGL_Batch_PointBatch AS PointBatch ON PointBatch.PointBatchId=PointBatchItem.PointBatchId
LEFT JOIN dbo.HJGL_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=PointBatchItem.WeldJointId
LEFT JOIN dbo.HJGL_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
LEFT JOIN dbo.WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId=Pipeline.UnitWorkId
LEFT JOIN dbo.HJGL_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId
LEFT JOIN dbo.Base_PipingClass AS PipingClass ON PipingClass.PipingClassId=Pipeline.PipingClassId
LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=WeldJoint.BackingWelderId
LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=WeldJoint.CoverWelderId
LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId
LEFT JOIN HJGL_Hard_TrustItem HardTrustItem ON HardTrustItem.WeldJointId=PointBatchItem.WeldJointId
where (WeldJoint.IsHotProess!=1 or (WeldJoint.IsHotProess=1 and HardTrustItem.IsPass=1))
and BackingWelder.ProjectId=Pipeline.ProjectId and CoverWelder.ProjectId=Pipeline.ProjectId
go

21
DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql
View File

@ -170,25 +170,26 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff
VALUES ( N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'¼Û¸ñÌåϵ',30,N'0',N'Menu_PHTGL',0,0,1)
GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'土建',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'土建工程',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'工艺',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'钢结构预制工程',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'电气',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'工艺管道安装工程',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'仪表',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'工艺设备安装工程',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'给排水',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'非标设备现场制作安装工程',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'暖通',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'电仪安装工程',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'防腐保温',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'水暖安装工程',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'消防电信',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'防腐绝热工程',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'临建设施',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'无损检测工程',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'2A5A325E-C3C2-4412-9F5D-FB9185E9EB9B',N'消防工程',100,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1)
GO
INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed])
VALUES ( N'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'ºÏִͬÐиú×Ù',40,N'0',N'Menu_PHTGL',0,0,1)
GO

4
SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
View File

@ -167,6 +167,7 @@ namespace BLL
PhtglContracttrackprogressService.CreateTemplateByContractTrackId(newtable.Id);
}
public static void UpdatePHTGL_ContractTrack(PHTGL_ContractTrack newtable)
@ -329,8 +330,7 @@ namespace BLL
responeData.code = 0;
responeData.message = "没有数据";
return responeData;
}
}
foreach (var item in modeList)
{
item.ContractId = contractid;

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx
View File

Binary file not shown.

2
SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx
View File

@ -24,7 +24,7 @@
<f:TextBox runat="server" Label="评定编号" ID="txtWeldingProcedureCode" EmptyText="输入查询条件"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="300px" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true" OnSelectedIndexChanged="TextBox_TextChanged"
<f:DropDownList ID="drpUnit" runat="server" Required="true" ShowRedStar="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="True"
Label="工艺规程编制单位" LabelAlign="Right" LabelWidth="180px">
</f:DropDownList>

30
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
View File

@ -42,7 +42,7 @@
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊口信息"
TitleToolTip="焊口信息" AutoScroll="true">
<Toolbars >
@ -63,11 +63,11 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound" DisableUnselectableRows="true"
DataKeyNames="WeldJointId" AllowColumnLocking="true" EnableColumnLines="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
EnableCollapse="true" KeepCurrentSelection="true" runat="server" BoxFlex="1" OnRowDataBound="Grid1_RowDataBound" DisableUnselectableRows="true"
DataKeyNames="WeldJointId" EnableColumnLines="true"
DataIDField="WeldJointId" EnableTextSelection="True" AllowSorting="true" SortField="WeldJointNum"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="false" IsDatabasePaging="true" OnRowCommand="Grid1_RowCommand"
PageSize="1000" EnableCheckBoxSelect="true">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@ -104,35 +104,35 @@
<Columns>
<f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px" Locked="true">
TextAlign="Center" Width="50px" >
</f:RenderField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px" Locked="true">
TextAlign="Center" Width="80px" >
</f:RenderField>
<f:RenderField HeaderText="备注" ColumnID="Remark"
DataField="Remark" SortField="Remark" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px" Locked="true">
TextAlign="Center" Width="80px" >
</f:RenderField>
<f:RenderField HeaderText="材质1" ColumnID="Material1Code"
DataField="Material1Code" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
HeaderTextAlign="Center" TextAlign="Center" Width="150px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="材质2" ColumnID="Material2Code"
DataField="Material2Code" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="140px" ExpandUnusedSpace="true">
HeaderTextAlign="Center" TextAlign="Center" Width="140px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" SortField="Size" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true">
HeaderTextAlign="Center" TextAlign="Center" Width="120px" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" DataField="Dia" SortField="Dia"
FieldType="Double" HeaderTextAlign="Center" TextAlign="Left" Width="120px" >
FieldType="Double" HeaderTextAlign="Center" TextAlign="Center" Width="80px" >
</f:RenderField>
<f:RenderField HeaderText="公称直径" ColumnID="DNDia" DataField="DNDia" SortField="DNDia"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px" >
FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px" >
</f:RenderField>
<f:TemplateField ColumnID="WPQCode" Width="120px" HeaderText="评定编号" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="WPQCode" Width="160px" HeaderText="评定编号" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# BLL.WeldJointService.GetWPQCodeByWeldJointId(Eval("WeldJointId")) %>'></asp:Label>
</ItemTemplate>
@ -157,6 +157,8 @@
DataField="WeldingRodCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true" Hidden="true">
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" ConfirmText="是否确认重置焊评？" ConfirmTarget="Top" Text="重置焊评"
CommandName="ResetWpq" />
</Columns>
</f:Grid>
</Items>

38
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
View File

@ -1,6 +1,7 @@
using Aspose.Words;
using BLL;
using Model;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
@ -621,5 +622,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage
};
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "ResetWpq")
{
var weldJointId = e.RowID;
var model = WeldJointService.GetWeldJointByWeldJointId(weldJointId);
if (model != null)
{
model.WPQId = null;
WeldJointService.UpdateWeldJoint(model);
List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(model, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
if (wpqList != null)
{
Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
newJot.WPQId = wps.WPQId;
newJot.WeldJointId = model.WeldJointId;
newJot.WeldingRod = wps.WeldingRod;
newJot.WeldingWire = wps.WeldingWire;
newJot.WeldingMethodId = wps.WeldingMethodId;
newJot.GrooveTypeId = wps.GrooveType;
newJot.PreTemperature = wps.PreTemperature;
newJot.IsHotProess = wps.IsHotProess;
newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
BLL.WeldJointService.UpdateConWeldJoint(newJot);
}
BindGrid();
ShowNotify("焊评已重置！", MessageBoxIcon.Success);
}
}
}
}
}

4
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
View File

@ -14,7 +14,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="200px" Title="WBS目录"
EnableCollapse="true" Width="320px" Title="WBS目录"
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Toolbars>
@ -27,7 +27,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="焊接日报"
<f:Tree ID="tvControlItem" ShowHeader="false" Height="700px" Title="焊接日报"
OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
EnableTextSelection="true">

28
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
View File

@ -74,13 +74,18 @@
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow ColumnWidths="50% 0% 25% 25% 25%" >
<Items>
<f:TextBox ID="txtRemark" Label="备注" runat="server" LabelWidth="120px">
</f:TextBox>
<f:Label ID="lbAmount" Label="超量焊工" runat="server" LabelWidth="120px"
Hidden="true" CssClass="customlabel">
</f:Label>
<f:Button ID="btnSelectWelder" runat="server" Text="选择焊工批量填充" OnClick="btnSelectWelder_Click" >
</f:Button>
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px">
</f:DropDownList>
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click"></f:Button>
</Items>
</f:FormRow>
</Rows>
@ -96,32 +101,32 @@
<Columns>
<f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="140px">
TextAlign="Center" Width="50px">
</f:RenderField>
<f:RenderField HeaderText="管线号" ColumnID="PipelineCode"
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px" ExpandUnusedSpace="true">
TextAlign="Center" Width="180px" ExpandUnusedSpace="true">
</f:RenderField>
<f:TemplateField ColumnID="tfPipeArea" Width="180px" HeaderText="管线划分" HeaderTextAlign="Center" Hidden="true"
TextAlign="Left">
TextAlign="Center">
<ItemTemplate>
<asp:Label ID="lbPipeArea" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode"
DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="180px">
TextAlign="Center" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="可焊焊工号" ColumnID="CanWelderCode" Hidden="true"
DataField="CanWelderCode" SortField="CanWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="300px">
TextAlign="Center" Width="300px">
</f:RenderField>
<%--<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
DataField="CanWelderId" FieldType="String" Hidden="true">
</f:RenderField>--%>
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="150px">
TextAlign="Center" Width="150px">
<Editor>
<f:DropDownList ID="drpCoverWelderId" EnableEdit="true" Required="true" runat="server"
ShowRedStar="true">
@ -130,7 +135,7 @@
</f:RenderField>
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
HeaderTextAlign="Center" TextAlign="Center" Width="150px">
<Editor>
<f:DropDownList ID="drpBackingWelderId" EnableEdit="true" Required="true" runat="server"
ShowRedStar="true">
@ -147,14 +152,14 @@
</f:RenderField>--%>
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute"
DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
TextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode" Hidden="true"
DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="70px">
TextAlign="Center" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="达因" ColumnID="Size"
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Center"
Width="70px">
</f:RenderField>
<f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
@ -190,6 +195,7 @@
<f:RenderField HeaderText="打底焊工ID" ColumnID="BackingWelderId" DataField="BackingWelderId"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

72
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -1112,5 +1112,77 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
#endregion
#region 批量填充焊工
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSaveWelder_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(drpCanWelder.SelectedValue))
{
string[] selectedRowId = Grid1.SelectedRowIDArray;
for (int i = 0; i < selectedRowId.Count(); i++)
{
string weldTaskId = selectedRowId[i];
BLL.WeldTaskService.UpdateWelderTask(weldTaskId, drpCanWelder.SelectedValue);
}
this.BindGrid(null);
drpCanWelder.Items.Clear();
}
}
protected void btnSelectWelder_Click(object sender, EventArgs e)
{
GetCanWelderDropDownList();
}
/// <summary>
/// 获取能焊焊工下拉列表
/// </summary>
/// <param name="weldingTask"></param>
private void GetCanWelderDropDownList()
{
drpCanWelder.Items.Clear();
string[] selectedRowId = Grid1.SelectedRowIDArray;
List<string> canWelder = null;
var taskList = from x in Funs.DB.HJGL_WeldTask where x.ProjectId == this.CurrUser.LoginProjectId select x;
for (int i = 0; i < selectedRowId.Count(); i++)
{
Model.HJGL_WeldTask task = taskList.FirstOrDefault(x => x.WeldTaskId == selectedRowId[i]);
if (!string.IsNullOrEmpty(task.CanWelderId))
{
List<string> jotCanWelder = task.CanWelderId.Split(',').ToList();
if (i == 0)
{
canWelder = jotCanWelder;
}
else
{
canWelder = canWelder.Intersect(jotCanWelder).ToList();
}
}
else
{
canWelder = null;
break;
}
}
if (canWelder != null)
{
var welder = from x in canWelder
join y in Funs.DB.SitePerson_Person on x equals y.PersonId
select new { WelderId = x, y.WelderCode };
drpCanWelder.DataValueField = "WelderId";
drpCanWelder.DataTextField = "WelderCode";
drpCanWelder.DataSource = welder;
drpCanWelder.DataBind();
}
}
#endregion
}
}

27
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs generated
View File

@ -203,6 +203,33 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
/// </remarks>
protected global::FineUIPro.Label lbAmount;
/// <summary>
/// btnSelectWelder 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelectWelder;
/// <summary>
/// drpCanWelder 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCanWelder;
/// <summary>
/// btnSaveWelder 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSaveWelder;
/// <summary>
/// Grid1 控件。
/// </summary>

14
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
View File

@ -20,7 +20,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="200px" Title="WBS目录"
EnableCollapse="true" Width="250px" Title="WBS目录"
ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
IconFont="ArrowCircleLeft">
<Toolbars>
@ -34,7 +34,7 @@
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Height="500px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"
<f:Tree ID="tvControlItem" ShowHeader="false" Height="700px" Title="焊接任务单" runat="server" ShowBorder="false" EnableCollapse="true"
EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"
EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
<Listeners>
@ -63,7 +63,7 @@
</f:Button>
<f:DropDownList ID="drpCanWelder" EnableEdit="true" runat="server" LabelWidth="140px">
</f:DropDownList>
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click"> </f:Button>
<f:Button ID="btnSaveWelder" Icon="Accept" runat="server" Text="确认" OnClick="btnSaveWelder_Click"></f:Button>
<f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" EmptyText="输入查询条件" LabelAlign="Right"></f:TextBox>
<f:Button runat="server" ID="btnSearch" Icon="SystemSearch" ToolTip="查询" Text="查询" OnClick="btnSearch_Click">
@ -74,7 +74,7 @@
</f:DatePicker>
<%-- <f:Button runat="server" ID="ckSelect" Icon="Find" ToolTip="查找" Text="查找" OnClick="ckSelect_Click" Hidden="true">
</f:Button>--%>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click">
<f:Button ID="btnSave" Icon="SystemSave" runat="server" Text="保存" OnClick="btnSave_Click" Hidden="True">
</f:Button>
</Items>
@ -158,7 +158,7 @@
<f:RenderField HeaderText="可焊焊工ID" ColumnID="CanWelderId"
DataField="CanWelderId" FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode"
<f:RenderField HeaderText="盖面焊工" ColumnID="CoverWelderCode" Hidden="True"
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="110px">
<Editor>
@ -167,7 +167,7 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
<f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode" Hidden="True"
DataField="BackingWelderCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="110px">
<Editor>
@ -212,7 +212,7 @@
</f:Panel>
<f:Window ID="Window1" Title="弹出窗体" Hidden="true" EnableIFrame="true"
EnableMaximize="true" Target="Top" EnableResize="false" runat="server"
IsModal="true" Width="1200px" Height="650px" OnClose="Window1_Close">
IsModal="true" Width="1300px" Height="650px" OnClose="Window1_Close">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuAdd" EnablePostBack="true" runat="server" Text="新增" Hidden="true" Icon="Add" OnClick="btnMenuAdd_Click">

2
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx.cs
View File

@ -363,7 +363,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("费用对比统计表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 500;

5
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx
View File

@ -22,6 +22,10 @@
.f-grid-row.red {
background-color: Yellow;
}
.customlabel span {
color: red;
font-weight: bold;
}
</style>
</head>
<body>
@ -45,6 +49,7 @@
LabelWidth="140px" OnSelectedIndexChanged="DropMainContractCode_SelectedIndexChanged">
</f:DropDownList>
<f:Label ID="txtContractName" runat="server" Label="合同名称" LabelAlign="Right" LabelWidth="140px"></f:Label>
<f:Label ID="lbTotalPrice" CssClass="customlabel" runat="server" Label="合价" LabelWidth="70px"></f:Label>
<f:ToolbarFill runat="server" />
<f:Button ID="btnNew" ToolTip="新增" Text="新增" Hidden="true" Icon="Add" runat="server"

5
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.cs
View File

@ -53,7 +53,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
var sumTotalPricea = tb.Select(x =>Funs.GetNewDecimalOrZero(x.TotalPrice) ).ToList().Sum();
lbTotalPrice.Text = sumTotalPricea.ToString();
}
#endregion
@ -545,7 +546,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同执行跟踪表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("合同价格信息表" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = 500;

9
SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx.designer.cs generated
View File

@ -86,6 +86,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
/// </remarks>
protected global::FineUIPro.Label txtContractName;
/// <summary>
/// lbTotalPrice 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbTotalPrice;
/// <summary>
/// btnNew 控件。
/// </summary>