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

2022-10-28 焊接修改

This commit is contained in:
李鹏飞 2022-10-28 17:01:51 +08:00
parent ad64ffcd11
commit a4546bb5ce
14 changed files with 162 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.vs/VSWorkspaceState.json Normal file
View File

@ -0,0 +1,6 @@
{
"ExpandedNodes": [
""
],
"PreviewInSolutionExplorer": false
}

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

@ -170,7 +170,9 @@ namespace BLL
{
string result = "";
var q = (from x in Funs.DB.HJGL_DataImport
where x.UnitWorkId == UnitWorkId && x.ImportType == "1"
join y in Funs.DB.Base_DesignProfessional on x.DesignProfessionalId equals y.DesignProfessionalId into mm
from m in mm.DefaultIfEmpty()
where x.UnitWorkId == UnitWorkId && x.ImportType == "1" && m.ProfessionalName.Contains("管道")
group x by x.UnitWorkId into tt
from t in tt.DefaultIfEmpty()
select new

29
SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
View File

File diff suppressed because one or more lines are too long

5
SGGL/FineUIPro.Web/HJGL/DataImport/TDMImport.aspx.cs
View File

@ -35,8 +35,9 @@ namespace FineUIPro.Web.HJGL.DataImport
rootNode1.NodeID = "1";
rootNode1.Text = "建筑工程";
rootNode1.CommandName = "建筑工程";
rootNode1.EnableClickEvent = true;
rootNode1.EnableCollapseEvent = true;
//rootNode1.EnableClickEvent = true;
//rootNode1.EnableCollapseEvent = true;
rootNode1.Selectable = false;
this.tvControlItem.Nodes.Add(rootNode1);
TreeNode rootNode2 = new TreeNode();

7
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
View File

@ -262,6 +262,10 @@ namespace FineUIPro.Web.HJGL.InfoQuery
}
}
parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();
@ -539,6 +543,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
}
}
parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData();

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

@ -143,6 +143,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_pipeline = Completed_pipeline;
parameter3D.Incomplete_pipeline = Incomplete_pipeline;
parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C"+ parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;
@ -454,6 +457,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_pipeline = Completed_pipeline;
parameter3D.Incomplete_pipeline = Incomplete_pipeline;
parameter3D.Transparency = colorModel.PipelineComplete;
parameter3D.Finished_color = colorModel.JointCompleteColor;
parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;

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

@ -267,13 +267,14 @@ namespace FineUIPro.Web.HJGL.PreDesign
string strSql = @" SELECT com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,unitwork.UnitWorkName,
com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,mat.PrefabricatedComponents,
com.QRCode,com.State,CONVERT(varchar(100), pipe.PlanStartDate, 23) as PlanStartDate,pipe.PipelineCode,
('PrePipeline$'+com.PipelineComponentId )as QRCode2
('PrePipeline$'+com.PipelineComponentId )as QRCode2,mater.*
FROM HJGL_Pipeline_Component com
LEFT JOIN HJGL_PipeLineMat mat ON mat.PipeLineMatId=com.PipeLineMatId
LEFT JOIN HJGL_Pipeline pipe ON pipe.PipelineId =com.PipelineId
LEFT JOIN dbo.Base_Unit punit ON punit.UnitId=com.PreUnit
LEFT JOIN dbo.Base_Unit aunit ON aunit.UnitId=com.AssembleUnit
LEFT JOIN dbo.WBS_UnitWork unitwork on pipe.UnitWorkId=unitwork.UnitWorkId
LEFT JOIN dbo.Base_Material AS mater ON mater.MaterialId=pipe.MaterialId
WHERE com.QRCode!=''";
List<SqlParameter> listStr = new List<SqlParameter> { };

25
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
View File

@ -25,6 +25,17 @@ namespace FineUIPro.Web.HJGL.TestPackage
ViewState["PTP_ID"] = value;
}
}
public string Line_No
{
get
{
return (string)ViewState["Line_No"];
}
set
{
ViewState["Line_No"] = value;
}
}
#endregion
#region 加载页面
@ -226,6 +237,8 @@ namespace FineUIPro.Web.HJGL.TestPackage
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,4";
parameter3D.Line_No = Line_No;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
@ -235,6 +248,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
else if (this.tvControlItem.SelectedNode.CommandName == "TestPackage")
{
var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
if (testPackageManage != null && !string.IsNullOrEmpty(testPackageManage.UnitWorkId))
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(testPackageManage.UnitWorkId);
@ -273,6 +287,16 @@ namespace FineUIPro.Web.HJGL.TestPackage
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
var testpipedetail = BLL.TestPackageEditService.GetPipeLineListByPTP_ID(this.PTP_ID);
if (testpipedetail != null && testpipedetail.Count > 0)
{
List<string> listpipecode = new List<string>();
foreach (var item in testpipedetail)
{
listpipecode.Add("/" + item.PipelineCode);
}
Line_No = string.Join(",", listpipecode);
}
}
#region 加载页面输入保存信息
@ -555,6 +579,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,4";
parameter3D.Line_No = Line_No;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);

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

