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

焊接修改

Browse Source
This commit is contained in:
李鹏飞
2024-06-20 10:13:31 +08:00
parent fa0faa05dd
commit c1fe6302bb
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs
+2
View File
@@ -387,7 +387,9 @@ namespace BLL
else WeldJointCode end) as '焊口序号', else WeldJointCode end) as '焊口序号',
WeldJointCode as '焊口号', WeldJointCode as '焊口号',
BackingWelderCode as '打底焊工', BackingWelderCode as '打底焊工',
BackingWelderTeamGroupName as '打底焊工班组',
CoverWelderCode as '盖面焊工', CoverWelderCode as '盖面焊工',
CoverWelderTeamGroupName as '盖面焊工班组',
Material1Code as '材质1' , Material1Code as '材质1' ,
Material2Code as '材质2' , Material2Code as '材质2' ,
Dia as '外径' , Dia as '外径' ,
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+2 -2
View File
@@ -870,8 +870,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim(); newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
newWeldJoint.CoverWelderId = coverWelderId; newWeldJoint.CoverWelderId = coverWelderId;
newWeldJoint.BackingWelderId = backingWelderId; newWeldJoint.BackingWelderId = backingWelderId;
newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonById(coverWelderId).TeamGroupId; newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId,coverWelderId).TeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonById(backingWelderId).TeamGroupId; newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, backingWelderId).TeamGroupId;
//if (item.WeldingLocationId != Const._Null) //if (item.WeldingLocationId != Const._Null)
//{ //{
// newWeldJoint.WeldingLocationId = item.WeldingLocationId; // newWeldJoint.WeldingLocationId = item.WeldingLocationId;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+1 -1
View File
@@ -480,7 +480,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
if (!string.IsNullOrEmpty(node.NodeID)) if (!string.IsNullOrEmpty(node.NodeID))
{ {
var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.JointAttribute == drpJointAttribute.SelectedValue select x; var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == node.NodeID && x.JointAttribute == drpJointAttribute.SelectedValue select x;
if (jotList.Count() > 0) if (jotList.Count() > 0)
{ {
foreach (var jot in jotList) foreach (var jot in jotList)