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

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
高飞 2024-04-11 15:13:45 +08:00
parent ac62296dbb 3af4906673
commit baef36874f
9 changed files with 29 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/SGGL_SeDin/v17/.wsuo
View File

Binary file not shown.

35
SGGL/BLL/BLL.csproj
View File

@ -69,6 +69,14 @@
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@ -843,33 +851,6 @@
<WCFMetadataStorage Include="Service References\OAWebService\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Excel">
<Guid>{00020813-0000-0000-C000-000000000046}</Guid>
<VersionMajor>1</VersionMajor>
<VersionMinor>6</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>False</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>

3
SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改反馈单.doc
View File

@ -1,7 +1,8 @@
安全隐患整改反馈单
项目名称： 合格：
项目名称：
合格：
|受检单位名称| |单位工程名称 | |
|检查人员 | |
|检查日期 | |

25
SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.doc
View File

@ -1,25 +0,0 @@
安全隐患整改通知单
项目名称：阿拉善盟沪蒙能源实业有限公司300万吨/年焦化项目
编号：0005
|受检单位名称|中国化学工程第六建设|单位工程名称 |2号煤棚(建筑) |
| |有限公司 | | |
|检查人员 |程克勤 |
|检查日期 |2021-06-02 |
|隐患类别 |√一般 □较大 □重大 |
|贵公司存在的安全隐患及整改要求如下： |
|1.精煤棚木工加工场一灭火器失效,整改要求：按要求更换,整改期限：2021-06-05|
|总包单位项目安全经理：程克勤 |
|日期：2021-06-02 |
|抄送 |☒专业工程师：蒋子清 |日期：2021-06-05 |
| |☐施工经理： |日期： |
| |☐项目经理： |日期： |
|接收人 | 吴唯佳 |接收日期：2021-06-05 |
|注：1.本表由总包单位项目安全经理签发，一般隐患抄送专业工程师监督；较大隐|
|患抄送施工经理监督；重大隐患需要由项目经理签字并报公司施工管理部备案。 |
|2.本表一式2份，签发单位和接收单位各一份。 |
附图：
|整改前的照片 |
|无 |

38
SGGL/FineUIPro.Web/File/Word/HSSE/安全隐患整改通知单202403270342077313.pdf
View File

@ -1,38 +0,0 @@
安全隐患整改通知单
项目名称：阿拉善盟沪蒙能源实业有限公司300万吨/年焦化项目 编号：
0005
受检单位名称 中国化学工程第六建设有 单位工程名称 2号煤棚(建筑)
限公司
检查人员 程克勤
检查日期 2021-06-02
隐患类别 √一般 □较大 □重大
贵公司存在的安全隐患及整改要求如下：
1.精煤棚木工加工场一灭火器失效,整改要求：按要求更换,整改期限：2021-06-05
总包单位项目安全经理：程克勤
日期：2021-06-02
☒专业工程师：蒋子清 日期：2021-06-05
抄送 ☐施工经理： 日期：
☐项目经理： 日期：
接收人 吴唯佳 接收日期：2021-06-05
注：1.本表由总包单位项目安全经理签发，一般隐患抄送专业工程师监督；较大隐患抄送施工经理
监督；重大隐患需要由项目经理签字并报公司施工管理部备案。
2.本表一式2份，签发单位和接收单位各一份。
附图：
整改前的照片
无

28
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -107,6 +107,14 @@
<HintPath>..\FineUIPro\Reference BLL\Interop.WIA.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Office.Interop.Excel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll</HintPath>
<EmbedInteropTypes>False</EmbedInteropTypes>
</Reference>
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
</Reference>
@ -14445,24 +14453,6 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<ItemGroup>
<COMReference Include="Microsoft.Office.Core">
<Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
<VersionMajor>2</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="Microsoft.Office.Interop.Word">
<Guid>{00020905-0000-0000-C000-000000000046}</Guid>
<VersionMajor>8</VersionMajor>
<VersionMinor>4</VersionMinor>
<Lcid>0</Lcid>
<WrapperTool>primary</WrapperTool>
<Isolated>False</Isolated>
<EmbedInteropTypes>True</EmbedInteropTypes>
</COMReference>
<COMReference Include="VBIDE">
<Guid>{0002E157-0000-0000-C000-000000000046}</Guid>
<VersionMajor>5</VersionMajor>
@ -14483,7 +14473,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>0</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:6233/</IISUrl>
<IISUrl>http://localhost:3001/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
View File

@ -902,7 +902,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_WeldJointMenuId, BLL.Const.BtnModify))
{
if (BLL.WeldTaskService.GetWeldTaskByWeldJointId(Grid1.SelectedRowID) != null) //已下任务单，不可修改数据
if (BLL.WeldTaskService.GetWeldTaskByWeldJointId(Grid3.SelectedRowID) != null) //已下任务单，不可修改数据
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WeldJointView.aspx?WeldJointId={0}", Grid3.SelectedRowID, "编辑 - ")));
}

6
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -617,18 +617,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//GetCanWelderDropDownList(GetWeldingTaskList);
}
string unitWorkId = string.Empty, unitId2 = string.Empty;
string unitWorkId = string.Empty, unitId2 = string.Empty; string taskdate = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];
unitId2 = tvControlItem.SelectedNodeID.Split('|')[1];
taskdate = tvControlItem.SelectedNodeID.Split('|')[2];
}
else
{
unitWorkId = tvControlItem.SelectedNodeID;
}
List<Model.View_HJGL_WeldingTask> GetWeldingTaskList = null;
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId2, Convert.ToDateTime(hdTaskWeldJoint.Text), this.rbIsAudit.SelectedValue);
GetWeldingTaskList = BLL.WeldTaskService.GetWeldingTaskList(this.CurrUser.LoginProjectId, unitWorkId, unitId2, Convert.ToDateTime(taskdate), this.rbIsAudit.SelectedValue);
this.BindGrid(GetWeldingTaskList);
Alert.ShowInTop("已生成可焊焊工！", MessageBoxIcon.Success);
@ -984,6 +985,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
string unitWorkId = string.Empty, unitId = string.Empty;
if (tvControlItem.SelectedNodeID.Contains("|"))
{
unitWorkId = tvControlItem.SelectedNodeID.Split('|')[0];

12
SGGL/FineUIPro.Web/HSSE/Check/RectifyNotices.aspx.cs
View File

@ -765,13 +765,15 @@ namespace FineUIPro.Web.HSSE.Check
bookmarkProjectName.Text = BLL.ProjectService.GetProjectNameByProjectId(getRectify.ProjectId);
}
Bookmark IsRectify = doc.Range.Bookmarks["IsRectify"];
if (IsRectify != null)
var RectifyNoticesItem = Funs.DB.Check_RectifyNoticesItem.FirstOrDefault(x => x.RectifyNoticesId == getRectify.RectifyNoticesId && (x.IsRectify == false || x.IsRectify == null));
if (RectifyNoticesItem == null)
{
if (getRectify.IsRectify?.ToString() == "True")
IsRectify.Text = "合格";
else
IsRectify.Text = "不合格";
IsRectify.Text = "合格";
}
else
{ IsRectify.Text = "不合格"; }
Bookmark bookmarkRectifyNoticesCode = doc.Range.Bookmarks["RectifyNoticesCode"];
if (bookmarkRectifyNoticesCode != null)
{