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

20220918 焊接修改

This commit is contained in:
李鹏飞 2022-09-18 23:22:47 +08:00
parent 8f3c0fd9ba
commit 01ce3c0381
18 changed files with 1322 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataBase/版本日志/SGGLDB_V2022-09-18 lpf.sql Normal file
View File

@ -0,0 +1,3 @@
select * from HJGL_DataImport
alter table HJGL_DataImport alter column CreateDate datetime

8
DataBase/版本日志/SGGLDB_V2022-09-18修改明细.txt Normal file
View File

@ -0,0 +1,8 @@
--ADD BY lipengfei 2022-09-16
1修改数据导入上传时间类型
2.根据焊接测试修改
--END

2
SGGL/BLL/HJGL/DataImport/DataImportService.cs
View File

@ -46,7 +46,7 @@ namespace BLL
public static Model.HJGL_DataImport GetLatestFileByFileName(string FileName, string project)
{
var q = (from x in Funs.DB.HJGL_DataImport
where x.FileName == FileName && x.ProjectId == project
where x.FileName.Contains(FileName) && x.ProjectId == project
select x
).OrderByDescending(x => x.Version).FirstOrDefault();
return q;

8
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
View File

@ -41,8 +41,8 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
TitleToolTip="数据" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
EnableCheckBoxSelect="true" EnableMultiSelect="false" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick"
@ -118,7 +118,7 @@
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
TitleToolTip="历史记录" AutoScroll="true">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录"
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"
@ -160,7 +160,7 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="基本信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" EnableDrag="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true" CloseAction="HidePostBack"
Width="700px" Height="300px">
</f:Window>
<f:Menu ID="Menu1" runat="server">

2
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
View File

@ -30,7 +30,7 @@
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:TextArea ID="txtRemark" runat="server" Label="更新原因" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:Button ID="btnAttachUrl_Remark" Text="上传附件" ToolTip="附件" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Remark_Click" ValidateForms="SimpleForm1">
</f:Button>

3
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx.cs
View File

@ -106,7 +106,8 @@ namespace FineUIPro.Web.HJGL.DataImport
ShowNotify(result, MessageBoxIcon.Warning);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
// PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}

8
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx
View File

@ -41,7 +41,7 @@
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="数据"
TitleToolTip="数据" AutoScroll="true">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="数据" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="DataImportId" SortDirection="ASC" OnSort="Grid1_Sort"
@ -78,7 +78,7 @@
</f:RenderField>
<f:RenderField HeaderText="类型" ColumnID="FileType"
DataField="FileType" SortField="FileType" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
TextAlign="Left" Width="50px">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ProfessionalName" DataField="ProfessionalName" FieldType="String"
HeaderText="专业" HeaderTextAlign="Center" TextAlign="Right">
@ -118,7 +118,7 @@
Layout="Fit" ShowHeader="false" RegionSplitWidth="20px" BodyPadding="1px" Height="400px" IconFont="PlusCircle" Title="历史记录"
TitleToolTip="历史记录" AutoScroll="true">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录"
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="历史记录" ForceFit="true"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="DataImportId"
AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DataImportId"
AllowSorting="true" SortField="Version" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" EnableMultiSelect="false"
@ -160,7 +160,7 @@
</Items>
</f:Panel>
<f:Window ID="Window1" Title="基本信息" Hidden="true" EnableIFrame="true" EnableMaximize="true" EnableDrag="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true"
Target="Parent" EnableResize="true" runat="server" IsModal="false" OnClose="Window1_Close" ConstrainSize="true" AutoScroll="true" CloseAction="HidePostBack"
Width="700px" Height="300px">
</f:Window>
<f:Menu ID="Menu1" runat="server">

2
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx
View File

@ -31,7 +31,7 @@
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:TextArea ID="txtRemark" runat="server" Label="更新原因" LabelAlign="Right" AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" LabelWidth="140px"></f:TextArea>
<f:Button ID="btnAttachUrl_Remark" Text="上传附件" ToolTip="附件" Icon="TableCell" runat="server"
OnClick="btnAttachUrl_Remark_Click" ValidateForms="SimpleForm1">
</f:Button>

3
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImportEdit.aspx.cs
View File

@ -104,7 +104,8 @@ namespace FineUIPro.Web.HJGL.DataImport
ShowNotify(result, MessageBoxIcon.Warning);
}
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
// PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}