@ -61,9 +61,9 @@
CompareMessage="止数应大于等于起数" CompareOperator="GreaterThanEqual"
ShowRedStar="true" Required="true" LabelWidth="100px">
</f:NumberBox>
<f:TextBox ID="txtZhanwei"
<%-- <f:TextBox ID="txtZhanwei"
runat="server" LabelWidth="100px" Hidden="true">
</f:TextBox>
</f:TextBox>--%>
</Items>
</f:FormRow>
<f:FormRow>

15
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage {
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class WeldJointBatchEdit {
public partial class WeldJointBatchEdit
{
/// <summary>
/// form1 控件。
@ -138,15 +140,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.NumberBox txtWeldJointCode2;
/// <summary>
/// txtZhanwei 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtZhanwei;
/// <summary>
/// drpMaterial1 控件。
/// </summary>

23
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
View File

@ -20,6 +20,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
ViewState["PipeArea"] = value;
}
}
public string Line_No
{
get
{
return (string)ViewState["Line_No"];
}
set
{
ViewState["Line_No"] = value;
}
}
protected void Page_Load(object sender, EventArgs e)
{
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@ -260,6 +271,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (model != null && !string.IsNullOrEmpty(model.UnitWorkId))
{
bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(tvControlItem.SelectedNodeID, this.CurrUser.LoginProjectId);
if (istrue)
{
Line_No = model.PipelineCode;
}
parameter3D.Line_No = Line_No;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
}
@ -356,6 +373,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var modelpipe = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
if (modelpipe != null && !string.IsNullOrEmpty(modelpipe.UnitWorkId))
{
bool istrue = BLL.HJGL_MaterialService.isInStockByPipeline(tvControlItem.SelectedNodeID, this.CurrUser.LoginProjectId);
if (istrue)
{
Line_No = modelpipe.PipelineCode;
}
parameter3D.Line_No = Line_No;
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(modelpipe.UnitWorkId);
var pipecode = "/" + modelpipe.PipelineCode;
parameter3D.TagNum = pipecode;

8
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
View File

@ -102,22 +102,22 @@
<Rows>
<f:FormRow runat="server">
<Items>
<f:NumberBox ID="txtPipelineNOComplete" Label="管线未完成(透明显示)" runat="server" MaxValue="100"
<f:NumberBox ID="txtPipelineNOComplete" Label="未完成(透明显示)" runat="server" MaxValue="100"
LabelWidth="180px" NoNegative="true" NoDecimal="true">
</f:NumberBox>
<f:NumberBox ID="txtPipelineComplete" Label="管线已完成(透明显示)" runat="server" MaxValue="100"
<f:NumberBox ID="txtPipelineComplete" Label="已完成(透明显示)" runat="server" MaxValue="100"
LabelWidth="180px" NoNegative="true" NoDecimal="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:DropDownList ID="drpJointNOCompleteColor" Label="焊口未完成" runat="server" LabelWidth="180px">
<f:DropDownList ID="drpJointNOCompleteColor" Label="未完成(颜色)" runat="server" LabelWidth="180px">
<f:ListItem Value="#FF0000" Text="红" />
<f:ListItem Value="#FFFF00" Text="黄" />
<f:ListItem Value="#00FF00" Text="绿" />
</f:DropDownList>
<f:DropDownList ID="drpJointCompleteColor" Label="焊口已完成" runat="server"
<f:DropDownList ID="drpJointCompleteColor" Label="已完成(颜色)" runat="server"
ShowRedStar="true" Required="true" LabelWidth="180px">
<f:ListItem Value="#FF0000" Text="红" />
<f:ListItem Value="#FFFF00" Text="黄" />

12
SGGL/FineUIPro.Web/indexProject.aspx
View File

@ -705,12 +705,12 @@
// refreshWhenExist： 添加选项卡时，如果选项卡已经存在，是否刷新内部IFrame
// refreshWhenTabChange: 切换选项卡时，是否刷新内部IFrame
F.initTreeTabStrip(mainMenu, mainTabStrip, true, false, false);
var themeTitle = F.cookie('Theme_Pro_Title');
var themeName = F.cookie('Theme_Pro');
if (themeTitle) {
F.removeCookie('Theme_Pro_Title');
//notify('主题更改为：' + themeTitle + '（' + themeName + '）');
}
//var themeTitle = F.cookie('Theme_Pro_Title');
//var themeName = F.cookie('Theme_Pro');
//if (themeTitle) {
// F.removeCookie('Theme_Pro_Title');
// //notify('主题更改为：' + themeTitle + '（' + themeName + '）');
//}
});
</script>

12
SGGL/Model/HJGL/3DParameter.cs
View File

@ -37,6 +37,18 @@ namespace Model
/// </summary>
public string Incomplete_weldjunction { get; set; }
/// <summary>
/// 透明度
/// </summary>
public string Transparency { get; set; }
/// <summary>
/// 已完成颜色
/// </summary>
public string Finished_color { get; set; }
/// <summary>
/// 未完成颜色
/// </summary>
public string Incomplete_color { get; set; }
/// <summary>
/// 颜色模型
/// </summary>
public ColorModel ColorModel { get; set; }