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

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SHJ

Browse Source
This commit is contained in:
李鹏飞
2026-06-11 11:02:08 +08:00
parent 201443e437 5b1607187e
commit ffd9fb7e29
12 changed files with 578 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -17182,7 +17182,7 @@
</COMReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
SGGL/FineUIPro.Web/HJGL/PersonManage/WelderManage.aspx.cs
+26 -22
View File
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
Model.SitePerson_Person welder = BLL.SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, this.tvControlItem.SelectedNodeID);
if (welder != null)
{
//this.btnEdit.Hidden = false;
this.btnEdit.Hidden = false;
//this.btnNew.Hidden = false;
//this.btnDelete.Hidden = false;
this.txtWelderCode.Text = welder.WelderCode;
@@ -47,29 +47,33 @@ namespace FineUIPro.Web.HJGL.PersonManage
{
this.drpUnitId.Text = UnitService.GetUnitNameByUnitId(welder.UnitId);
}
//this.rblSex.Text = welder.Sex == "1" ? "男" : "女";
//if (welder.Birthday.HasValue)
//{
// this.txtBirthday.Text = string.Format("{0:yyyy-MM-dd}", welder.Birthday);
//}
this.txtCertificateCode.Text = welder.CertificateCode;
//if (string.IsNullOrEmpty(welder.CertificateCode))
//{
// this.txtCertificateCode.Text = welder.IdentityCard;
//}
if (welder.CertificateLimitTime.HasValue)
Model.Person_Persons person = BLL.Person_PersonsService.GetPerson_PersonsById(welder.PersonId);
if (person != null)
{
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", welder.CertificateLimitTime);
this.rblSex.Text = person.Sex == "1" ? "男" : "女";
if (person.Birthday.HasValue)
{
this.txtBirthday.Text = string.Format("{0:yyyy-MM-dd}", person.Birthday);
}
this.txtCertificateCode.Text = welder.CertificateCode;
if (string.IsNullOrEmpty(welder.CertificateCode))
{
this.txtCertificateCode.Text = welder.CertificateCode;
}
if (welder.CertificateLimitTime.HasValue)
{
this.txtCertificateLimitTime.Text = string.Format("{0:yyyy-MM-dd}", welder.CertificateLimitTime);
}
this.txtWelderLevel.Text = welder.WelderLevel;
if (welder.States == Const.State_1)
{
cbIsOnDuty.Checked = true;
}
else
{
cbIsOnDuty.Checked = false;
}
}
this.txtWelderLevel.Text = welder.WelderLevel;
//if (welder.IsUsed == true)
//{
// cbIsOnDuty.Checked = true;
//}
//else
//{
// cbIsOnDuty.Checked = false;
//}
}
else
{
SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs
+8 -1
View File
@@ -770,7 +770,7 @@ namespace FineUIPro.Web.HSSE.SitePerson
string col33 = pds.Rows[i][33].ToString().Trim();
string col34 = pds.Rows[i][34].ToString().Trim();
string col35 = pds.Rows[i][35].ToString().Trim();
string col36 = pds.Rows[i][36].ToString().Trim();
if (!string.IsNullOrEmpty(col0))//卡号
{
person.CardNo = col0;
@@ -1023,6 +1023,10 @@ namespace FineUIPro.Web.HSSE.SitePerson
//{
// person.IsCardUsedName = col35;
//}
if (!string.IsNullOrEmpty(col36))//焊工号
{
person.WelderCode = col36;
}
person.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person));
persons.Add(person);
@@ -1135,6 +1139,9 @@ namespace FineUIPro.Web.HSSE.SitePerson
//newPerson.Address = persons[i].Address;
newPerson.OutTime = persons[i].OutTime;
newPerson.OutResult = persons[i].OutResult;
newPerson.States = BLL.Const.State_1;
newPerson.WelderCode = persons[i].WelderCode;
newPerson.IsWeldAudit = true;
//newPerson.IsForeign = persons[i].IsForeign;
//newPerson.IsOutside = persons[i].IsOutside;
//newPerson.IsUsed = persons[i].IsUsedName == "是" ? true : false;
SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+6 -10
View File
@@ -7,22 +7,19 @@
<TreeNode id="2F027233-22EC-4063-A04F-FB9FE6A91588" Text="材料仓库" NavigateUrl="HJGL/BaseInfo/Warehouse.aspx"></TreeNode>
<TreeNode id="F6194C00-D256-485D-9056-171FAB75928A" Text="管道颜色标识库" NavigateUrl="HJGL/BaseInfo/MaterialColor.aspx"></TreeNode>
</TreeNode>
<TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="B13BFFA5-3112-4209-8562-5329B78B405C" Text="三维模型导入" NavigateUrl="HJGL/DataImport/TDMImport.aspx"></TreeNode>
<TreeNode id="5CBE9258-6FE9-47A8-BFDD-3BDD90F7DECC" Text="图纸导入" NavigateUrl="HJGL/DataImport/DrawingImport.aspx"></TreeNode>
<TreeNode id="32F5CC8C-E0F4-456C-AB88-77E36269FA50" Text="焊接设计基础数据导入" NavigateUrl="HJGL/WeldingManage/WeldJointList.aspx"></TreeNode>
<TreeNode id="1C6F9CA9-FDAC-4CE5-A19C-5536538851E1" Text="试压包划分" NavigateUrl="HJGL/TestPackage/TestPackageEdit.aspx"></TreeNode>
<TreeNode id="8IDKGJE2-09B1-4607-DCS2-DCC3O48F080F" Text="数据导入" NavigateUrl=""><TreeNode id="32F5CC8C-E0F4-456C-AB88-77E36269FA50" Text="焊接设计基础数据导入" NavigateUrl="HJGL/WeldingManage/WeldJointList.aspx"></TreeNode>
<TreeNode id="EFD1E914-E79C-4F5E-A2F7-CFF4F7821284" Text="管线导入" NavigateUrl="HJGL/DataImport/PipeLineInAuto.aspx"></TreeNode>
<TreeNode id="34BAD63E-EF7C-4D7E-8641-C706BBFCD85F" Text="轴测图识别" NavigateUrl="HJGL/DataImport/DrawingRecognition.aspx"></TreeNode>
</TreeNode>
<TreeNode id="1EE36752-6077-47C9-AFF0-5372B862FF61" Text="管线划分" NavigateUrl="HJGL/PreDesign/PipelingDivide.aspx"></TreeNode>
<TreeNode id="1C6F9CA9-FDAC-4CE5-A19C-5536538851E1" Text="试压包划分" NavigateUrl="HJGL/TestPackage/TestPackageEdit.aspx"></TreeNode>
<TreeNode id="EF6B01AF-D038-4A38-BFAF-D89130D60DE6" Text="材料信息导入" NavigateUrl="HJGL/DataImport/MaterialInformation.aspx"></TreeNode>
<TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="0A3F6AB0-535E-489C-9F64-4FFE61C17085" Text="材料管理" NavigateUrl="HJGL/PreDesign/MaterialManage.aspx"></TreeNode>
<TreeNode id="1E36EA73-D536-4215-BFB9-A8771937BD89" Text="工厂预制管理" NavigateUrl=""><TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
<TreeNode id="8255554C-0A92-4C7B-BF19-779AF0220A8C" Text="预制组件管理" NavigateUrl="HJGL/PreDesign/PrePipeline.aspx"></TreeNode>
<TreeNode id="F18CFC0E-47E0-477A-9AB3-72B88D438299" Text="堆场规划" NavigateUrl="HJGL/PreDesign/YardPlanning.aspx"></TreeNode>
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="车次管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="发货管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
<TreeNode id="BD9C587E-17C2-49F1-82AE-A05117E41D89" Text="安装清单" NavigateUrl="HJGL/PreDesign/InstallList.aspx"></TreeNode>
<TreeNode id="53948077-B51D-4FF3-BFB0-AB4E27C42875" Text="排产计划" NavigateUrl="HJGL/PreDesign/ProductionSchedulingPlan.aspx"></TreeNode>
<TreeNode id="25DED954-10C9-47CC-99F2-C44FDE9E0A81" Text="包装管理" NavigateUrl="HJGL/PreDesign/PackagingManage.aspx"></TreeNode>
<TreeNode id="EEC0D060-C15E-4D25-B015-C2B91F735DAC" Text="发货管理" NavigateUrl="HJGL/PreDesign/TrainNumberManager.aspx"></TreeNode>
</TreeNode>
<TreeNode id="9B828E92-733B-4AF9-9DD0-55ECD8B64AB8" Text="材料管理" NavigateUrl=""><TreeNode id="E29C1839-3530-45EC-A752-B26A0027E2CD" Text="入库管理" NavigateUrl=""><TreeNode id="324C72AF-447A-4308-AFB7-ABF788C58240" Text="入库申请" NavigateUrl="CLGL/InPlanMaster.aspx"></TreeNode>
<TreeNode id="4A55351A-2440-4A2D-8509-3FFEE5FC8861" Text="入库单管理" NavigateUrl="CLGL/InputMaster.aspx"></TreeNode>
@@ -35,7 +32,7 @@
<TreeNode id="C05EF3BE-AB13-4852-B2AA-1095BE4EEB2F" Text="到货分析" NavigateUrl="CLGL/ArrivalStatistics.aspx"></TreeNode>
</TreeNode>
</TreeNode>
<TreeNode id="0FC79768-7235-4E8C-AA7F-B33B85AD90D5" Text="施工准备" NavigateUrl=""><TreeNode id="3EFCE9C3-1983-4AEC-8FA1-D7A90F08CBCB" Text="焊接人员管理" NavigateUrl=""><TreeNode id="1908E4C9-4A63-4A6C-6666-DA4910C2A8C7" Text="焊工管理" NavigateUrl="HJGL/PersonManage/WelderManage.aspx"></TreeNode>
<TreeNode id="0FC79768-7235-4E8C-AA7F-B33B85AD90D5" Text="施工准备" NavigateUrl=""><TreeNode id="3EFCE9C3-1983-4AEC-8FA1-D7A90F08CBCB" Text="焊接人员管理" NavigateUrl=""><TreeNode id="1908E4C9-4A63-4A6C-6666-DA4910C2A8C7" Text="焊工管理" NavigateUrl="CQMS/PersonManage/WelderManage.aspx"></TreeNode>
<TreeNode id="13F11D51-1B54-400F-BDBB-36685BC94819" Text="无损检测工管理" NavigateUrl="HJGL/PersonManage/CheckerManage.aspx"></TreeNode>
</TreeNode>
<TreeNode id="63CD1C52-1A87-4946-9CA7-8C3C2CB0CA2E" Text="焊接工艺规程编制" NavigateUrl="HJGL/WPQ/WPQList.aspx"></TreeNode>
@@ -44,7 +41,6 @@
<TreeNode id="43F92EA7-462F-41E6-8D8A-243C03A5317E" Text="信息查询" NavigateUrl=""><TreeNode id="A98C7295-5735-4C8A-9565-7635A9C5D258" Text="管线信息总览" NavigateUrl="HJGL/InfoQuery/PipelineQuery.aspx"></TreeNode>
<TreeNode id="6B16D1D4-FBDA-4B2B-AE0A-B465C686C27D" Text="轴测图" NavigateUrl="HJGL/JoinMarking/JointShow.aspx"></TreeNode>
<TreeNode id="F4275A19-A72E-448E-B0C1-07DB2FCEE224" Text="焊口台账总览" NavigateUrl="HJGL/InfoQuery/JointQuery.aspx"></TreeNode>
<TreeNode id="DB50A5AA-08DB-4915-9173-6DB133CA76F0" Text="库存信息总览" NavigateUrl="HJGL/DataImport/MaterialStock.aspx"></TreeNode>
</TreeNode>
<TreeNode id="4D36E99E-B3D8-4C61-826A-CBD98EC51515" Text="焊接过程管理" NavigateUrl=""><TreeNode id="E6F6982A-48C7-455C-8EBB-CC7088EBF15A" Text="焊接施工计划" NavigateUrl="HJGL/WeldingManage/WeldingPlan.aspx"></TreeNode>
<TreeNode id="ADC7EA61-6313-4DF9-913F-E9207F6525CA" Text="材料匹配(工厂预制)" NavigateUrl="HJGL/WeldingManage/WeldMatMatch.aspx?PipeArea=1"></TreeNode>