2
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
View File

@ -73,7 +73,7 @@
<f:Button ID="btnGetChart" ToolTip="图表" Icon="ChartPie" Text="统计图表"
EnablePostBack="true" OnClick="btnGetChart_Click" runat="server">
</f:Button>
<f:Button ID="btnSinglePreview" ToolTip="轴测图" Icon="PageRed" Text="轴测图" Hidden="true"
<f:Button ID="btnSinglePreview" ToolTip="轴测图" Icon="PageRed" Text="轴测图"
EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp"

20
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
View File

@ -335,18 +335,28 @@ namespace FineUIPro.Web.HJGL.InfoQuery
protected void btnSinglePreview_Click(object sender, EventArgs e)
{
string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, "");
//string httpUrl = @"FileUpload\HJGL_DataImport\095e9691-99c2-4f70-8e67-e70c8fa6be9c\2022-06\管道焊接工作记录.pdf";
//var newurl = Funs.SGGLUrl + httpUrl.Replace(Funs.RootPath, "");
var id = Grid1.SelectedRowID;
if (string.IsNullOrEmpty(id))
{
ShowNotify("请选择相对应的图纸", MessageBoxIcon.Warning);
return;
}
var SingleNumber = (from x in Funs.DB.View_HJGL_Pipeline where x.PipelineId == id select (x.SingleNumber));
var SingleName = (from x in Funs.DB.View_HJGL_Pipeline where x.PipelineId == id select (x.SingleName)).FirstOrDefault();
var filemodel= BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, this.CurrUser.LoginProjectId);
if (filemodel!=null)
{
string httpUrl = filemodel.FilePath;
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看 -")));
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看 -")));
}
else
{
ShowNotify("请上传相关图纸", MessageBoxIcon.Warning);
return;
}
}
}

2
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx
View File

@ -14,7 +14,7 @@
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="包装管理台账" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="PackagingManageId" AllowCellEditing="true"
runat="server" BoxFlex="1" DataKeyNames="PackagingManageId" AllowCellEditing="true" ForceFit="true"
ClicksToEdit="2" DataIDField="PackagingManageId" AllowSorting="true" SortField="PackagingCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true"
PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"

3
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageEdit.aspx.cs
View File

@ -29,6 +29,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
HJGL_PipelineComponentService.InitPipelineDownList(drpPipelineComponentCode, this.CurrUser.LoginProjectId, false);
HJGL_PackagingmanageService.InitPipelineDownList(txtPackagingCode, this.CurrUser.LoginProjectId, false);
btnClose.OnClientClick = ActiveWindow.GetHideReference();
if (!string.IsNullOrEmpty(PackagingManageId))
{
var model = HJGL_PackagingmanageService.GetHJGL_PackagingManageById(PackagingManageId);
@ -43,7 +44,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
}
}
else
{
{btnSave.Hidden = false;
txtPackagingCode.Text = ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId)+"-"+ string.Format("{0:yyyyMMdd}", DateTime.Now)+"-";
}

2
SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManageView.aspx
View File

@ -13,7 +13,7 @@
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="明细" EnableCollapse="true"
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="明细" EnableCollapse="true" ForceFit="true"
runat="server" BoxFlex="1" DataKeyNames="PipelineComponentId" AllowCellEditing="true"
ClicksToEdit="2" DataIDField="PipelineComponentId" AllowSorting="true" SortField="PipelineComponentCode"
SortDirection="ASC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" EnableColumnLines="true"

6
SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
View File

@ -43,11 +43,11 @@
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click">
<f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
</f:Button>
<f:Button ID="btnImportQRCode" Text="二维码导入" ToolTip="二维码导入" Icon="PackageIn" runat="server" OnClick="btnImportQRCode_Click">
<f:Button ID="btnImportQRCode" Text="导入二维码信息" ToolTip="导入二维码信息" Icon="PackageIn" runat="server" OnClick="btnImportQRCode_Click">
</f:Button>
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd"
<f:Button ID="btnBatchAdd" Text="批量增加" Icon="TableAdd" Hidden="true"
runat="server" OnClick="btnBatchAdd_Click">
</f:Button>
<f:Button ID="btnPrint" runat="server" Icon="Printer" EnableAjax="false" Text="打印" ToolTip="打印" OnClick="btnPrint_Click"></f:Button>

16
SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx
View File

@ -12,27 +12,27 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" Hidden="true"
Layout="HBox" EnableCollapse="true" Width="300" Title="组织机构" TitleToolTip="组织机构"
Layout="HBox" EnableCollapse="true" Width="300" Title="示意图" TitleToolTip="示意图"
ShowBorder="true" ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Items>
<f:Tree ID="trSafetyOrganization" EnableCollapse="true" ShowHeader="false" ShowBorder="false"
EnableIcons="true" Title="组织机构" OnNodeCommand="trSafetyOrganization_NodeCommand"
EnableIcons="true" Title="示意图" OnNodeCommand="trSafetyOrganization_NodeCommand"
AutoLeafIdentification="true" AutoScroll="true" runat="server" EnableTextSelection="True"
EnableSingleClickExpand="true">
</f:Tree>
</Items>
</f:Panel>
<f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="安全组织机构"
TitleToolTip="安全组织机构" AutoScroll="true">
Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="堆场规划示意图"
TitleToolTip="堆场规划示意图" AutoScroll="true">
<Items>
<f:SimpleForm ID="SimpleForm1" IsFluid="true" BodyPadding="10px" EnableCollapse="false"
ShowBorder="true" Title="应急流程图" ShowHeader="true" runat="server">
ShowBorder="true" Title="堆场规划示意图" ShowHeader="true" runat="server">
<Tools>
<f:Tool runat="server" ID="btnDeleteItem" Icon="Delete" Text="删除应急流程图" EnablePostBack="true" OnClick="btnDelete_Click">
<f:Tool runat="server" ID="btnDeleteItem" Icon="Delete" Text="删除示意图" EnablePostBack="true" OnClick="btnDelete_Click">
</f:Tool>
<f:Tool runat="server" ID="btnNewItem" IconFont="_Upload" Text="上传应急流程图" EnablePostBack="false">
<f:Tool runat="server" ID="btnNewItem" IconFont="_Upload" Text="上传示意图" EnablePostBack="false">
<Listeners>
<f:Listener Event="click" Handler="onUploadClick" />
</Listeners>
@ -42,7 +42,7 @@
</Tools>
<Items>
<f:FileUpload runat="server" ID="filePhoto" ShowRedStar="false" ShowEmptyLabel="true" LabelWidth="0"
ButtonText="上传应急流程图" ButtonOnly="true" Required="false" ButtonIcon="ImageAdd" Hidden="true"
ButtonText="上传堆场规划示意图" ButtonOnly="true" Required="false" ButtonIcon="ImageAdd" Hidden="true"
AutoPostBack="true" OnFileSelected="filePhoto_FileSelected">
</f:FileUpload>

1
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
View File

@ -29,6 +29,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
rootNode1.NodeID = "1";
rootNode1.Text = "建筑工程";
rootNode1.CommandName = "建筑工程";
rootNode1.Selectable = false;
this.tvControlItem.Nodes.Add(rootNode1);
TreeNode rootNode2 = new TreeNode();

1352
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff